wao 0.36.1 → 0.36.3

package/cjs/bundler.js

@@ -0,0 +1,219 @@
+"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
+});
+exports["default"] = void 0;
+var _express = _interopRequireDefault(require("express"));
+var _turboSdk = require("@ardrive/turbo-sdk");
+var _arbundles = require("@dha-team/arbundles");
+var _cors = _interopRequireDefault(require("cors"));
+var _bodyParser = _interopRequireDefault(require("body-parser"));
+var _hbsig = require("hbsig");
+var _ramda = require("ramda");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+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 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); }); }; }
+var timestamp = 0;
+var height = 0;
+var last_checked = 0;
+var nonce = 0;
+var toMsg = function toMsg(req) {
+  var msg = req.headers;
+  if (req.body) msg.body = req.body.toString("binary");
+  return msg;
+};
+var bundler = function bundler() {
+  var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+    _ref$port = _ref.port,
+    port = _ref$port === void 0 ? 4001 : _ref$port,
+    jwk = _ref.jwk,
+    _ref$timeout = _ref.timeout,
+    timeout = _ref$timeout === void 0 ? 1000 * 60 : _ref$timeout;
+  var app = (0, _express["default"])();
+  app.use((0, _cors["default"])());
+  app.use(_bodyParser["default"].raw({
+    type: "*/*",
+    limit: "100mb"
+  }));
+  app.post("/tx", /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(req, res) {
+      var out, k, _out$body$commitments, _out$body, _out$body2, msg, signer, tags, type, _i, _Object$values, tagObj, opt, di, _res, dis, _out$blockHeight, _out$blockTimestamp, json, atags, _tags, _k, _signer, di2, res2;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (Buffer.isBuffer(req.body)) {
+              _context2.next = 3;
+              break;
+            }
+            console.log("BD: Invalid body | expected raw Buffer");
+            return _context2.abrupt("return", res.status(400).send("Invalid body: expected raw Buffer"));
+          case 3:
+            res.status(200).send("success");
+            _context2.prev = 4;
+            out = (0, _hbsig.structured_to)((0, _hbsig.httpsig_from)(toMsg(req)));
+            _context2.t0 = _regeneratorRuntime().keys((_out$body$commitments = (_out$body = out.body) === null || _out$body === void 0 ? void 0 : _out$body.commitments) !== null && _out$body$commitments !== void 0 ? _out$body$commitments : {});
+          case 7:
+            if ((_context2.t1 = _context2.t0()).done) {
+              _context2.next = 57;
+              break;
+            }
+            k = _context2.t1.value;
+            msg = (_out$body2 = out.body) === null || _out$body2 === void 0 ? void 0 : _out$body2.commitments[k];
+            signer = {
+              signatureType: 1,
+              signatureLength: 512,
+              ownerLength: 512,
+              publicKey: msg.owner,
+              sign: function () {
+                var _sign = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+                  return _regeneratorRuntime().wrap(function _callee$(_context) {
+                    while (1) switch (_context.prev = _context.next) {
+                      case 0:
+                      case "end":
+                        return _context.stop();
+                    }
+                  }, _callee);
+                }));
+                function sign() {
+                  return _sign.apply(this, arguments);
+                }
+                return sign;
+              }()
+            };
+            tags = [];
+            type = null;
+            if (msg["original-tags"]) {
+              for (_i = 0, _Object$values = Object.values(msg["original-tags"]); _i < _Object$values.length; _i++) {
+                tagObj = _Object$values[_i];
+                tags.push({
+                  name: tagObj.name,
+                  value: tagObj.value
+                });
+                if (tagObj.name === "Type") {
+                  type = tagObj.value;
+                }
+              }
+            }
+            opt = {
+              tags: tags
+            };
+            if (type !== "Process") opt.target = out.process;
+            _context2.next = 18;
+            return (0, _arbundles.createData)(out.data || "", signer, opt);
+          case 18:
+            di = _context2.sent;
+            _context2.next = 21;
+            return di.setSignature(msg.signature);
+          case 21:
+            _context2.next = 23;
+            return fetch("https://up.arweave.net:443/tx", {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/octet-stream"
+              },
+              body: di.binary
+            });
+          case 23:
+            _res = _context2.sent;
+            console.log(_res === null || _res === void 0 ? void 0 : _res.status, di.tags);
+            dis = [di];
+            if (!(type === "Message")) {
+              _context2.next = 55;
+              break;
+            }
+            if (out["block-timestamp"]) {
+              _context2.next = 41;
+              break;
+            }
+            _context2.prev = 28;
+            if (!(Date.now() - last_checked > timeout)) {
+              _context2.next = 36;
+              break;
+            }
+            _context2.next = 32;
+            return fetch("https://arweave.net/block/current").then(function (r) {
+              return r.json();
+            });
+          case 32:
+            json = _context2.sent;
+            height = json.height;
+            timestamp = json.timestamp;
+            last_checked = Date.now();
+          case 36:
+            _context2.next = 41;
+            break;
+          case 38:
+            _context2.prev = 38;
+            _context2.t2 = _context2["catch"](28);
+            console.log(_context2.t2);
+          case 41:
+            atags = {
+              Process: out.process,
+              Epoch: out.epoch,
+              Nonce: Number(++nonce).toString(),
+              "Hash-Chain": out["hash-chain"],
+              "Block-Height": Number((_out$blockHeight = out["block-height"]) !== null && _out$blockHeight !== void 0 ? _out$blockHeight : height).toString(),
+              Tmestamp: Number((_out$blockTimestamp = out["block-timestamp"]) !== null && _out$blockTimestamp !== void 0 ? _out$blockTimestamp : timestamp).toString(),
+              "Data-Protocol": "ao",
+              Slot: Number(out.slot).toString(),
+              Variant: "ao.WDB.1",
+              Type: "Assignment",
+              Message: di.id
+            };
+            _tags = [];
+            if (msg["original-tags"]) {
+              for (_k in atags) _tags.push({
+                name: _k,
+                value: atags[_k]
+              });
+            }
+            _signer = new _turboSdk.ArweaveSigner(jwk);
+            _context2.next = 47;
+            return (0, _arbundles.createData)("", _signer, {
+              tags: _tags
+            });
+          case 47:
+            di2 = _context2.sent;
+            _context2.next = 50;
+            return di2.sign(_signer);
+          case 50:
+            dis.push(di2);
+            _context2.next = 53;
+            return fetch("https://up.arweave.net:443/tx", {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/octet-stream"
+              },
+              body: di2.binary
+            });
+          case 53:
+            res2 = _context2.sent;
+            console.log(res2 === null || res2 === void 0 ? void 0 : res2.status, di2.tags);
+          case 55:
+            _context2.next = 7;
+            break;
+          case 57:
+            _context2.next = 62;
+            break;
+          case 59:
+            _context2.prev = 59;
+            _context2.t3 = _context2["catch"](4);
+            console.log(_context2.t3);
+          case 62:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2, null, [[4, 59], [28, 38]]);
+    }));
+    return function (_x, _x2) {
+      return _ref2.apply(this, arguments);
+    };
+  }());
+  return app.listen(port, function () {
+    return console.log("BD on port ".concat(port));
+  });
+};
+var _default = exports["default"] = bundler;

