fix: have /arweave/raw use httpc

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
   "editor.detectIndentation": false,
   "editor.insertSpaces": true,
-  "editor.tabSize": 4
+  "editor.tabSize": 4,
+  "editor.rulers": [80]
 }

Makefile

@@ -6,10 +6,15 @@ compile:
 WAMR_VERSION = 2.2.0
 WAMR_DIR = _build/wamr
 
-GENESIS_WASM_BRANCH = feat/http-checkpoint
+GENESIS_WASM_BRANCH = feat/hb-unit
 GENESIS_WASM_REPO = https://github.com/permaweb/ao.git
 GENESIS_WASM_SERVER_DIR = _build/genesis_wasm/genesis-wasm-server
 
+HYPERBUDDY_UI_REPO = https://github.com/permaweb/hb-explorer
+HYPERBUDDY_UI_PACKAGE_JSON = https://raw.githubusercontent.com/permaweb/hb-explorer/main/package.json
+HYPERBUDDY_UI_TARGET = src/html/hyperbuddy@1.0/bundle.js
+ARWEAVE_GATEWAY = https://arweave.net
+
 ifdef HB_DEBUG
 	WAMR_FLAGS = -DWAMR_ENABLE_LOG=1 -DWAMR_BUILD_DUMP_CALL_STACK=1 -DCMAKE_BUILD_TYPE=Debug
 else
@@ -50,11 +55,16 @@ $(WAMR_DIR):
 		--single-branch
 
 $(WAMR_DIR)/lib/libvmlib.a: $(WAMR_DIR)
-	sed -i '742a tbl_inst->is_table64 = 1;' ./_build/wamr/core/iwasm/aot/aot_runtime.c; \
+	@if ! grep -Fq 'tbl_inst->is_table64 = 1;' ./_build/wamr/core/iwasm/aot/aot_runtime.c; then \
+		awk 'NR == 742 { print; print "tbl_inst->is_table64 = 1;"; next } { print }' \
+			./_build/wamr/core/iwasm/aot/aot_runtime.c > ./_build/wamr/core/iwasm/aot/aot_runtime.c.tmp && \
+		mv ./_build/wamr/core/iwasm/aot/aot_runtime.c.tmp ./_build/wamr/core/iwasm/aot/aot_runtime.c; \
+	fi; \
 	cmake \
 		$(WAMR_FLAGS) \
 		-S $(WAMR_DIR) \
 		-B $(WAMR_DIR)/lib \
+		-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 		-DWAMR_BUILD_TARGET=$(WAMR_BUILD_TARGET) \
 		-DWAMR_BUILD_PLATFORM=$(WAMR_BUILD_PLATFORM) \
 		-DWAMR_BUILD_MEMORY64=1 \
@@ -104,3 +114,20 @@ setup-genesis-wasm: $(GENESIS_WASM_SERVER_DIR)
 	fi
 	@cd $(GENESIS_WASM_SERVER_DIR) && npm install > /dev/null 2>&1 && \
 		echo "Installed genesis-wasm@1.0 server."
+
+# Update hyperbuddy-ui from remote bundle
+update-hyperbuddy-ui:
+	@echo "Fetching package.json from $(HYPERBUDDY_UI_REPO)..." && \
+	TX_ID=$$(curl -s "$(HYPERBUDDY_UI_PACKAGE_JSON)" | grep -o '"bundle"[[:space:]]*:[[:space:]]*"[^"]*"' | cut -d'"' -f4) && \
+	if [ -z "$$TX_ID" ]; then \
+		echo "Error: Could not find 'bundle' field in package.json"; \
+		exit 1; \
+	fi && \
+	echo "Found transaction ID: $$TX_ID" && \
+	if [ -f "$(HYPERBUDDY_UI_TARGET)" ]; then \
+		rm "$(HYPERBUDDY_UI_TARGET)" && \
+		echo "Removed existing bundle.js"; \
+	fi && \
+	echo "Downloading source code from Arweave..." && \
+	curl -sL "$(ARWEAVE_GATEWAY)/$$TX_ID" -o "$(HYPERBUDDY_UI_TARGET)" && \
+	echo "Successfully updated $(HYPERBUDDY_UI_TARGET)"

