wao 0.34.4 → 0.35.1

package/cjs/ar.js

@@ -137,7 +137,7 @@ var AR = /*#__PURE__*/function () {
   }
   return _createClass(AR, [{
     key: "isArConnect",
-    value: function isArConnect(jwk) {
+    value: function isArConnect() {
       var _this$jwk, _this$jwk2;
       return ((_this$jwk = this.jwk) === null || _this$jwk === void 0 ? void 0 : _this$jwk.id) || ((_this$jwk2 = this.jwk) === null || _this$jwk2 === void 0 ? void 0 : _this$jwk2.walletName) === "ArConnect";
     }

package/cjs/hb.js

@@ -79,12 +79,18 @@ var HB = /*#__PURE__*/function () {
       }
       return signEncoded;
     }()
+  }, {
+    key: "isArConnect",
+    value: function isArConnect() {
+      var _this$jwk, _this$jwk2;
+      return ((_this$jwk = this.jwk) === null || _this$jwk === void 0 ? void 0 : _this$jwk.id) || ((_this$jwk2 = this.jwk) === null || _this$jwk2 === void 0 ? void 0 : _this$jwk2.walletName) === "ArConnect";
+    }
   }, {
     key: "_init",
     value: function _init(jwk) {
       this.jwk = jwk;
       this.signer = (0, _aoconnect.createSigner)(jwk, this.url);
-      this.addr = (0, _utils.toAddr)(jwk.n);
+      if (!this.isArConnect()) this.addr = (0, _utils.toAddr)(jwk.n);
       this.sign = (0, _hbsig.signer)({
         signer: this.signer,
         url: this.url
@@ -884,7 +890,7 @@ var HB = /*#__PURE__*/function () {
                 type: "Process",
                 "execution-device": "test-device@1.0",
                 device: "process@1.0",
-                scheduler: this.addr
+                scheduler: this.operator
               }), {
                 path: false
               });
@@ -1059,13 +1065,16 @@ var HB = /*#__PURE__*/function () {
           while (1) switch (_context29.prev = _context29.next) {
             case 0:
               _ref17 = _args30.length > 0 && _args30[0] !== undefined ? _args30[0] : {}, _ref17$tags = _ref17.tags, tags = _ref17$tags === void 0 ? {} : _ref17$tags, pid = _ref17.pid, action = _ref17.action, data = _ref17.data;
+              _context29.next = 3;
+              return this.setInfo();
+            case 3:
               if (typeof action === "string") tags.Action = action;
               json = {
                 Tags: (0, _utils.buildTags)(_objectSpread({}, tags)),
-                Owner: this.addr
+                Owner: this.operator
               };
               if (data) json.Data = data;
-              _context29.next = 6;
+              _context29.next = 8;
               return this.post({
                 path: "/~relay@1.0/call",
                 method: "POST",
@@ -1073,10 +1082,10 @@ var HB = /*#__PURE__*/function () {
                 "content-type": "application/json",
                 "relay-body": JSON.stringify(json)
               });
-            case 6:
+            case 8:
               res = _context29.sent;
               return _context29.abrupt("return", JSON.parse(res.body));
-            case 8:
+            case 10:
             case "end":
               return _context29.stop();
           }

package/cjs/hyperbeam.js

@@ -133,7 +133,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
     key: "shell",
     value: function shell() {
       var _this = this;
-      var _as = this.as.length === 0 ? [] : ["as", this.as.join(", ")];
+      var _as = this.as.length === 0 ? [] : ["as", this.as.join(",")];
       this._shell = (0, _child_process.spawn)("rebar3", [].concat(_as, ["shell", "--eval", this.genEval({
         gateway: this.gateway,
         wallet: this.wallet
@@ -186,7 +186,7 @@ var HyperBEAM = exports["default"] = /*#__PURE__*/function () {
             _iterator3.f();
           }
         }
-        var _as = _this2.as.length === 0 ? [] : ["as", _this2.as.join(", ")];
+        var _as = _this2.as.length === 0 ? [] : ["as", _this2.as.join(",")];
         var _test = Array.isArray(test) ? test.join("+") : test;
         var _module = "";
         if (Array.isArray(module)) {

package/cjs/workspace/package.json

@@ -10,6 +10,6 @@
   },
   "dependencies": {
     "hbsig": "^0.1.3",
-    "wao": "^0.34.4"
+    "wao": "^0.35.1"
   }
 }

package/esm/ar.js

@@ -62,7 +62,7 @@ class AR {
     })
   }
 
-  isArConnect(jwk) {
+  isArConnect() {
     return this.jwk?.id || this.jwk?.walletName === "ArConnect"
   }
 

package/esm/hb.js

@@ -25,11 +25,13 @@ class HB {
       url: this.url,
     })
   }
-
+  isArConnect() {
+    return this.jwk?.id || this.jwk?.walletName === "ArConnect"
+  }
   _init(jwk) {
     this.jwk = jwk
     this.signer = createSigner(jwk, this.url)
-    this.addr = toAddr(jwk.n)
+    if (!this.isArConnect()) this.addr = toAddr(jwk.n)
     this.sign = signer({ signer: this.signer, url: this.url })
   }
 
@@ -199,7 +201,7 @@ class HB {
           type: "Process",
           "execution-device": "test-device@1.0",
           device: "process@1.0",
-          scheduler: this.addr,
+          scheduler: this.operator,
         }),
         { path: false }
       ),
@@ -248,8 +250,9 @@ class HB {
   }
 
   async dryrun({ tags = {}, pid, action, data } = {}) {
+    await this.setInfo()
     if (typeof action === "string") tags.Action = action
-    let json = { Tags: buildTags({ ...tags }), Owner: this.addr }
+    let json = { Tags: buildTags({ ...tags }), Owner: this.operator }
     if (data) json.Data = data
     const res = await this.post({
       path: "/~relay@1.0/call",

package/esm/hyperbeam.js

@@ -81,7 +81,7 @@ export default class HyperBEAM {
     if (shell) this.shell()
   }
   shell() {
-    const _as = this.as.length === 0 ? [] : ["as", this.as.join(", ")]
+    const _as = this.as.length === 0 ? [] : ["as", this.as.join(",")]
     this._shell = spawn(
       "rebar3",
       [
@@ -121,7 +121,7 @@ export default class HyperBEAM {
           }
         }
       }
-      const _as = this.as.length === 0 ? [] : ["as", this.as.join(", ")]
+      const _as = this.as.length === 0 ? [] : ["as", this.as.join(",")]
       const _test = Array.isArray(test) ? test.join("+") : test
       let _module = ""
 

package/esm/workspace/package.json

@@ -10,6 +10,6 @@
   },
   "dependencies": {
     "hbsig": "^0.1.3",
-    "wao": "^0.34.4"
+    "wao": "^0.35.1"
   }
 }

package/package.json

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