wao 0.29.2 → 0.30.0

package/cjs/hyperbeam.js

@@ -43,9 +43,10 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       c = _ref.c,
       cmake = _ref.cmake,
       faff = _ref.faff,
-      _ref$simplePay = _ref.simplePay,
-      simplePay = _ref$simplePay === void 0 ? false : _ref$simplePay,
-      simplePayPrice = _ref.simplePayPrice,
+      _ref$simple_pay = _ref.simple_pay,
+      simple_pay = _ref$simple_pay === void 0 ? false : _ref$simple_pay,
+      simple_pay_price = _ref.simple_pay_price,
+      p4_non_chargable_routes = _ref.p4_non_chargable_routes,
       p4_lua = _ref.p4_lua,
       store_prefix = _ref.store_prefix,
       operator = _ref.operator,
@@ -56,6 +57,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       devices = _ref.devices;
     _classCallCheck(this, HyperBEAM);
     this.devices = devices;
+    this.p4_non_chargable_routes = p4_non_chargable_routes;
     (_as2 = as) !== null && _as2 !== void 0 ? _as2 : as = shell ? [] : ["genesis_wasm"];
     this.console = console;
     if (clearCache) {
@@ -85,8 +87,8 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
     this.cu = cu;
     this.store_prefix = store_prefix ? "cache-mainnet-" + Math.floor(Math.random() * 10000000) : "cache-mainnet";
     this.p4_lua = p4_lua;
-    this.simplePay = simplePay;
-    this.spp = simplePayPrice;
+    this.simple_pay = simple_pay;
+    this.spp = simple_pay_price;
     this.operator = operator;
     this.faff = faff;
     this.c = c;
@@ -311,7 +313,9 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
         try {
           for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
             var v = _step4.value;
-            if (_devs2["default"][v]) _devs.push("#{<<\"name\">> => <<\"".concat(_devs2["default"][v].name, "\">>, <<\"module\">> => ").concat(_devs2["default"][v].module, "}"));
+            if (_typeof(v) === "object") {
+              _devs.push("#{<<\"name\">> => <<\"".concat(v.name, "\">>, <<\"module\">> => ").concat(v.module, "}"));
+            } else if (_devs2["default"][v]) _devs.push("#{<<\"name\">> => <<\"".concat(_devs2["default"][v].name, "\">>, <<\"module\">> => ").concat(_devs2["default"][v].module, "}"));
           }
         } catch (err) {
           _iterator4.e(err);
@@ -329,7 +333,9 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       /*
       const _routes = `, routes => [#{ <<"template">> => <<"/result/.*">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${this.cu}">> } }, #{ <<\"template\">> => <<\"/dry-run\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:${this.cu}\">> } }, #{ <<"template">> => <<"/graphql">>, <<"nodes">> => [#{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => httpc, protocol => http2 } }, #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } }] }, #{ <<"template">> => <<"/raw">>, <<"node">> => #{ <<"prefix">> => <<"http://localhost:${gateway}">>, <<"opts">> => #{ http_client => gun, protocol => http2 } } }]`
       */
-      var _p4_non_chargable = this.p4_lua ? ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/*~node-process@1.0/*\">> }, #{ <<\"template\">> => <<\"/~wao@1.0/*\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]" : !this.simplePay ? "" : ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/~simple-pay@1.0/topup\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]";
+      var _p4_non_chargable = this.p4_non_chargable ? ", p4_non_chargable_routes => [".concat(this.p4_non_chargable_routes.map(function () {
+        return "#{ <<\"template\">> => <<\"/*~node-process@1.0/*\">> }";
+      }).join(", "), "]") : this.p4_lua ? ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/*~node-process@1.0/*\">> }, #{ <<\"template\">> => <<\"/~wao@1.0/*\">> }, #{ <<\"template\">> => <<\"/~p4@1.0/balance\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }]" : !this.simple_pay ? "" : ", p4_non_chargable_routes => [#{ <<\"template\">> => <<\"/~simple-pay@1.0/topup\">> }, #{ <<\"template\">> => <<\"/~meta@1.0/*\">> }, #{ <<\"template\">> => <<\"/~simple-pay@1.0/balance\">> }]";
       var _operator = this.operator ? ", operator => <<\"".concat(this.operator, "\">>") : "";
       var _spp = this.spp ? ", simple_pay_price => ".concat(this.spp) : "";
       var _node_processes = this.p4_lua ? ", node_processes => #{ <<\"ledger\">> => #{ <<\"device\">> => <<\"process@1.0\">>, <<\"execution-device\">> => <<\"lua@5.3a\">>, <<\"scheduler-device\">> => <<\"scheduler@1.0\">>, <<\"module\">> => <<\"".concat(this.p4_lua.processor, "\">>, <<\"operator\">> => <<\"").concat(this.operator, "\">> } }") : "";
@@ -338,8 +344,9 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       var _faff = (0, _ramda.isNil)(this.faff) ? "" : ", faff_allow_list => [ ".concat((0, _ramda.map)(function (addr) {
         return "<<\"".concat(addr, "\">>");
       })(this.faff).join(", "), " ]");
-      var _on = this.p4_lua ? ", on => #{ <<\"request\">> => ".concat(processor, ", <<\"response\">> => ").concat(processor, " }") : this.simplePay ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> } }" : !(0, _ramda.isNil)(this.faff) ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> } }" : "";
+      var _on = this.p4_lua ? ", on => #{ <<\"request\">> => ".concat(processor, ", <<\"response\">> => ").concat(processor, " }") : this.simple_pay ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"simple-pay@1.0\">>, <<\"ledger-device\">> => <<\"simple-pay@1.0\">> } }" : !(0, _ramda.isNil)(this.faff) ? ", on => #{ <<\"request\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> }, <<\"response\">> => #{ <<\"device\">> => <<\"p4@1.0\">>, <<\"pricing-device\">> => <<\"faff@1.0\">>, <<\"ledger-device\">> => <<\"faff@1.0\">> } }" : "";
       var start = "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_faff).concat(_bundler).concat(_on).concat(_p4_non_chargable).concat(_operator).concat(_spp).concat(_devices).concat(_node_processes, "}).");
+      console.log(start);
       return start;
     }
   }, {

package/cjs/id.js

@@ -1,5 +1,6 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,9 +8,14 @@ exports.extractCommitmentIds = extractCommitmentIds;
 exports.generateCommitmentId = generateCommitmentId;
 exports.generateHmacCommitmentId = generateHmacCommitmentId;
 exports.generateRsaCommitmentId = generateRsaCommitmentId;
+exports.id = id;
 exports.parseStructuredFieldDictionary = parseStructuredFieldDictionary;
 exports.verifyCommitmentId = verifyCommitmentId;
 var _fastSha = require("fast-sha256");
+function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
+function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
+function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
+function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
@@ -69,21 +75,6 @@ function base64urlToBase64(str) {
   return str.replace(/-/g, "+").replace(/_/g, "/");
 }
 
-/**
- * Convert Uint8Array to base64url string
- */
-function uint8ArrayToBase64url(bytes) {
-  // Convert to base64
-  var binary = "";
-  for (var i = 0; i < bytes.length; i++) {
-    binary += String.fromCharCode(bytes[i]);
-  }
-  var base64 = btoa(binary);
-
-  // Convert to base64url
-  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
-}
-
 /**
  * Generate commitment ID for RSA-PSS and ECDSA signatures
  * The ID is the SHA256 hash of the raw signature bytes
@@ -201,9 +192,9 @@ function extractCommitmentIds(message) {
   }
   for (var _i = 0, _Object$entries = Object.entries(message.commitments); _i < _Object$entries.length; _i++) {
     var _Object$entries$_i = _slicedToArray(_Object$entries[_i], 2),
-      id = _Object$entries$_i[0],
+      _id = _Object$entries$_i[0],
       commitment = _Object$entries$_i[1];
-    ids[id] = {
+    ids[_id] = {
       alg: commitment.alg,
       committer: commitment.committer,
       device: commitment["commitment-device"]
@@ -231,4 +222,207 @@ function verifyCommitmentId(commitment, expectedId) {
   }
 }
 
-// Export all functions
+/**
+ * Convert Uint8Array to base64url string
+ */
+function uint8ArrayToBase64url(bytes) {
+  var binary = "";
+  for (var i = 0; i < bytes.length; i++) {
+    binary += String.fromCharCode(bytes[i]);
+  }
+  var base64 = btoa(binary);
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+
+/**
+ * Parse structured field dictionary to extract components
+ * Handles format: name=(components);params
+ */
+function parseSignatureInput(sigInput) {
+  // Extract components from format: name=(components);params
+  var match = sigInput.match(/[^=]+=\(([^)]+)\)/);
+  if (!match) return [];
+
+  // Split components and clean quotes
+  return match[1].split(" ").map(function (c) {
+    return c.replace(/"/g, "");
+  });
+}
+
+/**
+ * Calculate HMAC commitment ID for HyperBEAM messages
+ */
+function calculateHmacId(_x) {
+  return _calculateHmacId.apply(this, arguments);
+}
+/**
+ * Calculate unsigned message ID following the exact Erlang flow
+ */
+function _calculateHmacId() {
+  _calculateHmacId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(message) {
+    var components, sortedComponents, lines, _iterator, _step, component, fieldName, value, paramsComponents, signatureBase, messageBytes, keyBytes, hmacResult;
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          if (message["signature-input"]) {
+            _context.next = 2;
+            break;
+          }
+          throw new Error("HMAC calculation requires signature-input");
+        case 2:
+          // Parse components from signature-input
+          components = parseSignatureInput(message["signature-input"]); // Sort components AS-IS (with @ prefix)
+          sortedComponents = _toConsumableArray(components).sort(); // Build signature base in sorted order
+          lines = [];
+          _iterator = _createForOfIteratorHelper(sortedComponents);
+          try {
+            for (_iterator.s(); !(_step = _iterator.n()).done;) {
+              component = _step.value;
+              fieldName = component;
+              value = void 0; // For derived components (starting with @), remove @ in the signature base
+              if (component.startsWith("@")) {
+                fieldName = component.substring(1);
+                value = message[fieldName];
+              } else {
+                value = message[component];
+              }
+              if (value === undefined || value === null) {
+                value = "";
+              } else if (typeof value === "number") {
+                value = value.toString();
+              }
+              lines.push("\"".concat(fieldName, "\": ").concat(value));
+            }
+
+            // Add signature-params line with sorted components (keeping @ prefix)
+          } catch (err) {
+            _iterator.e(err);
+          } finally {
+            _iterator.f();
+          }
+          paramsComponents = sortedComponents.join(" ");
+          lines.push("\"@signature-params\": (".concat(paramsComponents, ");alg=\"hmac-sha256\";keyid=\"ao\""));
+          signatureBase = lines.join("\n"); // Generate HMAC with key "ao"
+          messageBytes = new TextEncoder().encode(signatureBase);
+          keyBytes = new TextEncoder().encode("ao");
+          _context.next = 14;
+          return (0, _fastSha.hmac)(keyBytes, messageBytes);
+        case 14:
+          hmacResult = _context.sent;
+          return _context.abrupt("return", uint8ArrayToBase64url(hmacResult));
+        case 16:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return _calculateHmacId.apply(this, arguments);
+}
+function calculateUnsignedId(_x2) {
+  return _calculateUnsignedId.apply(this, arguments);
+}
+function _calculateUnsignedId() {
+  _calculateUnsignedId = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(message) {
+    var DERIVED_COMPONENTS, httpsigMsg, _i2, _Object$entries2, _Object$entries2$_i, key, value, keys, componentsWithPrefix, lines, _iterator2, _step2, component, _key, _value, valueStr, componentsList, signatureBase, messageBytes, keyBytes, hmacResult;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          // Derived components from Erlang ?DERIVED_COMPONENTS
+          DERIVED_COMPONENTS = ["method", "target-uri", "authority", "scheme", "request-target", "path", "query", "query-param", "status"]; // Convert message for httpsig format
+          httpsigMsg = {};
+          for (_i2 = 0, _Object$entries2 = Object.entries(message); _i2 < _Object$entries2.length; _i2++) {
+            _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2), key = _Object$entries2$_i[0], value = _Object$entries2$_i[1];
+            httpsigMsg[key.toLowerCase()] = value;
+          }
+
+          // Get keys and add @ to derived components
+          keys = Object.keys(httpsigMsg);
+          componentsWithPrefix = keys.map(function (key) {
+            // Check if this is a derived component
+            if (DERIVED_COMPONENTS.includes(key.replace(/_/g, "-"))) {
+              return "@" + key;
+            }
+            return key;
+          }).sort(); // Sort AFTER adding @ prefix
+          // Build signature base - use the components in order
+          lines = [];
+          _iterator2 = _createForOfIteratorHelper(componentsWithPrefix);
+          try {
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              component = _step2.value;
+              _key = component.replace("@", "");
+              _value = httpsigMsg[_key];
+              valueStr = typeof _value === "string" ? _value : String(_value);
+              lines.push("\"".concat(_key, "\": ").concat(valueStr));
+            }
+
+            // Add signature-params line with the @ prefixes
+          } catch (err) {
+            _iterator2.e(err);
+          } finally {
+            _iterator2.f();
+          }
+          componentsList = componentsWithPrefix.map(function (k) {
+            return "\"".concat(k, "\"");
+          }).join(" ");
+          lines.push("\"@signature-params\": (".concat(componentsList, ");alg=\"hmac-sha256\";keyid=\"ao\""));
+          signatureBase = lines.join("\n"); // HMAC with key "ao"
+          messageBytes = new TextEncoder().encode(signatureBase);
+          keyBytes = new TextEncoder().encode("ao");
+          _context2.next = 15;
+          return (0, _fastSha.hmac)(keyBytes, messageBytes);
+        case 15:
+          hmacResult = _context2.sent;
+          return _context2.abrupt("return", uint8ArrayToBase64url(hmacResult));
+        case 17:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _calculateUnsignedId.apply(this, arguments);
+}
+function id(_x3) {
+  return _id2.apply(this, arguments);
+} // Export all functions
+function _id2() {
+  _id2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(message) {
+    var commitmentIds, sortedIds, idsLine, encoder, data, hashBuffer, hashArray, base64, base64url;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          // Get commitment IDs
+          commitmentIds = Object.keys(message.commitments || {});
+          if (!(commitmentIds.length === 0)) {
+            _context3.next = 5;
+            break;
+          }
+          return _context3.abrupt("return", calculateUnsignedId(message));
+        case 5:
+          if (!(commitmentIds.length === 1)) {
+            _context3.next = 9;
+            break;
+          }
+          return _context3.abrupt("return", commitmentIds[0]);
+        case 9:
+          // Multiple commitments - sort, join with ", ", and hash
+          sortedIds = commitmentIds.sort();
+          idsLine = sortedIds.join(", "); // Calculate SHA-256 hash
+          encoder = new TextEncoder();
+          data = encoder.encode(idsLine);
+          _context3.next = 15;
+          return crypto.subtle.digest("SHA-256", data);
+        case 15:
+          hashBuffer = _context3.sent;
+          hashArray = new Uint8Array(hashBuffer); // Convert to base64url
+          base64 = btoa(String.fromCharCode.apply(String, _toConsumableArray(hashArray)));
+          base64url = base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+          return _context3.abrupt("return", base64url);
+        case 20:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _id2.apply(this, arguments);
+}

package/cjs/signer.js

@@ -6,9 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.sign = sign;
 exports.signer = signer;
+Object.defineProperty(exports, "verify", {
+  enumerable: true,
+  get: function get() {
+    return _signerUtils.verify;
+  }
+});
 var _send = require("./send.js");
 var _encode = require("./encode.js");
 var _aoconnect = require("@permaweb/aoconnect");
+var _signerUtils = require("./signer-utils.js");
 var _excluded = ["path", "method"],
   _excluded2 = ["body"];
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
@@ -96,11 +103,13 @@ function _sign3() {
             return key !== "body-keys" && key !== "path" && !bodyKeys.includes(key);
           });
           if (_path) signingFields.push("path");
+          /*
           if (signingFields.length === 0 && !body) {
-            lowercaseHeaders["content-length"] = "0";
-            signingFields.push("content-length");
+            //lowercaseHeaders["content-length"] = "0"
+            //signingFields.push("content-length")
           }
-          _context3.next = 14;
+          */
+          _context3.next = 13;
           return (0, _send.toHttpSigner)(signer)({
             request: {
               url: _url,
@@ -109,7 +118,7 @@ function _sign3() {
             },
             fields: signingFields
           });
-        case 14:
+        case 13:
           signedRequest = _context3.sent;
           finalHeaders = {};
           for (_i2 = 0, _Object$entries2 = Object.entries(headersObj); _i2 < _Object$entries2.length; _i2++) {
@@ -128,7 +137,7 @@ function _sign3() {
           };
           if (body) result.body = body;
           return _context3.abrupt("return", result);
-        case 23:
+        case 22:
         case "end":
           return _context3.stop();
       }

package/cjs/utils.js

@@ -10,6 +10,12 @@ Object.defineProperty(exports, "hmacid", {
     return _id.generateHmacCommitmentId;
   }
 });
+Object.defineProperty(exports, "id", {
+  enumerable: true,
+  get: function get() {
+    return _id.id;
+  }
+});
 exports.isData = exports.isCheckComplete = void 0;
 exports.isJSON = isJSON;
 exports.optServer = exports.optAO = exports.mergeOut = exports.mergeChecks = exports.ltags = exports.jsonToStr = exports.isRegExp = exports.isOutComplete = exports.isLocalhost = void 0;

package/cjs/workspace/package.json

@@ -8,6 +8,6 @@
     "deploy": "node scripts/deploy.js"
   },
   "dependencies": {
-    "wao": "^0.28.0"
+    "wao": "^0.29.2"
   }
 }

