wao 0.25.1 → 0.25.3

package/cjs/hb.js

@@ -44,8 +44,11 @@ var HB = /*#__PURE__*/function () {
     var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
       _ref$url = _ref.url,
       url = _ref$url === void 0 ? "http://localhost:10001" : _ref$url,
+      _ref$cu = _ref.cu,
+      cu = _ref$cu === void 0 ? "http://localhost:6363" : _ref$cu,
       jwk = _ref.jwk;
     _classCallCheck(this, HB);
+    this.cu = cu;
     this.url = url;
     this.dev = {};
     this.dev.hyperbuddy = {
@@ -1360,16 +1363,17 @@ var HB = /*#__PURE__*/function () {
               _ref15 = _args34.length > 0 && _args34[0] !== undefined ? _args34[0] : {}, _ref15$tags = _ref15.tags, tags = _ref15$tags === void 0 ? {} : _ref15$tags, pid = _ref15.pid, action = _ref15.action, data = _ref15.data;
               if (typeof action === "string") tags.Action = action;
               json = {
-                Tags: (0, _utils.buildTags)(tags)
+                Tags: (0, _utils.buildTags)(_objectSpread({}, tags)),
+                Owner: this.addr
               };
               if (data) json.Data = data;
               _context34.next = 6;
               return this.post({
                 path: "/~relay@1.0/call",
                 "relay-method": "POST",
-                "relay-path": "/dry-run?process-id=".concat(pid),
+                "relay-path": "".concat(this.cu, "/dry-run?process-id=").concat(pid),
                 "content-type": "application/json",
-                body: JSON.stringify(json)
+                "relay-body": JSON.stringify(json)
               });
             case 6:
               res = _context34.sent;

package/cjs/hyperbeam.js

@@ -9,6 +9,9 @@ var _path = require("path");
 var _ramda = require("ramda");
 var _fs = require("fs");
 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); }
+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); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
@@ -27,6 +30,8 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
       port = _ref$port === void 0 ? 10001 : _ref$port,
       _ref$cu = _ref.cu,
       cu = _ref$cu === void 0 ? 6363 : _ref$cu,
+      _ref$as = _ref.as,
+      as = _ref$as === void 0 ? ["genesis_wasm"] : _ref$as,
       bundler = _ref.bundler,
       gateway = _ref.gateway,
       wallet = _ref.wallet,
@@ -80,27 +85,129 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
     this.cmake = cmake;
     this.port = port;
     this.bundler = bundler;
