wao 0.7.1 → 0.8.0

package/cjs/tar.js

@@ -234,7 +234,7 @@ var AR = /*#__PURE__*/function (_MAR) {
               _iterator2.s();
             case 13:
               if ((_step2 = _iterator2.n()).done) {
-                _context4.next = 47;
+                _context4.next = 50;
                 break;
               }
               di = _step2.value;
@@ -259,14 +259,13 @@ var AR = /*#__PURE__*/function (_MAR) {
               return this.owner(di);
             case 24:
               owner = _context4.sent;
-              this.mem.addrmap[owner] = {
+              _context4.next = 27;
+              return this.mem.set({
                 key: di.owner,
                 address: owner
-              };
+              }, "addrmap", owner);
+            case 27:
               data = di.data;
-              try {
-                //data = base64url.decode(di.data)
-              } catch (e) {}
               _context4.t0 = {
                 size: data_size,
                 type: data_type
@@ -293,48 +292,52 @@ var AR = /*#__PURE__*/function (_MAR) {
                 tags: _context4.t7,
                 data: _context4.t8
               };
-              _context4.next = 42;
+              _context4.t9 = this.mem;
+              _context4.t10 = _item;
+              _context4.next = 44;
               return di.id;
-            case 42:
-              _context4.t9 = _context4.sent;
-              this.mem.txs[_context4.t9] = _item;
+            case 44:
+              _context4.t11 = _context4.sent;
+              _context4.next = 47;
+              return _context4.t9.set.call(_context4.t9, _context4.t10, "txs", _context4.t11);
+            case 47:
               _items.push(_item);
-            case 45:
+            case 48:
               _context4.next = 13;
               break;
-            case 47:
-              _context4.next = 52;
+            case 50:
+              _context4.next = 55;
               break;
-            case 49:
-              _context4.prev = 49;
-              _context4.t10 = _context4["catch"](11);
-              _iterator2.e(_context4.t10);
             case 52:
               _context4.prev = 52;
-              _iterator2.f();
-              return _context4.finish(52);
+              _context4.t12 = _context4["catch"](11);
+              _iterator2.e(_context4.t12);
             case 55:
-              _context4.next = 57;
+              _context4.prev = 55;
+              _iterator2.f();
+              return _context4.finish(55);
+            case 58:
+              _context4.next = 60;
               return (0, _arbundles.bundleAndSignData)(items, new _arbundles.ArweaveSigner(jwk));
-            case 57:
+            case 60:
               bundle = _context4.sent;
-              _context4.next = 60;
+              _context4.next = 63;
               return this.mem.arweave.createTransaction({
                 data: bundle.binary
               }, jwk);
-            case 60:
+            case 63:
               tx = _context4.sent;
               tx.addTag("Bundle-Format", "binary");
               tx.addTag("Bundle-Version", "2.0.0");
-              _context4.next = 65;
+              _context4.next = 68;
               return this.postTx(tx, jwk, _items);
-            case 65:
+            case 68:
               return _context4.abrupt("return", _context4.sent);
-            case 66:
+            case 69:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, this, [[11, 49, 52, 55]]);
+        }, _callee4, this, [[11, 52, 55, 58]]);
       }));
       function postItems(_x4, _x5) {
         return _postItems.apply(this, arguments);
@@ -350,11 +353,13 @@ var AR = /*#__PURE__*/function (_MAR) {
           err,
           _yield$this$checkWall3,
           res,
+          height,
           block,
           msg,
           _iterator4,
           _step4,
           item,
+          _txs2,
           _tags2,
           data_type,
           _iterator5,
@@ -365,6 +370,8 @@ var AR = /*#__PURE__*/function (_MAR) {
           _step6,
           _v,
           __tags,
+          _txs,
+          blocks,
           owner,
           _args5 = arguments;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -396,58 +403,110 @@ var AR = /*#__PURE__*/function (_MAR) {
               _context5.next = 13;
               return this.mem.arweave.transactions.sign(tx, jwk);
             case 13:
-              this.mem.height += 1;
+              _context5.next = 15;
+              return this.mem.get("height");
+            case 15:
+              _context5.t0 = _context5.sent;
+              height = _context5.t0 + 1;
+              _context5.next = 19;
+              return this.mem.set(height, "height");
+            case 19:
+              _context5.t1 = tx.id;
+              _context5.t2 = Date.now();
+              _context5.t3 = height;
+              _context5.t5 = _ramda.last;
+              _context5.next = 25;
+              return this.mem.get("blocks");
+            case 25:
+              _context5.t6 = _context5.sent;
+              _context5.t7 = _last = (0, _context5.t5)(_context5.t6);
+              _context5.t4 = _context5.t7 !== null;
+              if (!_context5.t4) {
+                _context5.next = 30;
+                break;
+              }
+              _context5.t4 = _last !== void 0;
+            case 30:
+              if (!_context5.t4) {
+                _context5.next = 34;
+                break;
+              }
+              _context5.t8 = _last;
+              _context5.next = 35;
+              break;
+            case 34:
+              _context5.t8 = "";
+            case 35:
+              _context5.t9 = _context5.t8;
+              _context5.t10 = [];
               block = {
-                id: tx.id,
-                timestamp: Date.now(),
-                height: this.mem.height,
-                previous: (_last = (0, _ramda.last)(this.mem.blocks)) !== null && _last !== void 0 ? _last : "",
-                txs: []
+                id: _context5.t1,
+                timestamp: _context5.t2,
+                height: _context5.t3,
+                previous: _context5.t9,
+                txs: _context5.t10
               };
               msg = null;
-              if (items) {
-                _iterator4 = _createForOfIteratorHelper(items);
-                try {
-                  for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                    item = _step4.value;
-                    this.mem.txs[item.id] = item;
-                    this.mem.txs[item.id].parent = {
-                      id: tx.id
-                    };
-                    this.mem.txs[item.id].bundledIn = {
-                      id: tx.id
-                    };
-                    this.mem.txs[item.id].anchor = "";
-                    _tags2 = (0, _utils.tags)(item.tags);
-                    if ((0, _ramda.includes)(_tags2.Type, ["Message", "Process", "Module", "Scheduler-Location", "Attestation", "Available"])) {
-                      msg = {
-                        id: item.id,
-                        type: _tags2.Type
-                      };
-                      if (msg.type === "Process") msg.pid = item.recipient;
-                    }
-                    data_type = "";
-                    _iterator5 = _createForOfIteratorHelper(item.item.tags);
-                    try {
-                      for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
-                        v = _step5.value;
-                        if (v.name === "Content-Type") data_type = v.value;
-                      }
-                      //this.mem.txs[tx.id]._data = { size: tx.data_size, type: data_type }
-                    } catch (err) {
-                      _iterator5.e(err);
-                    } finally {
-                      _iterator5.f();
-                    }
-                    block.txs.push(item.id);
-                    this.mem.txs[item.id].block = block.id;
-                  }
-                } catch (err) {
-                  _iterator4.e(err);
-                } finally {
-                  _iterator4.f();
+              if (!items) {
+                _context5.next = 68;
+                break;
+              }
+              _iterator4 = _createForOfIteratorHelper(items);
+              _context5.prev = 41;
+              _iterator4.s();
+            case 43:
+              if ((_step4 = _iterator4.n()).done) {
+                _context5.next = 60;
+                break;
+              }
+              item = _step4.value;
+              _txs2 = item;
+              _txs2.parent = {
+                id: tx.id
+              };
+              _txs2.bundledIn = {
+                id: tx.id
+              };
+              _txs2.anchor = "";
+              _tags2 = (0, _utils.tags)(item.tags);
+              if ((0, _ramda.includes)(_tags2.Type, ["Message", "Process", "Module", "Scheduler-Location", "Attestation", "Available"])) {
+                msg = {
+                  id: item.id,
+                  type: _tags2.Type
+                };
+                if (msg.type === "Process") msg.pid = item.recipient;
+              }
+              data_type = "";
+              _iterator5 = _createForOfIteratorHelper(item.item.tags);
+              try {
+                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                  v = _step5.value;
+                  if (v.name === "Content-Type") data_type = v.value;
                 }
+              } catch (err) {
+                _iterator5.e(err);
+              } finally {
+                _iterator5.f();
               }
+              block.txs.push(item.id);
+              _txs2.block = block.id;
+              _context5.next = 58;
+              return this.mem.set(_txs2, "txs", item.id);
+            case 58:
+              _context5.next = 43;
+              break;
+            case 60:
+              _context5.next = 65;
+              break;
+            case 62:
+              _context5.prev = 62;
+              _context5.t11 = _context5["catch"](41);
+              _iterator4.e(_context5.t11);
+            case 65:
+              _context5.prev = 65;
+              _iterator4.f();
+              return _context5.finish(65);
+            case 68:
               _tags = [];
               _iterator6 = _createForOfIteratorHelper(tx.tags);
               try {
@@ -464,37 +523,54 @@ var AR = /*#__PURE__*/function (_MAR) {
                 _iterator6.f();
               }
               __tags = (0, _utils.tags)(_tags);
-              if (__tags.Type === "Module") {
-                this.mem.wasms[tx.id] = {
-                  data: Buffer.from(tx.data, "base64"),
-                  format: __tags["Module-Format"]
-                };
+              if (!(__tags.Type === "Module")) {
+                _context5.next = 75;
+                break;
               }
+              _context5.next = 75;
+              return this.mem.set({
+                data: Buffer.from(tx.data, "base64"),
+                format: __tags["Module-Format"]
+              }, "wasms", tx.id);
+            case 75:
               tx.tags = _tags;
-              _context5.next = 25;
+              _context5.next = 78;
               return this.arweave.wallets.jwkToAddress({
                 n: tx.owner
               });
-            case 25:
+            case 78:
               tx.owner = _context5.sent;
-              this.mem.txs[tx.id] = tx;
+              _txs = tx;
               block.txs.push(tx.id);
-              this.mem.txs[tx.id].block = block.id;
-              this.mem.blocks.push(block.id);
-              this.mem.blockmap[block.id] = block;
+              _txs.block = block.id;
+              _context5.next = 84;
+              return this.mem.set(_txs, "txs", tx.id);
+            case 84:
+              _context5.next = 86;
+              return this.mem.get("blocks");
+            case 86:
+              blocks = _context5.sent;
+              blocks.push(block.id);
+              _context5.next = 90;
+              return this.mem.set(blocks, "blocks");
+            case 90:
+              _context5.next = 92;
+              return this.mem.set(block, "blockmap", block.id);
+            case 92:
               if (!jwk) {
-                _context5.next = 36;
+                _context5.next = 98;
                 break;
               }
-              _context5.next = 34;
+              _context5.next = 95;
               return this.arweave.wallets.jwkToAddress(jwk);
-            case 34:
+            case 95:
               owner = _context5.sent;
-              this.mem.addrmap[owner] = {
+              _context5.next = 98;
+              return this.mem.set({
                 address: owner,
                 key: jwk.n
-              };
-            case 36:
+              }, "addrmap", owner);
+            case 98:
               res = {
                 id: tx.id,
                 status: 200,
@@ -512,11 +588,11 @@ var AR = /*#__PURE__*/function (_MAR) {
                 err: err,
                 id: tx.id
               });
-            case 39:
+            case 101:
             case "end":
               return _context5.stop();
           }
-        }, _callee5, this);
+        }, _callee5, this, [[41, 62, 65, 68]]);
       }));
       function postTx(_x6, _x7) {
         return _postTx.apply(this, arguments);
@@ -530,8 +606,11 @@ var AR = /*#__PURE__*/function (_MAR) {
         return _regeneratorRuntime().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              return _context6.abrupt("return", this.mem.txs[id]);
-            case 1:
+              _context6.next = 2;
+              return this.mem.get("txs", id);
+            case 2:
+              return _context6.abrupt("return", _context6.sent);
+            case 3:
             case "end":
               return _context6.stop();
           }
@@ -557,7 +636,10 @@ var AR = /*#__PURE__*/function (_MAR) {
                 if (!(0, _ramda.isNil)(_string.decode)) decode = _string.decode;
                 if (!(0, _ramda.isNil)(_string.string)) string = _string.string;
               }
-              tx = this.mem.txs[id];
+              _context7.next = 5;
+              return this.mem.get("txs", id);
+            case 5:
+              tx = _context7.sent;
               _data = (_tx$data = tx === null || tx === void 0 ? void 0 : tx.data) !== null && _tx$data !== void 0 ? _tx$data : null;
               if ((tx === null || tx === void 0 ? void 0 : tx.format) === 2 && _data) {
                 _data = Buffer.from(_data, "base64");
@@ -567,26 +649,26 @@ var AR = /*#__PURE__*/function (_MAR) {
               isBuf = (0, _ramda.is)(Uint8Array, _data) || (0, _ramda.is)(ArrayBuffer, _data);
               isStr = (0, _ramda.is)(String, _data);
               if (!(decode === false)) {
-                _context7.next = 13;
+                _context7.next = 15;
                 break;
               }
               if (isStr) _data = new TextEncoder().encode(_data);
               return _context7.abrupt("return", _base64url["default"].encode(_data));
-            case 13:
+            case 15:
               if (!(isBuf && string)) {
-                _context7.next = 17;
+                _context7.next = 19;
                 break;
               }
               return _context7.abrupt("return", _data.toString());
-            case 17:
+            case 19:
               if (!(isStr && string !== true)) {
-                _context7.next = 19;
+                _context7.next = 21;
                 break;
               }
               return _context7.abrupt("return", new TextEncoder().encode(_data));
-            case 19:
+            case 21:
               return _context7.abrupt("return", _data);
-            case 20:
+            case 22:
             case "end":
               return _context7.stop();
           }

package/esm/ao.js

@@ -333,6 +333,7 @@ class AO {
     boot,
     module = this.module,
     scheduler = this.scheduler,
+    memory,
     jwk,
     tags = {},
     data,
@@ -348,6 +349,7 @@ class AO {
       if (!tags.Authority && this.authority) tags.Authority = this.authority
       let _tags = buildTags(null, tags)
       pid = await this.spawn({
+        memory,
         module,
         scheduler,
         signer: this.toSigner(jwk),
@@ -358,7 +360,8 @@ class AO {
       console.log(e)
       err = e
     }
-    return { err, pid }
+    const p = pid ? this.p(pid) : null
+    return { err, pid, p }
   }
 
   async msg({