package/cjs/workspace/test/hyperbeam.js

@@ -1,18 +1,21 @@
 import assert from "assert"
 import { describe, it, before, after, beforeEach } from "node:test"
-import { HyperBEAM, wait, toAddr } from "wao/test"
+import { HyperBEAM, toAddr } from "wao/test"
 import { HB } from "wao"
 import { resolve } from "path"
 import { readFileSync } from "fs"
 
 const cwd = "../../HyperBEAM"
-const wallet = ".wallet.json"
+const wallet = resolve(process.cwd(), cwd, ".wallet.json")
+
+const jwk = JSON.parse(readFileSync(wallet, "utf8"))
+const addr = toAddr(jwk.n)
 
 describe("HyperBEAM", function () {
   let hbeam, hb, jwk
 
   before(async () => {
-    hbeam = await new HyperBEAM({ c: "12", cmake: "3.5", cwd, wallet }).ready()
+    hbeam = await new HyperBEAM({ cwd }).ready()
     jwk = JSON.parse(readFileSync(resolve(process.cwd(), cwd, wallet), "utf8"))
   })
 
@@ -21,7 +24,7 @@ describe("HyperBEAM", function () {
   after(async () => hbeam.kill())
 
   it("should run a HyperBEAM node", async () => {
-    const info = await hb.getJSON({ path: "/~meta@1.0/info" })
-    assert.equal(info.address, toAddr(jwk.n))
+    const { out } = await hb.getJSON({ path: "/~meta@1.0/build" })
+    assert.equal(out.node, "HyperBEAM")
   })
 })

package/esm/ao.js

@@ -767,7 +767,7 @@ class AO {
     jwk,
     tags = {},
     data,
-  }) {
+  } = {}) {
     let [fns, isBoot] = [[], false]
     if (boot === true && !data) {
       isBoot = true

package/esm/devs.js

@@ -1,47 +1,70 @@
 export default {
-  ans104: { name: "ans104@1.0", module: "dev_codec_ans104" },
-  compute: { name: "compute@1.0", module: "dev_cu" },
-  cache: { name: "cache@1.0", module: "dev_cache" },
-  cacheviz: { name: "cacheviz@1.0", module: "dev_cacheviz" },
-  cron: { name: "cron@1.0", module: "dev_cron" },
-  dedup: { name: "dedup@1.0", module: "dev_dedup" },
+  // fundamental
+  meta: { name: "meta@1.0", module: "dev_meta" },
+  json: { name: "json@1.0", module: "dev_codec_json" },
+  flat: { name: "flat@1.0", module: "dev_codec_flat" },
+  httpsig: { name: "httpsig@1.0", module: "dev_codec_httpsig" },
+  structured: { name: "structured@1.0", module: "dev_codec_structured" },
+  wao: { name: "wao@1.0", module: "dev_wao" },
+
+  // process
+  process: { name: "process@1.0", module: "dev_process" },
+  message: { name: "message@1.0", module: "dev_message" },
+  scheduler: { name: "scheduler@1.0", module: "dev_scheduler" },
+
+  // legacynet aos
   "delegated-compute": {
     name: "delegated-compute@1.0",
     module: "dev_delegated_compute",
   },
-  faff: { name: "faff@1.0", module: "dev_faff" },
-  flat: { name: "flat@1.0", module: "dev_codec_flat" },
   "genesis-wasm": { name: "genesis-wasm@1.0", module: "dev_genesis_wasm" },
-  greenzone: { name: "greenzone@1.0", module: "dev_green_zone" },
-  httpsig: { name: "httpsig@1.0", module: "dev_codec_httpsig" },
-  hyperbuddy: { name: "hyperbuddy@1.0", module: "dev_hyperbuddy" },
-  json: { name: "json@1.0", module: "dev_codec_json" },
-  "json-iface": { name: "json-iface@1.0", module: "dev_json_iface" },
-  "local-name": { name: "local-name@1.0", module: "dev_local_name" },
-  lookup: { name: "lookup@1.0", module: "dev_lookup" },
+
+  // hyper aos
   lua: { name: "lua@5.3a", module: "dev_lua" },
-  manifest: { name: "manifest@1.0", module: "dev_manifest" },
-  message: { name: "message@1.0", module: "dev_message" },
-  meta: { name: "meta@1.0", module: "dev_meta" },
-  monitor: { name: "monitor@1.0", module: "dev_monitor" },
-  multipass: { name: "multipass@1.0", module: "dev_multipass" },
-  name: { name: "name@1.0", module: "dev_name" },
-  "node-process": { name: "node-process@1.0", module: "dev_node_process" },
-  p4: { name: "p4@1.0", module: "dev_p4" },
+
+  // mainnet aos
+  wasi: { name: "wasi@1.0", module: "dev_wasi" },
+  "wasm-64": { name: "wasm-64@1.0", module: "dev_wasm" },
+  "json-iface": { name: "json-iface@1.0", module: "dev_json_iface" },
+
+  // process utils
+  "test-device": { name: "test-device@1.0", module: "dev_test" },
   patch: { name: "patch@1.0", module: "dev_patch" },
-  poda: { name: "poda@1.0", module: "dev_poda" },
-  process: { name: "process@1.0", module: "dev_process" },
   push: { name: "push@1.0", module: "dev_push" },
+  stack: { name: "stack@1.0", module: "dev_stack" },
+  multipass: { name: "multipass@1.0", module: "dev_multipass" },
+
+  // payment
+  faff: { name: "faff@1.0", module: "dev_faff" },
+  p4: { name: "p4@1.0", module: "dev_p4" },
+  "node-process": { name: "node-process@1.0", module: "dev_node_process" },
+  "simple-pay": { name: "simple-pay@1.0", module: "dev_simple_pay" },
+
+  // tested
+  cron: { name: "cron@1.0", module: "dev_cron" },
   relay: { name: "relay@1.0", module: "dev_relay" },
   router: { name: "router@1.0", module: "dev_router" },
-  scheduler: { name: "scheduler@1.0", module: "dev_scheduler" },
-  "simple-pay": { name: "simple-pay@1.0", module: "dev_simple_pay" },
+
+  // storage
+  cache: { name: "cache@1.0", module: "dev_cache" },
+  "local-name": { name: "local-name@1.0", module: "dev_local_name" },
+  lookup: { name: "lookup@1.0", module: "dev_lookup" },
+  name: { name: "name@1.0", module: "dev_name" },
+
+  // others
+  compute: { name: "compute@1.0", module: "dev_cu" },
+  dedup: { name: "dedup@1.0", module: "dev_dedup" },
+  manifest: { name: "manifest@1.0", module: "dev_manifest" },
+  monitor: { name: "monitor@1.0", module: "dev_monitor" },
+
+  // advanced
   snp: { name: "snp@1.0", module: "dev_snp" },
-  stack: { name: "stack@1.0", module: "dev_stack" },
-  structured: { name: "structured@1.0", module: "dev_codec_structured" },
-  "test-device": { name: "test-device@1.0", module: "dev_test" },
   volume: { name: "volume@1.0", module: "dev_volume" },
-  wasi: { name: "wasi@1.0", module: "dev_wasi" },
-  "wasm-64": { name: "wasm-64@1.0", module: "dev_wasm" },
-  wao: { name: "wao@1.0", module: "dev_wao" },
+  poda: { name: "poda@1.0", module: "dev_poda" },
+  greenzone: { name: "greenzone@1.0", module: "dev_green_zone" },
+
+  // misc
+  hyperbuddy: { name: "hyperbuddy@1.0", module: "dev_hyperbuddy" },
+  ans104: { name: "ans104@1.0", module: "dev_codec_ans104" },
+  cacheviz: { name: "cacheviz@1.0", module: "dev_cacheviz" },
 }