-    this.hbeam = (0, _child_process.spawn)("rebar3", ["shell", "--eval", this.genEval({
-      gateway: gateway,
-      wallet: wallet
-    })], {
-      env: _objectSpread(_objectSpread({}, process.env), this.genEnv()),
-      cwd: (0, _path.resolve)(process.cwd(), cwd)
-    });
-    this.hbeam.stdout.on("data", function (chunk) {
-      return console.log(chunk.toString());
-    });
-    this.hbeam.stderr.on("data", function (err) {
-      return console.error(err.toString());
-    });
-    this.hbeam.on("error", function (err) {
-      return console.error("failed to start process: ".concat(err));
-    });
-    this.hbeam.on("close", function (code) {
-      return console.log("child process exited with code ".concat(code));
-    });
+    this.as = as;
+    this.gateway = gateway;
+    this.wallet = wallet;
+    this.cwd = cwd;
+    this.run();
   }
   return _createClass(HyperBEAM, [{
+    key: "run",
+    value: function run() {
+      var _as = this.as.length === 0 ? [] : ["as", this.as.join(", ")];
+      this.hbeam = (0, _child_process.spawn)("rebar3", [].concat(_as, ["shell", "--eval", this.genEval({
+        gateway: this.gateway,
+        wallet: this.wallet
+      })]), {
+        env: _objectSpread(_objectSpread({}, process.env), this.genEnv()),
+        cwd: (0, _path.resolve)(process.cwd(), this.cwd)
+      });
+      this.hbeam.stdout.on("data", function (chunk) {
+        return console.log(chunk.toString());
+      });
+      this.hbeam.stderr.on("data", function (err) {
+        return console.error(err.toString());
+      });
+      this.hbeam.on("error", function (err) {
+        return console.error("failed to start process: ".concat(err));
+      });
+      this.hbeam.on("close", function (code) {
+        return console.log("child process exited with code ".concat(code));
+      });
+    }
+  }, {
+    key: "ok",
+    value: function () {
+      var _ok = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var address;
+        return _regeneratorRuntime().wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.prev = 0;
+              _context.next = 3;
+              return fetch("http://localhost:".concat(this.port, "/~meta@1.0/info/address")).then(function (r) {
+                return r.text();
+              });
+            case 3:
+              address = _context.sent;
+              return _context.abrupt("return", address ? true : false);
+            case 7:
+              _context.prev = 7;
+              _context.t0 = _context["catch"](0);
+              return _context.abrupt("return", false);
+            case 10:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee, this, [[0, 7]]);
+      }));
+      function ok() {
+        return _ok.apply(this, arguments);
+      }
+      return ok;
+    }()
+  }, {
+    key: "ready",
+    value: function () {
+      var _ready = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+        var _this = this;
+        var timeout,
+          start,
+          _args3 = arguments;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
+            case 0:
+              timeout = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : 30000;
+              start = Date.now();
+              return _context3.abrupt("return", new Promise(function (res) {
+                var to = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+                  return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+                    while (1) switch (_context2.prev = _context2.next) {
+                      case 0:
+                        _context2.prev = 0;
+                        if (!(Date.now() - start > 30000)) {
+                          _context2.next = 6;
+                          break;
+                        }
+                        clearInterval(to);
+                        res(false);
+                        _context2.next = 11;
+                        break;
+                      case 6:
+                        _context2.next = 8;
+                        return _this.ok();
+                      case 8:
+                        if (!_context2.sent) {
+                          _context2.next = 11;
+                          break;
+                        }
+                        clearInterval(to);
+                        res(_this);
+                      case 11:
+                        _context2.next = 15;
+                        break;
+                      case 13:
+                        _context2.prev = 13;
+                        _context2.t0 = _context2["catch"](0);
+                      case 15:
+                      case "end":
+                        return _context2.stop();
+                    }
+                  }, _callee2, null, [[0, 13]]);
+                })), 1000);
+              }));
+            case 3:
+            case "end":
+              return _context3.stop();
+          }
+        }, _callee3);
+      }));
+      function ready() {
+        return _ready.apply(this, arguments);
+      }
+      return ready;
+    }()
+  }, {
     key: "genEnv",
     value: function genEnv() {
       var _env = {};
@@ -113,17 +220,19 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
     }
   }, {
     key: "genEval",
-    value: function genEval(_ref2) {
-      var gateway = _ref2.gateway,
-        _ref2$wallet = _ref2.wallet,
-        wallet = _ref2$wallet === void 0 ? ".wallet.json" : _ref2$wallet;
+    value: function genEval(_ref3) {
+      var gateway = _ref3.gateway,
+        _ref3$wallet = _ref3.wallet,
+        wallet = _ref3$wallet === void 0 ? ".wallet.json" : _ref3$wallet;
       var _wallet = ", priv_key_location => <<\"".concat(wallet, "\">>");
       var _gateway = gateway ? ", gateway => <<\"http://localhost:".concat(gateway, "\">>") : "";
 
       // 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 _routes = ", routes => [#{ <<\"template\">> => <<\"/result/.*\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:".concat(this.cu, "\">> } }, #{ <<\"template\">> => <<\"/dry-run\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:").concat(this.cu, "\">> } }, #{ <<\"template\">> => <<\"/graphql\">>, <<\"nodes\">> => [#{ <<\"prefix\">> => <<\"http://localhost:").concat(gateway, "\">>, <<\"opts\">> => #{ http_client => httpc, protocol => http2 } }, #{ <<\"prefix\">> => <<\"http://localhost:").concat(gateway, "\">>, <<\"opts\">> => #{ http_client => gun, protocol => http2 } }] }, #{ <<\"template\">> => <<\"/raw\">>, <<\"node\">> => #{ <<\"prefix\">> => <<\"http://localhost:").concat(gateway, "\">>, <<\"opts\">> => #{ http_client => gun, protocol => http2 } } }]");
+      /*
+      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 _operator = this.operator ? ", operator => <<\"".concat(this.operator, "\">>") : "";
       var _spp = this.spp ? ", simple_pay_price => ".concat(this.spp) : "";
@@ -134,7 +243,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.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 start = "hb:start_mainnet(#{ ".concat(_port).concat(_gateway).concat(_wallet).concat(_faff).concat(_bundler).concat(_routes).concat(_on).concat(_p4_non_chargable).concat(_operator).concat(_spp).concat(_node_processes, "}).");
+      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(_node_processes, "}).");
       return start;
     }
   }, {

package/esm/hb.js

@@ -11,7 +11,12 @@ const seed = num => {
 }
 
 class HB {
-  constructor({ url = "http://localhost:10001", jwk } = {}) {
+  constructor({
+    url = "http://localhost:10001",
+    cu = "http://localhost:6363",
+    jwk,
+  } = {}) {
+    this.cu = cu
     this.url = url
     this.dev = {}
     this.dev.hyperbuddy = {
@@ -393,14 +398,14 @@ class HB {
 
   async dryrun({ tags = {}, pid, action, data } = {}) {
     if (typeof action === "string") tags.Action = action
-    let json = { Tags: buildTags(tags) }
+    let json = { Tags: buildTags({ ...tags }), Owner: this.addr }
     if (data) json.Data = data
     const res = await this.post({
       path: "/~relay@1.0/call",
       "relay-method": "POST",
-      "relay-path": `/dry-run?process-id=${pid}`,
+      "relay-path": `${this.cu}/dry-run?process-id=${pid}`,
       "content-type": "application/json",
-      body: JSON.stringify(json),
+      "relay-body": JSON.stringify(json),
     })
     return JSON.parse(res.body)
   }

package/esm/hyperbeam.js

@@ -7,6 +7,7 @@ export default class HyperBEAM {
   constructor({
     port = 10001,
     cu = 6363,
+    as = ["genesis_wasm"],
     bundler,
     gateway,
     wallet,
@@ -47,12 +48,25 @@ export default class HyperBEAM {
     this.cmake = cmake
     this.port = port
     this.bundler = bundler
+    this.as = as
+    this.gateway = gateway
+    this.wallet = wallet
+    this.cwd = cwd
+    this.run()
+  }
+  run() {
+    const _as = this.as.length === 0 ? [] : ["as", this.as.join(", ")]
     this.hbeam = spawn(
       "rebar3",
-      ["shell", "--eval", this.genEval({ gateway, wallet })],
+      [
+        ..._as,
+        "shell",
+        "--eval",
+        this.genEval({ gateway: this.gateway, wallet: this.wallet }),
+      ],
       {
         env: { ...process.env, ...this.genEnv() },
-        cwd: resolve(process.cwd(), cwd),
+        cwd: resolve(process.cwd(), this.cwd),
       }
     )
     this.hbeam.stdout.on("data", chunk => console.log(chunk.toString()))
@@ -64,7 +78,34 @@ export default class HyperBEAM {
       console.log(`child process exited with code ${code}`)
     )
   }
-
+  async ok() {
+    try {
+      const address = await fetch(
+        `http://localhost:${this.port}/~meta@1.0/info/address`
+      ).then(r => r.text())
+      return address ? true : false
+    } catch (e) {
+      return false
+    }
+  }
+  async ready(timeout = 30000) {
+    const start = Date.now()
+    return new Promise(res => {
+      const to = setInterval(async () => {
+        try {
+          if (Date.now() - start > 30000) {
+            clearInterval(to)
+            res(false)
+          } else {
+            if (await this.ok()) {
+              clearInterval(to)
+              res(this)
+            }
+          }
+        } catch (e) {}
+      }, 1000)
+    })
+  }
   genEnv() {
     let _env = {}
     if (this.c) {
@@ -88,8 +129,9 @@ export default class HyperBEAM {
     const _bundler = this.bundler
       ? `, bundler_httpsig => <<"http://localhost:${this.bundler}">>`
       : ""
+    /*
     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 } } }]`
-
+    */
     const _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
@@ -118,7 +160,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}${_routes}${_on}${_p4_non_chargable}${_operator}${_spp}${_node_processes}}).`
+    const start = `hb:start_mainnet(#{ ${_port}${_gateway}${_wallet}${_faff}${_bundler}${_on}${_p4_non_chargable}${_operator}${_spp}${_node_processes}}).`
     return start
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.25.1",
+  "version": "0.25.3",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"