package/cjs/hb.js

@@ -492,7 +492,7 @@ var HB = /*#__PURE__*/function () {
                 data: data,
                 pid: this.cache,
                 tags: {
-                  "content-type": type
+                  "Content-Type": type
                 }
               });
             case 9:
@@ -600,7 +600,7 @@ var HB = /*#__PURE__*/function () {
             case 0:
               _ref7 = _args18.length > 0 && _args18[0] !== undefined ? _args18[0] : {}, pid = _ref7.pid, _ref7$tags = _ref7.tags, tags = _ref7$tags === void 0 ? {} : _ref7$tags, data = _ref7.data;
               _tags = (0, _ramda.mergeLeft)(tags, {
-                type: "Message",
+                Type: "Message",
                 target: pid
               });
               if (data) _tags.data = data;
@@ -677,23 +677,23 @@ var HB = /*#__PURE__*/function () {
     key: "post104",
     value: function () {
       var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee19(_ref9) {
-        var _ref9$path, path, _ref9$tags, tags, _ref9$data, data, _tags, signer, di, res, _headers;
+        var _ref9$path, path, _ref9$tags, tags, _ref9$data, data, target, _tags, signer, di, res;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
             case 0:
-              _ref9$path = _ref9.path, path = _ref9$path === void 0 ? "/~process@1.0/schedule" : _ref9$path, _ref9$tags = _ref9.tags, tags = _ref9$tags === void 0 ? {} : _ref9$tags, _ref9$data = _ref9.data, data = _ref9$data === void 0 ? "1984" : _ref9$data;
+              _ref9$path = _ref9.path, path = _ref9$path === void 0 ? "/~process@1.0/schedule" : _ref9$path, _ref9$tags = _ref9.tags, tags = _ref9$tags === void 0 ? {} : _ref9$tags, _ref9$data = _ref9.data, data = _ref9$data === void 0 ? "1984" : _ref9$data, target = _ref9.target;
               _tags = (0, _utils.buildTags)((0, _ramda.mergeLeft)(tags, {
                 signingFormat: "ANS-104"
               }));
               signer = new _sdk.ArweaveSigner(this.jwk);
-              console.log(_tags);
               di = (0, _arbundles.createData)(data, signer, {
-                tags: _tags
+                tags: _tags,
+                target: target
               });
-              _context19.next = 7;
+              _context19.next = 6;
               return di.sign(signer);
-            case 7:
-              _context19.next = 9;
+            case 6:
+              _context19.next = 8;
               return fetch("".concat(this.url).concat(path), {
                 method: "POST",
                 headers: {
@@ -702,19 +702,18 @@ var HB = /*#__PURE__*/function () {
                 },
                 body: di.binary
               });
-            case 9:
+            case 8:
               res = _context19.sent;
               _context19.t0 = _hbsig.structured_to;
               _context19.t1 = _hbsig.httpsig_from;
-              _context19.next = 14;
+              _context19.next = 13;
               return toMsg(res);
-            case 14:
+            case 13:
               _context19.t2 = _context19.sent;
               _context19.t3 = (0, _context19.t1)(_context19.t2);
-              _headers = (0, _context19.t0)(_context19.t3);
-              res.out = _headers;
+              res.out = (0, _context19.t0)(_context19.t3);
               return _context19.abrupt("return", res);
-            case 19:
+            case 17:
             case "end":
               return _context19.stop();
           }
@@ -750,10 +749,11 @@ var HB = /*#__PURE__*/function () {
                 break;
               }
               _tags = (0, _ramda.mergeLeft)(tags, {
-                type: "Message"
+                Type: "Message"
               });
               _context20.next = 6;
               return this.post104({
+                target: pid,
                 path: "/".concat(pid, "/schedule"),
                 tags: _tags,
                 data: data !== null && data !== void 0 ? data : "1984"
@@ -764,7 +764,7 @@ var HB = /*#__PURE__*/function () {
               break;
             case 9:
               _tags2 = (0, _ramda.mergeLeft)(tags, {
-                type: "Message",
+                Type: "Message",
                 target: pid
               });
               if (data) _tags2.data = data;
@@ -857,9 +857,9 @@ var HB = /*#__PURE__*/function () {
             case 10:
               _context22.t2 = _context22.t1;
               tags = {
-                "data-protocol": "ao",
-                variant: "ao.N.1",
-                authority: _context22.t0,
+                "Data-Protocol": "ao",
+                Variant: "ao.N.1",
+                Authority: _context22.t0,
                 module: _context22.t2,
                 "execution-device": "lua@5.3a",
                 "push-device": "push@1.0",
@@ -920,19 +920,31 @@ var HB = /*#__PURE__*/function () {
     key: "slot",
     value: function () {
       var _slot = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee24(_ref13) {
-        var pid, _ref13$path, path;
+        var pid, _ref13$path, path, res;
         return _regeneratorRuntime().wrap(function _callee24$(_context24) {
           while (1) switch (_context24.prev = _context24.next) {
             case 0:
               pid = _ref13.pid, _ref13$path = _ref13.path, path = _ref13$path === void 0 ? "" : _ref13$path;
               if (path && !/^\//.test(path)) path = "/" + path;
-              _context24.next = 4;
+              if (!(this.format === "ans104")) {
+                _context24.next = 9;
+                break;
+              }
+              _context24.next = 5;
+              return this.get({
+                path: "/".concat(pid, "/slot").concat(path)
+              });
+            case 5:
+              res = _context24.sent;
+              return _context24.abrupt("return", res.out);
+            case 9:
+              _context24.next = 11;
               return this.getJSON({
                 path: "/".concat(pid, "/slot").concat(path)
               });
-            case 4:
+            case 11:
               return _context24.abrupt("return", _context24.sent);
-            case 5:
+            case 12:
             case "end":
               return _context24.stop();
           }
@@ -1027,10 +1039,10 @@ var HB = /*#__PURE__*/function () {
                 tags: (0, _ramda.mergeLeft)(tags, {
                   "codec-device": "ans104@1.0",
                   "random-seed": (0, _utils.seed)(16),
-                  type: "Process",
+                  Type: "Process",
                   "execution-device": "test-device@1.0",
                   device: "process@1.0",
-                  scheduler: this.operator
+                  Scheduler: this.operator
                 })
               });
             case 7:
@@ -1042,10 +1054,10 @@ var HB = /*#__PURE__*/function () {
               _context27.next = 13;
               return this.commit((0, _ramda.mergeLeft)(tags, {
                 "random-seed": (0, _utils.seed)(16),
-                type: "Process",
+                Type: "Process",
                 "execution-device": "test-device@1.0",
                 device: "process@1.0",
-                scheduler: this.operator
+                Scheduler: this.operator
               }), {
                 path: false
               });
@@ -1055,7 +1067,7 @@ var HB = /*#__PURE__*/function () {
               _context27.t3 = {
                 path: "/~process@1.0/schedule",
                 body: _context27.t1,
-                scheduler: _context27.t2
+                Scheduler: _context27.t2
               };
               _context27.next = 18;
               return _context27.t0.post.call(_context27.t0, _context27.t3);
@@ -1096,9 +1108,9 @@ var HB = /*#__PURE__*/function () {
               return this.setInfo();
             case 3:
               t = (0, _ramda.mergeLeft)(tags, {
-                "data-protocol": "ao",
-                variant: "ao.TN.1",
-                authority: this.operator,
+                "Data-Protocol": "ao",
+                Variant: "ao.TN.1",
+                Authority: this.operator,
                 module: module !== null && module !== void 0 ? module : "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
                 device: "process@1.0",
                 "execution-device": "stack@1.0",
@@ -1188,7 +1200,7 @@ var HB = /*#__PURE__*/function () {
                 path: "/~relay@1.0/call",
                 method: "GET",
                 "relay-path": "".concat(this.cu, "/results/").concat(process).concat(params),
-                "content-type": "application/json"
+                "Content-Type": "application/json"
               });
             case 9:
               res = _context30.sent;
@@ -1232,7 +1244,7 @@ var HB = /*#__PURE__*/function () {
                 path: "/~relay@1.0/call",
                 method: "POST",
                 "relay-path": "".concat(this.cu, "/dry-run?process-id=").concat(pid),
-                "content-type": "application/json",
+                "Content-Type": "application/json",
                 "relay-body": JSON.stringify(json)
               });
             case 6:
@@ -1603,9 +1615,9 @@ var HB = /*#__PURE__*/function () {
               image = _context39.t0;
             case 14:
               tags = {
-                "data-protocol": "ao",
-                variant: "ao.N.1",
-                authority: this.operator,
+                "Data-Protocol": "ao",
+                Variant: "ao.N.1",
+                Authority: this.operator,
                 image: image,
                 "execution-device": "stack@1.0",
                 "push-device": "push@1.0",

package/cjs/hyperbeam.js

@@ -52,6 +52,8 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       _ref$simple_pay = _ref.simple_pay,
       simple_pay = _ref$simple_pay === void 0 ? false : _ref$simple_pay,
       simple_pay_price = _ref.simple_pay_price,
+      bundler_ans104 = _ref.bundler_ans104,
+      bundler_httpsig = _ref.bundler_httpsig,
       p4_non_chargable_routes = _ref.p4_non_chargable_routes,
       p4_lua = _ref.p4_lua,
       store_prefix = _ref.store_prefix,
@@ -106,7 +108,9 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
     this.cmake = cmake;
     this.port = port;
     this.url = "http://localhost:".concat(this.port);
-    this.bundler = bundler;
+    if (bundler) this.bundler = "http://localhost::".concat(bundler);
+    this.bundler_ans104 = bundler_ans104;
+    if (bundler_httpsig) this.bundler = bundler_httpsig;
     this.as = as;
     this.gateway = gateway;
     if (Array.isArray(this.faff)) {
@@ -378,7 +382,8 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
 
       // store option will be overwritten by hb.erl
       var _store = this.store_prefix ? ", store => [#{ <<\"store-module\">> => hb_store_fs, <<\"prefix\">> => <<\"".concat(this.store_prefix, "\">> }, #{ <<\"store-module\">> => hb_store_gateway, <<\"subindex\">> => [#{ <<\"name\">> => <<\"Data-Protocol\">>, <<\"value\">> => <<\"ao\">> }], <<\"store\">> => [#{ <<\"store-module\">> => hb_store_fs, <<\"prefix\">> => <<\"").concat(this.store_prefix, "\">> }] }, #{ <<\"store-module\">> => hb_store_gateway, <<\"store\">> => [#{ <<\"store-module\">> => hb_store_fs, <<\"prefix\">> => <<\"").concat(this.store_prefix, "\">> }] }]") : "";
-      var _bundler = this.bundler ? ", bundler_httpsig => <<\"http://localhost:".concat(this.bundler, "\">>") : "";
+      var _bundler = this.bundler ? ", bundler_httpsig => <<\"".concat(this.bundler, "\">>") : "";
+      var _bundler_ans104 = this.bundler_ans104 === false ? ", bundler_ans104 => false" : this.bundler_ans104 ? ", bundler_ans104 => <<\"http://localhost:".concat(this.bundler_ans104, "\">>") : "";
       /*
       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 } } }]`
       */
@@ -394,7 +399,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
         return "<<\"".concat(addr, "\">>");
       })(this.faff).join(", "), " ]");
       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, "}).");
+      var start = "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_faff).concat(_bundler).concat(_bundler_ans104).concat(_on).concat(_p4_non_chargable).concat(_operator).concat(_spp).concat(_devices).concat(_node_processes, "}).");
       return start;
     }
   }, {

package/esm/bundler.js

@@ -0,0 +1,117 @@
+import express from "express"
+import { ArweaveSigner, TurboFactory } from "@ardrive/turbo-sdk"
+import { createData } from "@dha-team/arbundles"
+import cors from "cors"
+import bodyParser from "body-parser"
+import { httpsig_from, structured_to } from "hbsig"
+import { keys, omit } from "ramda"
+
+let timestamp = 0
+let height = 0
+let last_checked = 0
+let nonce = 0
+
+const toMsg = req => {
+  let msg = req.headers
+  if (req.body) msg.body = req.body.toString("binary")
+  return msg
+}
+
+const bundler = ({ port = 4001, jwk, timeout = 1000 * 60 } = {}) => {
+  const app = express()
+  app.use(cors())
+  app.use(bodyParser.raw({ type: "*/*", limit: "100mb" }))
+  app.post("/tx", async (req, res) => {
+    if (!Buffer.isBuffer(req.body)) {
+      console.log("BD: Invalid body | expected raw Buffer")
+      return res.status(400).send("Invalid body: expected raw Buffer")
+    }
+    res.status(200).send("success")
+    try {
+      const out = structured_to(httpsig_from(toMsg(req)))
+      for (const k in out.body?.commitments ?? {}) {
+        const msg = out.body?.commitments[k]
+        const signer = {
+          signatureType: 1,
+          signatureLength: 512,
+          ownerLength: 512,
+          publicKey: msg.owner,
+          sign: async () => {},
+        }
+        const tags = []
+        let type = null
+        if (msg["original-tags"]) {
+          for (const tagObj of Object.values(msg["original-tags"])) {
+            tags.push({ name: tagObj.name, value: tagObj.value })
+            if (tagObj.name === "Type") {
+              type = tagObj.value
+            }
+          }
+        }
+        let opt = { tags }
+        if (type !== "Process") opt.target = out.process
+        const di = await createData(out.data || "", signer, opt)
+        await di.setSignature(msg.signature)
+        const res = await fetch("https://up.arweave.net:443/tx", {
+          method: "POST",
+          headers: {
+            "Content-Type": "application/octet-stream",
+          },
+          body: di.binary,
+        })
+        console.log(res?.status, di.tags)
+        const dis = [di]
+        if (type === "Message") {
+          if (!out["block-timestamp"]) {
+            try {
+              if (Date.now() - last_checked > timeout) {
+                const json = await fetch(
+                  "https://arweave.net/block/current"
+                ).then(r => r.json())
+                height = json.height
+                timestamp = json.timestamp
+                last_checked = Date.now()
+              }
+            } catch (e) {
+              console.log(e)
+            }
+          }
+          const atags = {
+            Process: out.process,
+            Epoch: out.epoch,
+            Nonce: Number(++nonce).toString(),
+            "Hash-Chain": out["hash-chain"],
+            "Block-Height": Number(out["block-height"] ?? height).toString(),
+            Tmestamp: Number(out["block-timestamp"] ?? timestamp).toString(),
+            "Data-Protocol": "ao",
+            Slot: Number(out.slot).toString(),
+            Variant: "ao.WDB.1",
+            Type: "Assignment",
+            Message: di.id,
+          }
+          const tags = []
+          if (msg["original-tags"]) {
+            for (const k in atags) tags.push({ name: k, value: atags[k] })
+          }
+          const signer = new ArweaveSigner(jwk)
+          const di2 = await createData("", signer, { tags })
+          await di2.sign(signer)
+          dis.push(di2)
+          const res2 = await fetch("https://up.arweave.net:443/tx", {
+            method: "POST",
+            headers: {
+              "Content-Type": "application/octet-stream",
+            },
+            body: di2.binary,
+          })
+          console.log(res2?.status, di2.tags)
+        }
+      }
+    } catch (e) {
+      console.log(e)
+    }
+  })
+  return app.listen(port, () => console.log(`BD on port ${port}`))
+}
+
+export default bundler

package/esm/hb.js

@@ -127,7 +127,7 @@ class HB {
     const { slot } = await this.scheduleFlat({
       data,
       pid: this.cache,
-      tags: { "content-type": type },
+      tags: { "Content-Type": type },
     })
     const msgs = await this.messages({ pid: this.cache, from: slot, limit: 1 })
     return msgs.edges[0].node.message.Id
@@ -146,7 +146,7 @@ class HB {
   }
 
   async scheduleFlat({ pid, tags = {}, data } = {}) {
-    let _tags = mergeLeft(tags, { type: "Message", target: pid })
+    let _tags = mergeLeft(tags, { Type: "Message", target: pid })
     if (data) _tags.data = data
     let res = await this.post({ path: "/~process@1.0/schedule", body: _tags })
     return { slot: res.out.slot, res, pid }
@@ -160,11 +160,15 @@ class HB {
     })
     return { slot: res.out.slot, res, pid }
   }
-  async post104({ path = "/~process@1.0/schedule", tags = {}, data = "1984" }) {
+  async post104({
+    path = "/~process@1.0/schedule",
+    tags = {},
+    data = "1984",
+    target,
+  }) {
     const _tags = buildTags(mergeLeft(tags, { signingFormat: "ANS-104" }))
     const signer = new ArweaveSigner(this.jwk)
-    console.log(_tags)
-    const di = createData(data, signer, { tags: _tags })
+    const di = createData(data, signer, { tags: _tags, target })
     await di.sign(signer)
     let res = await fetch(`${this.url}${path}`, {
       method: "POST",
@@ -174,22 +178,22 @@ class HB {
       },
       body: di.binary,
     })
-    let _headers = structured_to(httpsig_from(await toMsg(res)))
-    res.out = _headers
+    res.out = structured_to(httpsig_from(await toMsg(res)))
     return res
   }
 
   async schedule({ pid, tags = {}, data } = {}) {
     let res = null
     if (this.format === "ans104") {
-      let _tags = mergeLeft(tags, { type: "Message" })
+      let _tags = mergeLeft(tags, { Type: "Message" })
       res = await this.post104({
+        target: pid,
         path: `/${pid}/schedule`,
         tags: _tags,
         data: data ?? "1984",
       })
     } else {
-      let _tags = mergeLeft(tags, { type: "Message", target: pid })
+      let _tags = mergeLeft(tags, { Type: "Message", target: pid })
       if (data) _tags.data = data
       let body = await this.commit(_tags, { path: false })
       let signed = await this.sign({ path: `/${pid}/schedule`, body })
@@ -206,9 +210,9 @@ class HB {
   async spawnLua(lua) {
     await this.setInfo()
     const tags = {
-      "data-protocol": "ao",
-      variant: "ao.N.1",
-      authority: this.operator,
+      "Data-Protocol": "ao",
+      Variant: "ao.N.1",
+      Authority: this.operator,
       module: this.lua ?? (await this.getLua()),
       "execution-device": "lua@5.3a",
       "push-device": "push@1.0",
@@ -229,7 +233,12 @@ class HB {
 
   async slot({ pid, path = "" }) {
     if (path && !/^\//.test(path)) path = "/" + path
-    return await this.getJSON({ path: `/${pid}/slot${path}` })
+    if (this.format === "ans104") {
+      const res = await this.get({ path: `/${pid}/slot${path}` })
+      return res.out
+    } else {
+      return await this.getJSON({ path: `/${pid}/slot${path}` })
+    }
   }
 
   async messages({ pid, from, to } = {}) {
@@ -256,10 +265,10 @@ class HB {
         tags: mergeLeft(tags, {
           "codec-device": "ans104@1.0",
           "random-seed": seed(16),
-          type: "Process",
+          Type: "Process",
           "execution-device": "test-device@1.0",
           device: "process@1.0",
-          scheduler: this.operator,
+          Scheduler: this.operator,
         }),
       })
     } else {
@@ -268,14 +277,14 @@ class HB {
         body: await this.commit(
           mergeLeft(tags, {
             "random-seed": seed(16),
-            type: "Process",
+            Type: "Process",
             "execution-device": "test-device@1.0",
             device: "process@1.0",
-            scheduler: this.operator,
+            Scheduler: this.operator,
           }),
           { path: false }
         ),
-        scheduler: this.operator,
+        Scheduler: this.operator,
       })
     }
     return { res, pid: res.out.process }
@@ -284,9 +293,9 @@ class HB {
   async spawnLegacy({ module, tags = {}, data } = {}) {
     await this.setInfo()
     let t = mergeLeft(tags, {
-      "data-protocol": "ao",
-      variant: "ao.TN.1",
-      authority: this.operator,
+      "Data-Protocol": "ao",
+      Variant: "ao.TN.1",
+      Authority: this.operator,
       module: module ?? "ISShJH1ij-hPPt9St5UFFr_8Ys3Kj5cyg7zrMGt7H9s",
       device: "process@1.0",
       "execution-device": "stack@1.0",
@@ -316,7 +325,7 @@ class HB {
       path: "/~relay@1.0/call",
       method: "GET",
       "relay-path": `${this.cu}/results/${process}${params}`,
-      "content-type": "application/json",
+      "Content-Type": "application/json",
     })
     return JSON.parse(res.body)
   }
@@ -329,7 +338,7 @@ class HB {
       path: "/~relay@1.0/call",
       method: "POST",
       "relay-path": `${this.cu}/dry-run?process-id=${pid}`,
-      "content-type": "application/json",
+      "Content-Type": "application/json",
       "relay-body": JSON.stringify(json),
     })
     return JSON.parse(res.body)
@@ -399,9 +408,9 @@ class HB {
     await this.setInfo()
     image ??= this.image ?? (await this.getImage())
     const tags = {
-      "data-protocol": "ao",
-      variant: "ao.N.1",
-      authority: this.operator,
+      "Data-Protocol": "ao",
+      Variant: "ao.N.1",
+      Authority: this.operator,
       image,
       "execution-device": "stack@1.0",
       "push-device": "push@1.0",

package/esm/hyperbeam.js

@@ -24,6 +24,8 @@ export default class HyperBEAM {
     faff,
     simple_pay = false,
     simple_pay_price,
+    bundler_ans104,
+    bundler_httpsig,
     p4_non_chargable_routes,
     p4_lua,
     store_prefix,
@@ -66,7 +68,9 @@ export default class HyperBEAM {
     this.cmake = cmake
     this.port = port
     this.url = `http://localhost:${this.port}`
-    this.bundler = bundler
+    if (bundler) this.bundler = `http://localhost::${bundler}`
+    this.bundler_ans104 = bundler_ans104
+    if (bundler_httpsig) this.bundler = bundler_httpsig
     this.as = as
     this.gateway = gateway
     if (Array.isArray(this.faff)) {
@@ -221,9 +225,15 @@ export default class HyperBEAM {
     const _store = this.store_prefix
       ? `, store => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"${this.store_prefix}">> }, #{ <<"store-module">> => hb_store_gateway, <<"subindex">> => [#{ <<"name">> => <<"Data-Protocol">>, <<"value">> => <<"ao">> }], <<"store">> => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"${this.store_prefix}">> }] }, #{ <<"store-module">> => hb_store_gateway, <<"store">> => [#{ <<"store-module">> => hb_store_fs, <<"prefix">> => <<"${this.store_prefix}">> }] }]`
       : ""
-    const _bundler = this.bundler
-      ? `, bundler_httpsig => <<"http://localhost:${this.bundler}">>`
+    let _bundler = this.bundler
+      ? `, bundler_httpsig => <<"${this.bundler}">>`
       : ""
+    let _bundler_ans104 =
+      this.bundler_ans104 === false
+        ? ", bundler_ans104 => false"
+        : this.bundler_ans104
+          ? `, bundler_ans104 => <<"http://localhost:${this.bundler_ans104}">>`
+          : ""
     /*
     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 } } }]`
     */
@@ -260,7 +270,7 @@ export default class HyperBEAM {
         : !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">> } }`
           : ""
-    const start = `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_faff}${_bundler}${_on}${_p4_non_chargable}${_operator}${_spp}${_devices}${_node_processes}}).`
+    const start = `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_faff}${_bundler}${_bundler_ans104}${_on}${_p4_non_chargable}${_operator}${_spp}${_devices}${_node_processes}}).`
     return start
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.36.1",
+  "version": "0.36.3",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"
@@ -32,6 +32,7 @@
   },
   "dependencies": {
     "@ar.io/sdk": "^3.20.0",
+    "@ardrive/turbo-sdk": "^1.31.1",
     "@bokuweb/zstd-wasm": "^0.0.22",
     "@dha-team/arbundles": "^1.0.4",
     "@permaweb/ao-loader": "^0.0.44",
@@ -49,7 +50,7 @@
     "express": "^5.1.0",
     "fast-sha256": "^1.3.0",
     "graphql": "^16.10.0",
-    "hbsig": "^0.1.4",
+    "hbsig": "^0.1.5",
     "http-message-signatures": "^1.0.4",
     "lmdb": "^3.2.2",
     "localforage": "^1.10.0",