config/vm.args.src

@@ -0,0 +1 @@
+-sname ${HB_ERL_SNAME:-"hb"}

docs/run/configuring-your-machine.md

@@ -2,30 +2,45 @@
 
 This guide details the various ways to configure your HyperBEAM node's behavior, including ports, storage, keys, and logging.
 
-## Configuration (`config.flat`)
+## Configuration (`config.json`)
 
-The primary way to configure your HyperBEAM node is through a `config.flat` file located in the node's working directory or specified by the `HB_CONFIG_LOCATION` environment variable.
+The primary way to configure your HyperBEAM node is through a `config.json` file located in the node's working directory or specified by the `HB_CONFIG` environment variable.
 
-This file uses a simple `Key = Value.` format (note the period at the end of each line).
+### Flat config file
+
+Another possibility is to use `config.flat` that uses a simple `Key: Value` format.
 
 **Example `config.flat`:**
 
-```erlang
+```
 % Set the HTTP port
-port = 8080.
+port: 8080
 
 % Specify the Arweave key file
-priv_key_location = "/path/to/your/wallet.json".
-
-% Set the data store directory
-% Note: Storage configuration can be complex. See below.
-% store = [{local, [{root, <<"./node_data_mainnet">>}]}]. % Example of complex config, not for config.flat
-
-% Enable verbose logging for specific modules
-% debug_print = [hb_http, dev_router]. % Example of complex config, not for config.flat
+priv_key_location: /path/to/your/wallet.json
+
+% Maps can be used with forward dash (/)
+default_store/lmdb/ao-types: store-module=atom
+default_store/lmdb/store-module: hb_store_lmdb
+default_store/lmdb/name: /tmp/store
+
+% Lists can be used with dot (.) and sequential integer key map
+store/ao-types: .=list
+store/1/ao-types: store-module=atom
+store/1/store-module: hb_store_lmdb
+store/1/name: /tmp/store
+
+store/2/ao-types: store-module=atom
+store/2/store-module: hb_store_s3
+store/2/bucket: hb-s3
+store/2/priv_access_key_id: minioadmin
+store/2/priv_secret_access_key: minioadmin
+store/2/endpoint: http://localhost:9000
+store/2/force_path_style: true
+store/2/region: us-east-1
 ```
 
-Below is a reference of commonly used configuration keys. Remember that `config.flat` only supports simple key-value pairs (Atoms, Strings, Integers, Booleans). For complex configurations (Lists, Maps), you must use environment variables or `hb:start_mainnet/1`.
+Below is a reference of commonly used configuration keys. Remember that `config.flat` only supports the following value types (Atoms, Strings, Integers, Booleans, Maps and List).
 
 ### Core Configuration
 

erlang_ls.config

@@ -18,3 +18,5 @@ lenses:
 providers:
   enabled:
     - signature-help
+  disabled:
+    - document-formatting

rebar.config

@@ -3,6 +3,7 @@
 
 {profiles, [
     {no_events, [{erl_opts, [{d, 'NO_EVENTS', true}]}]},
+    {top, [{deps, [observer_cli]}, {erl_opts, [{d, 'AO_TOP', true}]}]},
     {store_events, [{erl_opts, [{d, 'STORE_EVENTS', true}]}]},
     {ao_profiling, [{erl_opts, [{d, 'AO_PROFILING', true}]}]},
     {eflame,
@@ -63,7 +64,9 @@
     {src_dir, "deps/elmdb/native/elmdb_nif"}
 ]}.
 
-{overrides, []}.
+{overrides, [
+    {override, gun, [{deps, [cowlib]}]}
+]}.
 
 {pre_hooks, [
     {compile, "bash -c \"echo '-define(HB_BUILD_SOURCE, <<\\\"$(git rev-parse HEAD)\\\">>).\n' > ${REBAR_ROOT_DIR}/_build/hb_buildinfo.hrl\""},
@@ -115,14 +118,16 @@
 ]}.
 
 {deps, [
-    {elmdb, { git, "https://github.com/twilson63/elmdb-rs.git", {branch, "feat/match" }}},
+    {elmdb, {git, "https://github.com/permaweb/elmdb-rs.git", {ref, "0276d6b04dcf47b7a74fe446c11e15ff3469c37a"}}},
 	{b64fast, {git, "https://github.com/ArweaveTeam/b64fast.git", {ref, "58f0502e49bf73b29d95c6d02460d1fb8d2a5273"}}},
-	{cowboy, {git, "https://github.com/ninenines/cowboy", {ref, "022013b6c4e967957c7e0e7e7cdefa107fc48741"}}},
-	{gun, {git, "https://github.com/ninenines/gun", {ref, "8efcedd3a089e6ab5317e4310fed424a4ee130f8"}}},
+    {cowlib, "2.16.0"},
+	{cowboy, "2.14.0"},
+    {ranch, "2.2.0"},
+    {gun, "2.2.0"},
+    {prometheus_cowboy, "0.2.0"},
+    {prometheus_httpd,  "2.1.15"},
+    {prometheus,        "6.0.3"},
 	{graphql, "0.17.1", {pkg, graphql_erl}},
-	{prometheus, "4.11.0"},
-	{prometheus_cowboy, "0.1.8"},
-    {gun, "0.10.0"},
     {luerl, "1.3.0"}
 ]}.
 
@@ -179,4 +184,4 @@
 	{preprocess, true},
 	{private, true},
 	{hidden, true}
-]}.
+]}.

rebar.lock

@@ -1,50 +1,42 @@
 {"1.2.0",
-[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.7">>},2},
+[{<<"accept">>,{pkg,<<"accept">>,<<"0.3.7">>},1},
  {<<"b64fast">>,
   {git,"https://github.com/ArweaveTeam/b64fast.git",
        {ref,"58f0502e49bf73b29d95c6d02460d1fb8d2a5273"}},
   0},
- {<<"cowboy">>,
-  {git,"https://github.com/ninenines/cowboy",
-       {ref,"022013b6c4e967957c7e0e7e7cdefa107fc48741"}},
-  0},
- {<<"cowlib">>,
-  {git,"https://github.com/ninenines/cowlib",
-       {ref,"e2d7749f61b89cc6f8779ba66a5a8ab0fe85c827"}},
-  1},
- {<<"elmdb">>,
-  {git,"https://github.com/twilson63/elmdb-rs.git",
-       {ref,"90c8857cd4ccff341fbe415b96bc5703d17ff7f0"}},
-  0},
+ {<<"cowboy">>,{pkg,<<"cowboy">>,<<"2.14.0">>},0},
+ {<<"cowlib">>,{pkg,<<"cowlib">>,<<"2.16.0">>},0},
+ {<<"ddskerl">>,{pkg,<<"ddskerl">>,<<"0.4.2">>},1},
  {<<"graphql">>,{pkg,<<"graphql_erl">>,<<"0.17.1">>},0},
- {<<"gun">>,
-  {git,"https://github.com/ninenines/gun",
-       {ref,"8efcedd3a089e6ab5317e4310fed424a4ee130f8"}},
-  0},
+ {<<"gun">>,{pkg,<<"gun">>,<<"2.2.0">>},0},
  {<<"luerl">>,{pkg,<<"luerl">>,<<"1.3.0">>},0},
- {<<"prometheus">>,{pkg,<<"prometheus">>,<<"4.11.0">>},0},
- {<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.1.8">>},0},
- {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.15">>},1},
- {<<"quantile_estimator">>,{pkg,<<"quantile_estimator">>,<<"0.2.1">>},1},
- {<<"ranch">>,
-  {git,"https://github.com/ninenines/ranch",
-       {ref,"a692f44567034dacf5efcaa24a24183788594eb7"}},
-  1}]}.
+ {<<"prometheus">>,{pkg,<<"prometheus">>,<<"6.0.3">>},0},
+ {<<"prometheus_cowboy">>,{pkg,<<"prometheus_cowboy">>,<<"0.2.0">>},0},
+ {<<"prometheus_httpd">>,{pkg,<<"prometheus_httpd">>,<<"2.1.15">>},0},
+ {<<"ranch">>,{pkg,<<"ranch">>,<<"2.2.0">>},0}]}.
 [
 {pkg_hash,[
  {<<"accept">>, <<"CD6E34A2D7E28CA38B2D3CB233734CA0C221EFBC1F171F91FEC5F162CC2D18DA">>},
+ {<<"cowboy">>, <<"565DCF221BA99B1255B0ADCEC24D2D8DBE79E46EC79F30F8373CCEADC6A41E2A">>},
+ {<<"cowlib">>, <<"54592074EBBBB92EE4746C8A8846E5605052F29309D3A873468D76CDF932076F">>},
+ {<<"ddskerl">>, <<"A51A90BE9AC9B36A94017670BED479C623B10CA9D4BDA1EDF3A0E48CAEEADA2A">>},
  {<<"graphql">>, <<"EB59FCBB39F667DC1C78C950426278015C3423F7A6ED2A121D3DB8B1D2C5F8B4">>},
+ {<<"gun">>, <<"B8F6B7D417E277D4C2B0DC3C07DFDF892447B087F1CC1CAFF9C0F556B884E33D">>},
  {<<"luerl">>, <<"B56423DDB721432AB980B818FEECB84ADBAB115E2E11522CF94BCD0729CAA501">>},
- {<<"prometheus">>, <<"B95F8DE8530F541BD95951E18E355A840003672E5EDA4788C5FA6183406BA29A">>},
- {<<"prometheus_cowboy">>, <<"CFCE0BC7B668C5096639084FCD873826E6220EA714BF60A716F5BD080EF2A99C">>},
+ {<<"prometheus">>, <<"95302236124C0F919163A7762BF7D2B171B919B6FF6148D26EB38A5D2DEF7B81">>},
+ {<<"prometheus_cowboy">>, <<"526F75D9850A9125496F78BCEECCA0F237BC7B403C976D44508543AE5967DAD9">>},
  {<<"prometheus_httpd">>, <<"8F767D819A5D36275EAB9264AFF40D87279151646776069BF69FBDBBD562BD75">>},
- {<<"quantile_estimator">>, <<"EF50A361F11B5F26B5F16D0696E46A9E4661756492C981F7B2229EF42FF1CD15">>}]},
+ {<<"ranch">>, <<"25528F82BC8D7C6152C57666CA99EC716510FE0925CB188172F41CE93117B1B0">>}]},
 {pkg_hash_ext,[
  {<<"accept">>, <<"CA69388943F5DAD2E7232A5478F16086E3C872F48E32B88B378E1885A59F5649">>},
+ {<<"cowboy">>, <<"EA99769574550FE8A83225C752E8A62780A586770EF408816B82B6FE6D46476B">>},
+ {<<"cowlib">>, <<"7F478D80D66B747344F0EA7708C187645CFCC08B11AA424632F78E25BF05DB51">>},
+ {<<"ddskerl">>, <<"63F907373D7E548151D584D4DA8A38928FD26EC9477B94C0FFAAD87D7CB69FE7">>},
  {<<"graphql">>, <<"4D0F08EC57EF0983E2596763900872B1AB7E94F8EE3817B9F67EEC911FF7C386">>},
+ {<<"gun">>, <<"76022700C64287FEB4DF93A1795CFF6741B83FB37415C40C34C38D2A4645261A">>},
  {<<"luerl">>, <<"6B3138AA829F0FBC4CD0F083F273B4030A2B6CE99155194A6DB8C67B2C3480A4">>},
- {<<"prometheus">>, <<"719862351AABF4DF7079B05DC085D2BBCBE3AC0AC3009E956671B1D5AB88247D">>},
- {<<"prometheus_cowboy">>, <<"BA286BECA9302618418892D37BCD5DC669A6CC001F4EB6D6AF85FF81F3F4F34C">>},
+ {<<"prometheus">>, <<"53554ECADAC0354066801D514D1A244DD026175E4EE3A9A30192B71D530C8268">>},
+ {<<"prometheus_cowboy">>, <<"2C7EB12F4B970D91E3B47BAAD0F138F6ADC34E53EEB0AE18068FF0AFAB441B24">>},
  {<<"prometheus_httpd">>, <<"67736D000745184D5013C58A63E947821AB90CB9320BC2E6AE5D3061C6FFE039">>},
- {<<"quantile_estimator">>, <<"282A8A323CA2A845C9E6F787D166348F776C1D4A41EDE63046D72D422E3DA946">>}]}
+ {<<"ranch">>, <<"FA0B99A1780C80218A4197A59EA8D3BDAE32FBFF7E88527D7D8A4787EFF4F8E7">>}]}
 ].

scripts/dynamic-router.lua

@@ -27,7 +27,7 @@ local function ensure_defaults(state)
     state.routes = state.routes or {}
     state["is-admissible"] =
         state["is-admissible"] or {
-			path = "/default",
+			path = "default",
             default = "true"
         }
     state["sampling-rate"] = state["sampling-rate"] or 0.1

scripts/hyper-token-p4.lua

@@ -13,23 +13,27 @@
 -- 3. Debit the source account.
 -- 4. Increment the balance of the recipient account.
 function charge(base, assignment)
-    ao.event("debug_charge", { "Charge received: ", { assignment = assignment } })
-    local admin = base.admin
-    local status, res, request = validate_request(base, assignment)
-    if status ~= "ok" then
-        return status, res
-    end
+    ao.event({ "debug_charge", { "Charging", { assignment = assignment } } })
 
     -- Verify that the request is signed by the admin.
-    local committers = ao.get("committers", {"as", "message@1.0", assignment.body})
-    ao.event("debug_charge", { "Validating request: ", {
+    local admin = base.admin
+    local charge_req = assignment.body
+    local _, committers = ao.resolve(charge_req, "committers")
+    ao.event({ "debug_charge", { "Validating charge requester: ", {
+        admin = admin,
         committers = committers,
-        admin = admin
-    } })
+        ["charge-request"] = charge_req,
+    } }})
+
     if count_common(committers, admin) ~= 1 then
         return "error", base
     end
 
+    local status, res, request = validate_request(base, assignment)
+    if status ~= "ok" then
+        return status, res
+    end
+
     -- Ensure that the quantity and account are present in the request.
     if not request.quantity or not request.account then
         ao.event({ "Failure: Quantity or account not found in request.",

scripts/hyper-token.lua

@@ -55,8 +55,8 @@
 --- 3. `credit-notice' messages that do not originate from a sub-ledger's
 ---    `token' are evaluated for parity of source code with the receiving
 ---     ledger. This is achieved by comparing the `from-base' field of the
