wao 0.16.5 → 0.16.7

package/cjs/aoconnect-base.js

@@ -5,16 +5,17 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
+var _arweave = _interopRequireDefault(require("arweave"));
 var WarpArBundles = _interopRequireWildcard(require("warp-arbundles"));
 var _crypto = _interopRequireDefault(require("crypto"));
 var _base64url = _interopRequireDefault(require("base64url"));
 var _utils = require("./utils.js");
 var _weavedrive = _interopRequireDefault(require("./weavedrive.js"));
 var _ramda = require("ramda");
-var _WarpArBundles$defaul;
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+var _Arweave$default, _WarpArBundles$defaul;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 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; }
@@ -30,6 +31,8 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+var Arweave = (_Arweave$default = _arweave["default"]["default"]) !== null && _Arweave$default !== void 0 ? _Arweave$default : _arweave["default"];
+var arweave = Arweave.init();
 var pkg = (_WarpArBundles$defaul = WarpArBundles["default"]) !== null && _WarpArBundles$defaul !== void 0 ? _WarpArBundles$defaul : WarpArBundles;
 var DataItem = pkg.DataItem;
 var onRecovery = {};
@@ -664,7 +667,7 @@ var _default = exports["default"] = function _default() {
     var _assign = /*#__PURE__*/function () {
       var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(opt) {
         var _opt$tags2;
-        var p, _opt, hash, _yield$ar$dataitem2, id, owner, item, _opt$data2, _ref10, _opt$from, _res$Messages, _res$Spawns, _res$Assignments, data, _tags, from, raw_owner, hashBuffer, msg, _env, _yield$mem$getTx3, _yield$mem$getWasm2, format, mod, wasm, wdrive, start, res, _msg, _iterator3, _step3, v, _iterator4, _step4, _v, __tags, _iterator5, _step5, _v2, _iterator6, _step6, v2;
+        var p, _opt, hash, _yield$ar$dataitem2, id, owner, item, _opt$data2, _ref10, _opt$from, _res$Messages, _res$Spawns, _res$Assignments, data, _tags, from, msg, _env, _yield$mem$getTx3, _yield$mem$getWasm2, format, mod, wasm, wdrive, start, res, _msg, _iterator3, _step3, v, _iterator4, _step4, _v, __tags, _iterator5, _step5, _v2, _iterator6, _step6, v2;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -747,136 +750,128 @@ var _default = exports["default"] = function _default() {
               _tags = _opt.tags;
               from = (_ref10 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref10 !== void 0 ? _ref10 : owner;
               if (!_opt.item) {
-                _context4.next = 60;
+                _context4.next = 50;
                 break;
               }
-              _context4.prev = 44;
               data = _base64url["default"].decode(_opt.item.data);
               _tags = _opt.item.tags;
               if (from) {
-                _context4.next = 55;
+                _context4.next = 50;
                 break;
               }
-              raw_owner = _opt.item.rawOwner;
-              _context4.t11 = Buffer;
+              _context4.next = 49;
+              return arweave.wallets.jwkToAddress({
+                kty: "RSA",
+                n: _opt.item.owner,
+                e: "AQAB"
+              });
+            case 49:
+              from = _context4.sent;
+            case 50:
               _context4.next = 52;
-              return _crypto["default"].subtle.digest("SHA-256", raw_owner);
-            case 52:
-              _context4.t12 = _context4.sent;
-              hashBuffer = _context4.t11.from.call(_context4.t11, _context4.t12);
-              from = _base64url["default"].encode(hashBuffer);
-            case 55:
-              _context4.next = 60;
-              break;
-            case 57:
-              _context4.prev = 57;
-              _context4.t13 = _context4["catch"](44);
-              console.log(_context4.t13);
-            case 60:
-              _context4.next = 62;
               return genMsg(opt.message, p, data, _tags, from, mu.addr);
-            case 62:
+            case 52:
               msg = _context4.sent;
-              _context4.next = 65;
+              _context4.next = 55;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 65:
+            case 55:
               _env = _context4.sent;
               if (p.handle) {
-                _context4.next = 98;
+                _context4.next = 88;
                 break;
               }
-              _context4.next = 69;
+              _context4.next = 59;
               return mem.getWasm(p.modulea);
-            case 69:
+            case 59:
               _yield$mem$getWasm2 = _context4.sent;
               format = _yield$mem$getWasm2.format;
               mod = _yield$mem$getWasm2.mod;
               wasm = _yield$mem$getWasm2.wasm;
               wdrive = extensions[p.extention];
-              _context4.t14 = AoLoader;
-              _context4.t15 = wasm;
-              _context4.t16 = format;
-              _context4.t17 = wdrive;
-              _context4.next = 80;
+              _context4.t11 = AoLoader;
+              _context4.t12 = wasm;
+              _context4.t13 = format;
+              _context4.t14 = wdrive;
+              _context4.next = 70;
               return mem.getTx(p.id);
-            case 80:
-              _context4.t19 = _yield$mem$getTx3 = _context4.sent;
-              _context4.t18 = _context4.t19 === null;
-              if (_context4.t18) {
-                _context4.next = 84;
+            case 70:
+              _context4.t16 = _yield$mem$getTx3 = _context4.sent;
+              _context4.t15 = _context4.t16 === null;
+              if (_context4.t15) {
+                _context4.next = 74;
                 break;
               }
-              _context4.t18 = _yield$mem$getTx3 === void 0;
-            case 84:
-              if (!_context4.t18) {
-                _context4.next = 88;
+              _context4.t15 = _yield$mem$getTx3 === void 0;
+            case 74:
+              if (!_context4.t15) {
+                _context4.next = 78;
                 break;
               }
-              _context4.t20 = void 0;
-              _context4.next = 89;
+              _context4.t17 = void 0;
+              _context4.next = 79;
               break;
-            case 88:
-              _context4.t20 = _yield$mem$getTx3.item;
-            case 89:
-              _context4.t21 = _context4.t20;
-              _context4.next = 92;
+            case 78:
+              _context4.t17 = _yield$mem$getTx3.item;
+            case 79:
+              _context4.t18 = _context4.t17;
+              _context4.next = 82;
               return mem.getTx(mod);
-            case 92:
-              _context4.t22 = _context4.sent;
-              _context4.t23 = {
-                format: _context4.t16,
-                WeaveDrive: _context4.t17,
-                spawn: _context4.t21,
-                module: _context4.t22
+            case 82:
+              _context4.t19 = _context4.sent;
+              _context4.t20 = {
+                format: _context4.t13,
+                WeaveDrive: _context4.t14,
+                spawn: _context4.t18,
+                module: _context4.t19
               };
-              _context4.next = 96;
-              return (0, _context4.t14)(_context4.t15, _context4.t23);
-            case 96:
+              _context4.next = 86;
+              return (0, _context4.t11)(_context4.t12, _context4.t20);
+            case 86:
               p.handle = _context4.sent;
               mem.env[opt.process].handle = p.handle;
-            case 98:
+            case 88:
               if (p.compressed) {
                 start = Date.now();
                 p.memory = mem.decompress(p.memory, p.original_size);
                 p.compressed = false;
               }
-              _context4.next = 101;
+              _context4.next = 91;
               return p.handle(p.memory, msg, _env);
-            case 101:
+            case 91:
               res = _context4.sent;
               p.memory = res.Memory;
               delete res.Memory;
               p.results.push(opt.message);
-              _context4.next = 107;
+              _context4.next = 97;
               return mem.set(p, "env", opt.process);
-            case 107:
+            case 97:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res
               });
-              _context4.next = 110;
+              _context4.next = 100;
               return mem.set(_msg, "msgs", opt.message);
-            case 110:
+            case 100:
               _iterator3 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-              _context4.prev = 111;
+              _context4.prev = 101;
               _iterator3.s();
-            case 113:
+            case 103:
               if ((_step3 = _iterator3.n()).done) {
-                _context4.next = 122;
+                _context4.next = 112;
                 break;
               }
               v = _step3.value;
-              _context4.next = 117;
+              _context4.next = 107;
               return mem.get("env", v.Target);
-            case 117:
+            case 107:
               if (!_context4.sent) {
-                _context4.next = 120;
+                _context4.next = 110;
                 break;
               }
-              _context4.next = 120;
+              _context4.next = 110;
               return message({
                 "for": opt.message,
                 process: v.Target,
@@ -885,32 +880,32 @@ var _default = exports["default"] = function _default() {
                 signer: mu.signer,
                 from: opt.process
               });
-            case 120:
-              _context4.next = 113;
+            case 110:
+              _context4.next = 103;
               break;
-            case 122:
-              _context4.next = 127;
+            case 112:
+              _context4.next = 117;
               break;
-            case 124:
-              _context4.prev = 124;
-              _context4.t24 = _context4["catch"](111);
-              _iterator3.e(_context4.t24);
-            case 127:
-              _context4.prev = 127;
+            case 114:
+              _context4.prev = 114;
+              _context4.t21 = _context4["catch"](101);
+              _iterator3.e(_context4.t21);
+            case 117:
+              _context4.prev = 117;
               _iterator3.f();
-              return _context4.finish(127);
-            case 130:
+              return _context4.finish(117);
+            case 120:
               _iterator4 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-              _context4.prev = 131;
+              _context4.prev = 121;
               _iterator4.s();
-            case 133:
+            case 123:
               if ((_step4 = _iterator4.n()).done) {
-                _context4.next = 140;
+                _context4.next = 130;
                 break;
               }
               _v = _step4.value;
               __tags = (0, _utils.tags)(_v.Tags);
-              _context4.next = 138;
+              _context4.next = 128;
               return spawn({
                 "for": opt.message,
                 module: __tags.Module,
@@ -920,87 +915,87 @@ var _default = exports["default"] = function _default() {
                 from: __tags["From-Process"],
                 signer: mu.signer
               });
-            case 138:
-              _context4.next = 133;
+            case 128:
+              _context4.next = 123;
               break;
-            case 140:
-              _context4.next = 145;
+            case 130:
+              _context4.next = 135;
               break;
-            case 142:
-              _context4.prev = 142;
-              _context4.t25 = _context4["catch"](131);
-              _iterator4.e(_context4.t25);
-            case 145:
-              _context4.prev = 145;
+            case 132:
+              _context4.prev = 132;
+              _context4.t22 = _context4["catch"](121);
+              _iterator4.e(_context4.t22);
+            case 135:
+              _context4.prev = 135;
               _iterator4.f();
-              return _context4.finish(145);
-            case 148:
+              return _context4.finish(135);
+            case 138:
               _iterator5 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-              _context4.prev = 149;
+              _context4.prev = 139;
               _iterator5.s();
-            case 151:
+            case 141:
               if ((_step5 = _iterator5.n()).done) {
-                _context4.next = 172;
+                _context4.next = 162;
                 break;
               }
               _v2 = _step5.value;
               _iterator6 = _createForOfIteratorHelper(_v2.Processes);
-              _context4.prev = 154;
+              _context4.prev = 144;
               _iterator6.s();
-            case 156:
+            case 146:
               if ((_step6 = _iterator6.n()).done) {
-                _context4.next = 162;
+                _context4.next = 152;
                 break;
               }
               v2 = _step6.value;
-              _context4.next = 160;
+              _context4.next = 150;
               return _assign({
                 message: _v2.Message,
                 process: v2,
                 from: opt.process,
                 signer: mu.signer
               });
+            case 150:
+              _context4.next = 146;
+              break;
+            case 152:
+              _context4.next = 157;
+              break;
+            case 154:
+              _context4.prev = 154;
+              _context4.t23 = _context4["catch"](144);
+              _iterator6.e(_context4.t23);
+            case 157:
+              _context4.prev = 157;
+              _iterator6.f();
+              return _context4.finish(157);
             case 160:
-              _context4.next = 156;
+              _context4.next = 141;
               break;
             case 162:
               _context4.next = 167;
               break;
             case 164:
               _context4.prev = 164;
-              _context4.t26 = _context4["catch"](154);
-              _iterator6.e(_context4.t26);
+              _context4.t24 = _context4["catch"](139);
+              _iterator5.e(_context4.t24);
             case 167:
               _context4.prev = 167;
-              _iterator6.f();
+              _iterator5.f();
               return _context4.finish(167);
             case 170:
-              _context4.next = 151;
-              break;
-            case 172:
-              _context4.next = 177;
-              break;
-            case 174:
-              _context4.prev = 174;
-              _context4.t27 = _context4["catch"](149);
-              _iterator5.e(_context4.t27);
-            case 177:
-              _context4.prev = 177;
-              _iterator5.f();
-              return _context4.finish(177);
-            case 180:
               return _context4.abrupt("return", id);
-            case 183:
-              _context4.prev = 183;
-              _context4.t28 = _context4["catch"](39);
-              console.log(_context4.t28);
-            case 186:
+            case 173:
+              _context4.prev = 173;
+              _context4.t25 = _context4["catch"](39);
+              console.log(_context4.t25);
+            case 176:
               return _context4.abrupt("return", null);
-            case 187:
+            case 177:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[39, 183], [44, 57], [111, 124, 127, 130], [131, 142, 145, 148], [149, 174, 177, 180], [154, 164, 167, 170]]);
+        }, _callee4, null, [[39, 173], [101, 114, 117, 120], [121, 132, 135, 138], [139, 164, 167, 170], [144, 154, 157, 160]]);
       }));
       return function assign(_x8) {
         return _ref9.apply(this, arguments);

package/esm/aoconnect-base.js

@@ -1,3 +1,6 @@
+import _Arweave from "arweave"
+const Arweave = _Arweave.default ?? _Arweave
+const arweave = Arweave.init()
 import * as WarpArBundles from "warp-arbundles"
 const pkg = WarpArBundles.default ?? WarpArBundles
 const { DataItem } = pkg
@@ -309,18 +312,14 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
         let _tags = _opt.tags
         let from = _opt.from ?? opt.from ?? owner
         if (_opt.item) {
-          try {
-            data = base64url.decode(_opt.item.data)
-            _tags = _opt.item.tags
-            if (!from) {
-              const raw_owner = _opt.item.rawOwner
-              const hashBuffer = Buffer.from(
-                await crypto.subtle.digest("SHA-256", raw_owner)
-              )
-              from = base64url.encode(hashBuffer)
-            }
-          } catch (e) {
-            console.log(e)
+          data = base64url.decode(_opt.item.data)
+          _tags = _opt.item.tags
+          if (!from) {
+            from = await arweave.wallets.jwkToAddress({
+              kty: "RSA",
+              n: _opt.item.owner,
+              e: "AQAB",
+            })
           }
         }
         // check: is owner=mu.addr right?

package/package.json

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