----     credit-notice message with `process/id&commitments=none' on the receiving
----     ledger.
+---     credit-notice message with `process/id&committers=none' on the
+---     receiving ledger.
 
 --- Utility functions:
 
@@ -318,7 +318,7 @@ local function validate_new_peer_ledger(base, request)
     status, expected =
         ao.resolve(
             proc,
-            { path = "id", commitments = "none" }
+            { path = "id", committers = "none" }
         )
     ao.event({ "Expected `from-base`", { status = status, expected = expected } })
     -- Check if the `from-base' field is present in the assignment.
@@ -866,18 +866,25 @@ end
 --- Index function, called by the `~process@1.0` device for scheduled messages.
 --- We route any `action' to the appropriate function based on the request path.
 function compute(base, assignment)
-    ao.event({ "compute called",
-        { balance = base.balance, ledgers = base.ledgers } })
-
-    assignment.body.action = string.lower(assignment.body.action or "")
+    local action = string.lower(assignment.body.action or "")
+    ao.event(
+        {
+            "compute called",
+            {
+                balance = base.balance,
+                ledgers = base.ledgers,
+                action = action
+            }
+        }
+    )
 
-    if assignment.body.action == "credit-notice" then
+    if action == "credit-notice" then
         return _G["credit-notice"](base, assignment)
-    elseif assignment.body.action == "transfer" then
+    elseif action == "transfer" then
         return transfer(base, assignment)
-    elseif assignment.body.action == "register" then
+    elseif action == "register" then
         return register(base, assignment)
-    elseif assignment.body.action == "register-remote" then
+    elseif action == "register-remote" then
         return _G["register-remote"](base, assignment)
     else
         -- Handle unknown `action' values.

scripts/schema.gql

@@ -39,7 +39,7 @@ type Query {
     after: String
 
     # Optionally specify the result sort order.
-    #sort: SortOrder = HEIGHT_DESC
+    sort: SortOrder = HEIGHT_DESC
   ): TransactionConnection!
   block(id: String): Block
   blocks(