wao 0.40.2 → 0.41.1

package/cjs/adaptor-base.js

@@ -28,18 +28,47 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 var Adaptor = /*#__PURE__*/function () {
   function Adaptor(_ref) {
+    var _this = this,
+      _this$_chunkCleanupIn;
     var hb_url = _ref.hb_url,
       aoconnect = _ref.aoconnect,
       _ref$log = _ref.log,
       log = _ref$log === void 0 ? false : _ref$log,
       db = _ref.db,
+      storage = _ref.storage,
       connect = _ref.connect,
       GQL = _ref.GQL,
       cu = _ref.cu,
       su = _ref.su,
-      mu = _ref.mu;
+      mu = _ref.mu,
+      d1 = _ref.d1,
+      r2 = _ref.r2,
+      kv = _ref.kv,
+      _ref$network = _ref.network,
+      network = _ref$network === void 0 ? "ao.DN.1" : _ref$network;
     _classCallCheck(this, Adaptor);
+    this.network = network;
     this.data = {};
+    this._dataTimestamps = {};
+    // Clean up abandoned chunk uploads every 60 seconds.
+    // unref() so this interval doesn't keep the Node event loop alive after
+    // the host server closes — without it, test processes that use Server
+    // (e.g. test/hyperbeam/relay.test.js) hang indefinitely waiting on this
+    // timer even after every other handle is cleaned up.
+    this._chunkCleanupInterval = setInterval(function () {
+      var now = Date.now();
+      for (var _i = 0, _Object$keys = Object.keys(_this._dataTimestamps); _i < _Object$keys.length; _i++) {
+        var key = _Object$keys[_i];
+        if (now - _this._dataTimestamps[key] > 5 * 60 * 1000) {
+          // 5 min timeout
+          delete _this.data[key];
+          delete _this._dataTimestamps[key];
+        }
+      }
+    }, 60 * 1000);
+    if (typeof ((_this$_chunkCleanupIn = this._chunkCleanupInterval) === null || _this$_chunkCleanupIn === void 0 ? void 0 : _this$_chunkCleanupIn.unref) === "function") {
+      this._chunkCleanupInterval.unref();
+    }
     var hb = null;
     if (hb_url) hb = new _hb["default"]({
       url: hb_url
@@ -47,7 +76,11 @@ var Adaptor = /*#__PURE__*/function () {
     var _connect = connect(aoconnect, {
         log: log,
         cache: db,
-        hb: hb
+        storage: storage,
+        hb: hb,
+        d1: d1,
+        r2: r2,
+        kv: kv
       }),
       _ar = _connect.ar,
       message = _connect.message,
@@ -58,13 +91,15 @@ var Adaptor = /*#__PURE__*/function () {
       mem = _connect.mem,
       monitor = _connect.monitor,
       unmonitor = _connect.unmonitor,
-      recover = _connect.recover;
+      recover = _connect.recover,
+      evaluate = _connect.evaluate;
     this.su_signer = su;
     this.cu_signer = cu;
     this.mu_signer = mu;
     this.recover = recover;
     this.monitor = monitor;
     this.unmonitor = unmonitor;
+    this.evaluate = evaluate;
     this.spawn = spawn;
     this._ar = _ar;
     this.message = message;
@@ -73,7 +108,8 @@ var Adaptor = /*#__PURE__*/function () {
     this.results = results;
     this.mem = mem;
     this.gql = new GQL({
-      mem: mem
+      mem: mem,
+      d1: d1 || null
     });
   }
   return _createClass(Adaptor, [{
@@ -88,9 +124,7 @@ var Adaptor = /*#__PURE__*/function () {
               _context.n = 1;
               return this[req.device](req);
             case 1:
-              _t(_context.v);
-            case 2:
-              return _context.a(2);
+              return _context.a(2, _t(_context.v));
           }
         }, _callee, this);
       }));
@@ -572,7 +606,7 @@ var Adaptor = /*#__PURE__*/function () {
           while (1) switch (_context15.n) {
             case 0:
               _t1 = req.path;
-              _context15.n = _t1 === "/result/:mid" ? 1 : _t1 === "/dry-run" ? 3 : 5;
+              _context15.n = _t1 === "/result/:mid" ? 1 : _t1 === "/dry-run" ? 3 : _t1 === "/evaluate" ? 5 : 7;
               break;
             case 1:
               _context15.n = 2;
@@ -586,10 +620,15 @@ var Adaptor = /*#__PURE__*/function () {
               return _context15.a(2, _context15.v);
             case 5:
               _context15.n = 6;
-              return this.bad();
+              return this.cu_post_evaluate(req);
             case 6:
               return _context15.a(2, _context15.v);
             case 7:
+              _context15.n = 8;
+              return this.bad();
+            case 8:
+              return _context15.a(2, _context15.v);
+            case 9:
               return _context15.a(2);
           }
         }, _callee15, this);
@@ -790,27 +829,31 @@ var Adaptor = /*#__PURE__*/function () {
     key: "cu_get_state",
     value: function () {
       var _cu_get_state = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee19(_ref5) {
-        var _this$mem$env$pid$mem, _this$mem$env$pid;
-        var query, params, body, headers, method, pid, memory;
+        var _p$memory;
+        var query, params, body, headers, method, pid, p, memory;
         return _regenerator().w(function (_context19) {
           while (1) switch (_context19.n) {
             case 0:
               query = _ref5.query, params = _ref5.params, body = _ref5.body, headers = _ref5.headers, method = _ref5.method;
               pid = params.pid;
-              memory = (_this$mem$env$pid$mem = (_this$mem$env$pid = this.mem.env[pid]) === null || _this$mem$env$pid === void 0 ? void 0 : _this$mem$env$pid.memory) !== null && _this$mem$env$pid$mem !== void 0 ? _this$mem$env$pid$mem : null;
+              _context19.n = 1;
+              return this.mem.get("env", pid);
+            case 1:
+              p = _context19.v;
+              memory = (_p$memory = p === null || p === void 0 ? void 0 : p.memory) !== null && _p$memory !== void 0 ? _p$memory : null;
               if (memory) {
-                _context19.n = 1;
+                _context19.n = 2;
                 break;
               }
               return _context19.a(2, {
                 status: 404,
                 error: "TransactionNotFound: Process ".concat(pid, " was not found on gateway")
               });
-            case 1:
+            case 2:
               return _context19.a(2, {
                 send: Buffer.from(memory)
               });
-            case 2:
+            case 3:
               return _context19.a(2);
           }
         }, _callee19, this);
@@ -868,78 +911,86 @@ var Adaptor = /*#__PURE__*/function () {
     key: "cu_get_results",
     value: function () {
       var _cu_get_results = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee21(_ref7) {
-        var _this$mem$env$pid$res, _this$mem$env$pid2;
-        var query, params, body, headers, method, pid, _query$from, from, _query$to, to, _query$sort, sort, _query$limit, limit, results, _res, i, count, started, _iterator4, _step4, v, _this$mem$msgs$v, _t12;
+        var _p$results;
+        var query, params, body, headers, method, pid, _query$from, from, _query$to, to, _query$sort, sort, _query$limit, limit, p, results, _res, i, count, started, _iterator4, _step4, v, msg, _t12;
         return _regenerator().w(function (_context21) {
           while (1) switch (_context21.p = _context21.n) {
             case 0:
               query = _ref7.query, params = _ref7.params, body = _ref7.body, headers = _ref7.headers, method = _ref7.method;
               pid = params.pid;
               _query$from = query.from, from = _query$from === void 0 ? null : _query$from, _query$to = query.to, to = _query$to === void 0 ? null : _query$to, _query$sort = query.sort, sort = _query$sort === void 0 ? "ASC" : _query$sort, _query$limit = query.limit, limit = _query$limit === void 0 ? 25 : _query$limit;
-              results = (_this$mem$env$pid$res = (_this$mem$env$pid2 = this.mem.env[pid]) === null || _this$mem$env$pid2 === void 0 ? void 0 : _this$mem$env$pid2.results) !== null && _this$mem$env$pid$res !== void 0 ? _this$mem$env$pid$res : [];
+              _context21.n = 1;
+              return this.mem.get("env", pid);
+            case 1:
+              p = _context21.v;
+              results = (_p$results = p === null || p === void 0 ? void 0 : p.results) !== null && _p$results !== void 0 ? _p$results : [];
               if (sort === "DESC") results = (0, _ramda.reverse)(results);
               _res = [];
               i = 1;
               count = 0;
               started = (0, _ramda.isNil)(from);
               _iterator4 = _createForOfIteratorHelper(results);
-              _context21.p = 1;
+              _context21.p = 2;
               _iterator4.s();
-            case 2:
+            case 3:
               if ((_step4 = _iterator4.n()).done) {
-                _context21.n = 8;
+                _context21.n = 10;
                 break;
               }
               v = _step4.value;
               if (!started) {
-                _context21.n = 5;
+                _context21.n = 7;
                 break;
               }
+              _context21.n = 4;
+              return this.mem.get("msgs", v);
+            case 4:
+              msg = _context21.v;
               _res.push({
                 cursor: v,
-                node: (_this$mem$msgs$v = this.mem.msgs[v]) === null || _this$mem$msgs$v === void 0 ? void 0 : _this$mem$msgs$v.res
+                node: msg === null || msg === void 0 ? void 0 : msg.res
               });
               count++;
               if (!(!(0, _ramda.isNil)(to) && v === to)) {
-                _context21.n = 3;
+                _context21.n = 5;
                 break;
               }
-              return _context21.a(3, 8);
-            case 3:
+              return _context21.a(3, 10);
+            case 5:
               if (!(limit <= count)) {
-                _context21.n = 4;
+                _context21.n = 6;
                 break;
               }
-              return _context21.a(3, 8);
-            case 4:
-              _context21.n = 6;
+              return _context21.a(3, 10);
+            case 6:
+              _context21.n = 8;
               break;
-            case 5:
+            case 7:
               if (from === v) started = true;
-            case 6:
+            case 8:
               i++;
-            case 7:
-              _context21.n = 2;
+            case 9:
+              _context21.n = 3;
               break;
-            case 8:
-              _context21.n = 10;
+            case 10:
+              _context21.n = 12;
               break;
-            case 9:
-              _context21.p = 9;
+            case 11:
+              _context21.p = 11;
               _t12 = _context21.v;
               _iterator4.e(_t12);
-            case 10:
-              _context21.p = 10;
+            case 12:
+              _context21.p = 12;
               _iterator4.f();
-              return _context21.f(10);
-            case 11:
+              return _context21.f(12);
+            case 13:
               return _context21.a(2, {
                 json: {
                   edges: _res
                 }
               });
           }
-        }, _callee21, this, [[1, 9, 10, 11]]);
+        }, _callee21, this, [[2, 11, 12, 13]]);
       }));
       function cu_get_results(_x22) {
         return _cu_get_results.apply(this, arguments);
@@ -950,24 +1001,28 @@ var Adaptor = /*#__PURE__*/function () {
     key: "cu_get_result",
     value: function () {
       var _cu_get_result = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee22(_ref8) {
-        var query, params, body, headers, method, message, process, _yield$this$recover, success, slot, _this$mem$env$process, _this$mem$env$process2, res2;
+        var query, params, body, headers, method, message, process, p, _yield$this$recover, success, slot, _p, _p2, res2;
         return _regenerator().w(function (_context22) {
           while (1) switch (_context22.n) {
             case 0:
               query = _ref8.query, params = _ref8.params, body = _ref8.body, headers = _ref8.headers, method = _ref8.method;
               message = params.mid;
               process = query["process-id"]; // check if recovery is ongoing and
-              if (!(0, _ramda.isNil)(this.mem.env[process])) {
-                _context22.n = 2;
+              _context22.n = 1;
+              return this.mem.get("env", process);
+            case 1:
+              p = _context22.v;
+              if (!(0, _ramda.isNil)(p)) {
+                _context22.n = 5;
                 break;
               }
-              _context22.n = 1;
+              _context22.n = 2;
               return this.recover(process);
-            case 1:
+            case 2:
               _yield$this$recover = _context22.v;
               success = _yield$this$recover.success;
               if (success) {
-                _context22.n = 2;
+                _context22.n = 3;
                 break;
               }
               console.log("process not found:", query["process-id"]);
@@ -975,34 +1030,43 @@ var Adaptor = /*#__PURE__*/function () {
                 status: 404,
                 error: "not Found"
               });
-            case 2:
+            case 3:
+              _context22.n = 4;
+              return this.mem.get("env", process);
+            case 4:
+              p = _context22.v;
+            case 5:
               slot = message;
               if (!/^[0-9a-zA-Z_-]{43,44}$/.test(message)) {
-                message = (_this$mem$env$process = this.mem.env[process]) === null || _this$mem$env$process === void 0 || (_this$mem$env$process = _this$mem$env$process.results) === null || _this$mem$env$process === void 0 ? void 0 : _this$mem$env$process[slot];
+                message = (_p = p) === null || _p === void 0 || (_p = _p.results) === null || _p === void 0 ? void 0 : _p[slot];
               }
               if (!(0, _ramda.isNil)(message)) {
-                _context22.n = 4;
+                _context22.n = 8;
                 break;
               }
-              _context22.n = 3;
+              _context22.n = 6;
               return this.recover(process);
-            case 3:
-              message = (_this$mem$env$process2 = this.mem.env[process]) === null || _this$mem$env$process2 === void 0 || (_this$mem$env$process2 = _this$mem$env$process2.results) === null || _this$mem$env$process2 === void 0 ? void 0 : _this$mem$env$process2[slot];
+            case 6:
+              _context22.n = 7;
+              return this.mem.get("env", process);
+            case 7:
+              p = _context22.v;
+              message = (_p2 = p) === null || _p2 === void 0 || (_p2 = _p2.results) === null || _p2 === void 0 ? void 0 : _p2[slot];
               if (!(0, _ramda.isNil)(message)) {
-                _context22.n = 4;
+                _context22.n = 8;
                 break;
               }
               return _context22.a(2, {
                 status: 404,
                 error: "not Found"
               });
-            case 4:
-              _context22.n = 5;
+            case 8:
+              _context22.n = 9;
               return this.result({
                 message: message,
                 process: process
               });
-            case 5:
+            case 9:
               res2 = _context22.v;
               return _context22.a(2, {
                 json: res2
@@ -1036,49 +1100,118 @@ var Adaptor = /*#__PURE__*/function () {
       return cu_post_result;
     }()
   }, {
-    key: "su_get_root",
+    key: "cu_post_evaluate",
     value: function () {
-      var _su_get_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee24(_ref9) {
-        var query, params, body, headers, method;
+      var _cu_post_evaluate = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee24(_ref9) {
+        var query, params, body, headers, method, message, process, data, msgTags, from, is_spawn, _tags2, _tags3, res, _t13;
         return _regenerator().w(function (_context24) {
-          while (1) switch (_context24.n) {
+          while (1) switch (_context24.p = _context24.n) {
             case 0:
               query = _ref9.query, params = _ref9.params, body = _ref9.body, headers = _ref9.headers, method = _ref9.method;
+              message = body.message, process = body.process, data = body.data, msgTags = body.tags, from = body.from, is_spawn = body.is_spawn;
+              if (process) {
+                _context24.n = 1;
+                break;
+              }
               return _context24.a(2, {
+                status: 400,
                 json: {
-                  Unit: "Scheduler",
-                  Timestamp: Date.now(),
-                  Address: this.su_signer.addr,
-                  Processes: (0, _ramda.keys)(this.mem.env)
+                  error: "process required"
+                }
+              });
+            case 1:
+              _context24.p = 1;
+              _context24.n = 2;
+              return this.evaluate({
+                message: message,
+                process: process,
+                data: data || "",
+                tags: msgTags,
+                from: from,
+                is_spawn: is_spawn,
+                module: body.module || msgTags && ((_tags2 = (0, _utils.tags)(msgTags)) === null || _tags2 === void 0 ? void 0 : _tags2.Module),
+                scheduler: body.scheduler || msgTags && ((_tags3 = (0, _utils.tags)(msgTags)) === null || _tags3 === void 0 ? void 0 : _tags3.Scheduler)
+              });
+            case 2:
+              res = _context24.v;
+              return _context24.a(2, {
+                json: res || {}
+              });
+            case 3:
+              _context24.p = 3;
+              _t13 = _context24.v;
+              console.log("cu_post_evaluate error:", _t13);
+              return _context24.a(2, {
+                status: 500,
+                json: {
+                  error: _t13.message
                 }
               });
           }
-        }, _callee24, this);
+        }, _callee24, this, [[1, 3]]);
       }));
-      function su_get_root(_x24) {
-        return _su_get_root.apply(this, arguments);
+      function cu_post_evaluate(_x24) {
+        return _cu_post_evaluate.apply(this, arguments);
       }
-      return su_get_root;
+      return cu_post_evaluate;
     }()
   }, {
-    key: "su_get_timestamp",
+    key: "su_get_root",
     value: function () {
-      var _su_get_timestamp = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee25(_ref0) {
-        var query, params, body, headers, method;
+      var _su_get_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee25(_ref0) {
+        var query, params, body, headers, method, _t14, _t15, _t16, _t17;
         return _regenerator().w(function (_context25) {
           while (1) switch (_context25.n) {
             case 0:
               query = _ref0.query, params = _ref0.params, body = _ref0.body, headers = _ref0.headers, method = _ref0.method;
+              _t14 = Date.now();
+              _t15 = this.su_signer.addr;
+              _context25.n = 1;
+              return this.mem.getFieldKeys("env");
+            case 1:
+              _t16 = _context25.v;
+              _t17 = {
+                Unit: "Scheduler",
+                Timestamp: _t14,
+                Address: _t15,
+                Processes: _t16
+              };
               return _context25.a(2, {
-                json: {
-                  timestamp: Date.now(),
-                  block_height: this.mem.height
-                }
+                json: _t17
               });
           }
         }, _callee25, this);
       }));
-      function su_get_timestamp(_x25) {
+      function su_get_root(_x25) {
+        return _su_get_root.apply(this, arguments);
+      }
+      return su_get_root;
+    }()
+  }, {
+    key: "su_get_timestamp",
+    value: function () {
+      var _su_get_timestamp = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee26(_ref1) {
+        var query, params, body, headers, method, _t18, _t19, _t20;
+        return _regenerator().w(function (_context26) {
+          while (1) switch (_context26.n) {
+            case 0:
+              query = _ref1.query, params = _ref1.params, body = _ref1.body, headers = _ref1.headers, method = _ref1.method;
+              _t18 = Date.now();
+              _context26.n = 1;
+              return this.mem.get("height");
+            case 1:
+              _t19 = _context26.v;
+              _t20 = {
+                timestamp: _t18,
+                block_height: _t19
+              };
+              return _context26.a(2, {
+                json: _t20
+              });
+          }
+        }, _callee26, this);
+      }));
+      function su_get_timestamp(_x26) {
         return _su_get_timestamp.apply(this, arguments);
       }
       return su_get_timestamp;
@@ -1086,40 +1219,51 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "su_get_pid",
     value: function () {
-      var _su_get_pid = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee27(_ref1) {
-        var _this = this,
-          _this$mem$env$pid$res2,
-          _this$mem$env$pid3;
-        var query, params, body, headers, method, pid, edges;
-        return _regenerator().w(function (_context27) {
-          while (1) switch (_context27.n) {
+      var _su_get_pid = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee28(_ref10) {
+        var _this2 = this,
+          _p$results2;
+        var query, params, body, headers, method, pid, p, edges;
+        return _regenerator().w(function (_context28) {
+          while (1) switch (_context28.n) {
             case 0:
-              query = _ref1.query, params = _ref1.params, body = _ref1.body, headers = _ref1.headers, method = _ref1.method;
+              query = _ref10.query, params = _ref10.params, body = _ref10.body, headers = _ref10.headers, method = _ref10.method;
               pid = params.pid;
+              _context28.n = 1;
+              return this.mem.get("env", pid);
+            case 1:
+              p = _context28.v;
               edges = (0, _ramda.map)(/*#__PURE__*/function () {
-                var _ref10 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee26(v) {
+                var _ref11 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee27(v) {
                   var _mtx$anchor, _tx$anchor;
-                  var tx, _tags, mid, mtx;
-                  return _regenerator().w(function (_context26) {
-                    while (1) switch (_context26.n) {
+                  var tx, _tags, mid, mtx, mtxOwner, txOwner;
+                  return _regenerator().w(function (_context27) {
+                    while (1) switch (_context27.n) {
                       case 0:
-                        _context26.n = 1;
-                        return _this.mem.getTx(v);
+                        _context27.n = 1;
+                        return _this2.mem.getTx(v);
                       case 1:
-                        tx = _context26.v;
+                        tx = _context27.v;
                         _tags = (0, _utils.tags)(v.tags);
                         mid = _tags.Message;
-                        _context26.n = 2;
-                        return _this.mem.getTx(mid);
+                        _context27.n = 2;
+                        return _this2.mem.getTx(mid);
                       case 2:
-                        mtx = _context26.v;
-                        return _context26.a(2, {
+                        mtx = _context27.v;
+                        _context27.n = 3;
+                        return _this2.mem.get("addrmap", mtx.owner);
+                      case 3:
+                        mtxOwner = _context27.v;
+                        _context27.n = 4;
+                        return _this2.mem.get("addrmap", tx.owner);
+                      case 4:
+                        txOwner = _context27.v;
+                        return _context27.a(2, {
                           cursor: v,
                           node: {
                             message: {
                               id: mtx.id,
                               tags: mtx.tags,
-                              owner: _this.mem.addrmap[mtx.owner],
+                              owner: mtxOwner,
                               anchor: (_mtx$anchor = mtx.anchor) !== null && _mtx$anchor !== void 0 ? _mtx$anchor : null,
                               target: pid,
                               signature: mtx.signature,
@@ -1128,7 +1272,7 @@ var Adaptor = /*#__PURE__*/function () {
                             assignment: {
                               id: tx.id,
                               tags: tx.tags,
-                              owner: _this.mem.addrmap[tx.owner],
+                              owner: txOwner,
                               anchor: (_tx$anchor = tx.anchor) !== null && _tx$anchor !== void 0 ? _tx$anchor : null,
                               target: null,
                               signature: tx.signature
@@ -1136,13 +1280,13 @@ var Adaptor = /*#__PURE__*/function () {
                           }
                         });
                     }
-                  }, _callee26);
+                  }, _callee27);
                 }));
-                return function (_x27) {
-                  return _ref10.apply(this, arguments);
+                return function (_x28) {
+                  return _ref11.apply(this, arguments);
                 };
-              }())((0, _ramda.reverse)((_this$mem$env$pid$res2 = (_this$mem$env$pid3 = this.mem.env[pid]) === null || _this$mem$env$pid3 === void 0 ? void 0 : _this$mem$env$pid3.results) !== null && _this$mem$env$pid$res2 !== void 0 ? _this$mem$env$pid$res2 : [])); // need mod
-              return _context27.a(2, {
+              }())((0, _ramda.reverse)((_p$results2 = p === null || p === void 0 ? void 0 : p.results) !== null && _p$results2 !== void 0 ? _p$results2 : [])); // need mod
+              return _context28.a(2, {
                 json: {
                   page_info: {
                     has_next_page: false
@@ -1151,9 +1295,9 @@ var Adaptor = /*#__PURE__*/function () {
                 }
               });
           }
-        }, _callee27, this);
+        }, _callee28, this);
       }));
-      function su_get_pid(_x26) {
+      function su_get_pid(_x27) {
         return _su_get_pid.apply(this, arguments);
       }
       return su_get_pid;
@@ -1161,19 +1305,19 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "mu_get_root",
     value: function () {
-      var _mu_get_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee28(_ref11) {
+      var _mu_get_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(_ref12) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context28) {
-          while (1) switch (_context28.n) {
+        return _regenerator().w(function (_context29) {
+          while (1) switch (_context29.n) {
             case 0:
-              query = _ref11.query, params = _ref11.params, body = _ref11.body, headers = _ref11.headers, method = _ref11.method;
-              return _context28.a(2, {
+              query = _ref12.query, params = _ref12.params, body = _ref12.body, headers = _ref12.headers, method = _ref12.method;
+              return _context29.a(2, {
                 send: "ao messenger unit"
               });
           }
-        }, _callee28);
+        }, _callee29);
       }));
-      function mu_get_root(_x28) {
+      function mu_get_root(_x29) {
         return _mu_get_root.apply(this, arguments);
       }
       return mu_get_root;
@@ -1181,87 +1325,144 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "mu_post_root",
     value: function () {
-      var _mu_post_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee29(_ref12) {
-        var query, params, body, headers, method, valid, type, item, _tags, err, res, _t13;
-        return _regenerator().w(function (_context29) {
-          while (1) switch (_context29.p = _context29.n) {
+      var _mu_post_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee30(_ref13) {
+        var query, params, body, headers, method, valid, type, item, _tags, _allowedNetworks, err, res, _t21, _t22, _t23, _t24;
+        return _regenerator().w(function (_context30) {
+          while (1) switch (_context30.p = _context30.n) {
             case 0:
-              query = _ref12.query, params = _ref12.params, body = _ref12.body, headers = _ref12.headers, method = _ref12.method;
+              query = _ref13.query, params = _ref13.params, body = _ref13.body, headers = _ref13.headers, method = _ref13.method;
               if (body.type === "Buffer" && Array.isArray(body.data)) {
                 body = new Uint8Array(body.data);
               }
               valid = false; // todo: cannot verify node -> broser items
-              _context29.p = 1;
-              _context29.n = 2;
+              _context30.p = 1;
+              _context30.n = 2;
               return _arbundles.DataItem.verify(body);
             case 2:
-              valid = _context29.v;
-              _context29.n = 4;
+              valid = _context30.v;
+              _context30.n = 4;
               break;
             case 3:
-              _context29.p = 3;
-              _t13 = _context29.v;
-              console.log(_t13);
+              _context30.p = 3;
+              _t21 = _context30.v;
             case 4:
               type = null;
               item = null;
               if (valid || true) item = new _arbundles.DataItem(body);
-              _context29.n = 5;
+              _context30.n = 5;
               return item.setSignature(item.rawSignature);
             case 5:
-              _tags = (0, _utils.tags)(item.tags);
+              _tags = (0, _utils.tags)(item.tags); // Allow both ao.TN.1 (legacy testnet) and ao.DN.1 (WAO Devnet) variants
+              // through the local emulator. The variant is informational here; the
+              // local emulator doesn't actually need to enforce a strict network.
+              _allowedNetworks = new Set([this.network, "ao.TN.1", "ao.DN.1"]);
+              if (!(_tags.Variant && !_allowedNetworks.has(_tags.Variant))) {
+                _context30.n = 6;
+                break;
+              }
+              return _context30.a(2, {
+                status: 400,
+                json: {
+                  error: "Variant mismatch: expected ".concat(this.network, ", got ").concat(_tags.Variant)
+                }
+              });
+            case 6:
               err = null;
               if (!(_tags.Type === "Process")) {
-                _context29.n = 7;
+                _context30.n = 11;
                 break;
               }
-              _context29.n = 6;
+              _context30.p = 7;
+              _context30.n = 8;
               return this.spawn({
                 item: item,
                 module: _tags.Module,
-                scheduler: _tags.Scheduler
+                scheduler: _tags.Scheduler,
+                _cu_url: _tags["CU-URL"] || undefined
               });
-            case 6:
-              res = _context29.v;
+            case 8:
+              res = _context30.v;
               if (!res) err = "bad requrest";
-              _context29.n = 10;
+              _context30.n = 10;
               break;
-            case 7:
+            case 9:
+              _context30.p = 9;
+              _t22 = _context30.v;
+              console.error("MU spawn error:", _t22.message, _t22.stack);
+              return _context30.a(2, {
+                status: 500,
+                json: {
+                  error: _t22.message,
+                  stack: (_t22.stack || "").split("\n").slice(0, 8)
+                }
+              });
+            case 10:
+              _context30.n = 22;
+              break;
+            case 11:
               if (!(_tags.Type === "Message")) {
-                _context29.n = 9;
+                _context30.n = 16;
                 break;
               }
-              _context29.n = 8;
+              _context30.p = 12;
+              _context30.n = 13;
               return this.message({
                 item: item,
                 process: item.target
               });
-            case 8:
-              _context29.n = 10;
+            case 13:
+              _context30.n = 15;
               break;
-            case 9:
+            case 14:
+              _context30.p = 14;
+              _t23 = _context30.v;
+              console.error("MU message error:", _t23.message, _t23.stack);
+              err = _t23.message;
+            case 15:
+              _context30.n = 22;
+              break;
+            case 16:
+              if (!(_tags.Type === "Scheduler-Location" || _tags.Type === "Scheduler-Transfer")) {
+                _context30.n = 21;
+                break;
+              }
+              _context30.p = 17;
+              _context30.n = 18;
+              return this._ar.postItems(item, this.su_signer.jwk);
+            case 18:
+              _context30.n = 20;
+              break;
+            case 19:
+              _context30.p = 19;
+              _t24 = _context30.v;
+              console.error("MU ".concat(_tags.Type, " error:"), _t24.message, _t24.stack);
+              err = _t24.message;
+            case 20:
+              _context30.n = 22;
+              break;
+            case 21:
               err = true;
-            case 10:
+            case 22:
               if (!err) {
-                _context29.n = 11;
+                _context30.n = 23;
                 break;
               }
-              return _context29.a(2, {
+              return _context30.a(2, {
                 status: 400,
                 error: err
               });
-            case 11:
-              return _context29.a(2, {
+            case 23:
+              return _context30.a(2, {
                 json: {
                   id: item.id
                 }
               });
-            case 12:
-              return _context29.a(2);
+            case 24:
+              return _context30.a(2);
           }
-        }, _callee29, this, [[1, 3]]);
+        }, _callee30, this, [[17, 19], [12, 14], [7, 9], [1, 3]]);
       }));
-      function mu_post_root(_x29) {
+      function mu_post_root(_x30) {
         return _mu_post_root.apply(this, arguments);
       }
       return mu_post_root;
@@ -1269,27 +1470,27 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "mu_post_monitor",
     value: function () {
-      var _mu_post_monitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee30(_ref13) {
+      var _mu_post_monitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31(_ref14) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context30) {
-          while (1) switch (_context30.n) {
+        return _regenerator().w(function (_context31) {
+          while (1) switch (_context31.n) {
             case 0:
-              query = _ref13.query, params = _ref13.params, body = _ref13.body, headers = _ref13.headers, method = _ref13.method;
-              _context30.n = 1;
+              query = _ref14.query, params = _ref14.params, body = _ref14.body, headers = _ref14.headers, method = _ref14.method;
+              _context31.n = 1;
               return this.monitor({
                 process: params.pid
               });
             case 1:
-              return _context30.a(2, {
+              return _context31.a(2, {
                 json: {
                   id: params.pid,
                   messag: "cron monitored!"
                 }
               });
           }
-        }, _callee30, this);
+        }, _callee31, this);
       }));
-      function mu_post_monitor(_x30) {
+      function mu_post_monitor(_x31) {
         return _mu_post_monitor.apply(this, arguments);
       }
       return mu_post_monitor;
@@ -1297,27 +1498,27 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "mu_delete_monitor",
     value: function () {
-      var _mu_delete_monitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee31(_ref14) {
+      var _mu_delete_monitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee32(_ref15) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context31) {
-          while (1) switch (_context31.n) {
+        return _regenerator().w(function (_context32) {
+          while (1) switch (_context32.n) {
             case 0:
-              query = _ref14.query, params = _ref14.params, body = _ref14.body, headers = _ref14.headers, method = _ref14.method;
-              _context31.n = 1;
+              query = _ref15.query, params = _ref15.params, body = _ref15.body, headers = _ref15.headers, method = _ref15.method;
+              _context32.n = 1;
               return this.unmonitor({
                 process: params.pid
               });
             case 1:
-              return _context31.a(2, {
+              return _context32.a(2, {
                 json: {
                   id: params.pid,
                   message: "cron deleted!"
                 }
               });
           }
-        }, _callee31, this);
+        }, _callee32, this);
       }));
-      function mu_delete_monitor(_x31) {
+      function mu_delete_monitor(_x32) {
         return _mu_delete_monitor.apply(this, arguments);
       }
       return mu_delete_monitor;
@@ -1325,25 +1526,33 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_root",
     value: function () {
-      var _ar_get_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee32(_ref15) {
-        var query, params, body, headers, method;
-        return _regenerator().w(function (_context32) {
-          while (1) switch (_context32.n) {
+      var _ar_get_root = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee33(_ref16) {
+        var query, params, body, headers, method, _t25, _t26, _t27, _t28, _t29;
+        return _regenerator().w(function (_context33) {
+          while (1) switch (_context33.n) {
             case 0:
-              query = _ref15.query, params = _ref15.params, body = _ref15.body, headers = _ref15.headers, method = _ref15.method;
-              return _context32.a(2, {
-                json: {
-                  version: 1,
-                  timestamp: Date.now(),
-                  height: this.mem.height,
-                  network: "wao.LN.1",
-                  current: this.mem.getAnchor()
-                }
+              query = _ref16.query, params = _ref16.params, body = _ref16.body, headers = _ref16.headers, method = _ref16.method;
+              _t25 = Date.now();
+              _context33.n = 1;
+              return this.mem.get("height");
+            case 1:
+              _t26 = _context33.v;
+              _t27 = this.network;
+              _t28 = this.mem.getAnchor();
+              _t29 = {
+                version: 1,
+                timestamp: _t25,
+                height: _t26,
+                network: _t27,
+                current: _t28
+              };
+              return _context33.a(2, {
+                json: _t29
               });
           }
-        }, _callee32, this);
+        }, _callee33, this);
       }));
-      function ar_get_root(_x32) {
+      function ar_get_root(_x33) {
         return _ar_get_root.apply(this, arguments);
       }
       return ar_get_root;
@@ -1351,19 +1560,19 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_wallet_balance",
     value: function () {
-      var _ar_get_wallet_balance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee33(_ref16) {
+      var _ar_get_wallet_balance = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee34(_ref17) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context33) {
-          while (1) switch (_context33.n) {
+        return _regenerator().w(function (_context34) {
+          while (1) switch (_context34.n) {
             case 0:
-              query = _ref16.query, params = _ref16.params, body = _ref16.body, headers = _ref16.headers, method = _ref16.method;
-              return _context33.a(2, {
+              query = _ref17.query, params = _ref17.params, body = _ref17.body, headers = _ref17.headers, method = _ref17.method;
+              return _context34.a(2, {
                 send: "0"
               });
           }
-        }, _callee33);
+        }, _callee34);
       }));
-      function ar_get_wallet_balance(_x33) {
+      function ar_get_wallet_balance(_x34) {
         return _ar_get_wallet_balance.apply(this, arguments);
       }
       return ar_get_wallet_balance;
@@ -1371,21 +1580,21 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_mint",
     value: function () {
-      var _ar_get_mint = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee34(_ref17) {
+      var _ar_get_mint = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee35(_ref18) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context34) {
-          while (1) switch (_context34.n) {
+        return _regenerator().w(function (_context35) {
+          while (1) switch (_context35.n) {
             case 0:
-              query = _ref17.query, params = _ref17.params, body = _ref17.body, headers = _ref17.headers, method = _ref17.method;
-              return _context34.a(2, {
+              query = _ref18.query, params = _ref18.params, body = _ref18.body, headers = _ref18.headers, method = _ref18.method;
+              return _context35.a(2, {
                 json: {
                   id: "0"
                 }
               });
           }
-        }, _callee34);
+        }, _callee35);
       }));
-      function ar_get_mint(_x34) {
+      function ar_get_mint(_x35) {
         return _ar_get_mint.apply(this, arguments);
       }
       return ar_get_mint;
@@ -1393,20 +1602,20 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_tx_offset",
     value: function () {
-      var _ar_get_tx_offset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee35(_ref18) {
+      var _ar_get_tx_offset = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee36(_ref19) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context35) {
-          while (1) switch (_context35.n) {
+        return _regenerator().w(function (_context36) {
+          while (1) switch (_context36.n) {
             case 0:
-              query = _ref18.query, params = _ref18.params, body = _ref18.body, headers = _ref18.headers, method = _ref18.method;
-              return _context35.a(2, {
+              query = _ref19.query, params = _ref19.params, body = _ref19.body, headers = _ref19.headers, method = _ref19.method;
+              return _context36.a(2, {
                 status: 400,
                 send: null
               });
           }
-        }, _callee35);
+        }, _callee36);
       }));
-      function ar_get_tx_offset(_x35) {
+      function ar_get_tx_offset(_x36) {
         return _ar_get_tx_offset.apply(this, arguments);
       }
       return ar_get_tx_offset;
@@ -1414,19 +1623,19 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_tx_anchor",
     value: function () {
-      var _ar_get_tx_anchor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee36(_ref19) {
+      var _ar_get_tx_anchor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee37(_ref20) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context36) {
-          while (1) switch (_context36.n) {
+        return _regenerator().w(function (_context37) {
+          while (1) switch (_context37.n) {
             case 0:
-              query = _ref19.query, params = _ref19.params, body = _ref19.body, headers = _ref19.headers, method = _ref19.method;
-              return _context36.a(2, {
+              query = _ref20.query, params = _ref20.params, body = _ref20.body, headers = _ref20.headers, method = _ref20.method;
+              return _context37.a(2, {
                 send: this.mem.getAnchor()
               });
           }
-        }, _callee36, this);
+        }, _callee37, this);
       }));
-      function ar_get_tx_anchor(_x36) {
+      function ar_get_tx_anchor(_x37) {
         return _ar_get_tx_anchor.apply(this, arguments);
       }
       return ar_get_tx_anchor;
@@ -1434,19 +1643,19 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_mine",
     value: function () {
-      var _ar_get_mine = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee37(_ref20) {
+      var _ar_get_mine = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee38(_ref21) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context37) {
-          while (1) switch (_context37.n) {
+        return _regenerator().w(function (_context38) {
+          while (1) switch (_context38.n) {
             case 0:
-              query = _ref20.query, params = _ref20.params, body = _ref20.body, headers = _ref20.headers, method = _ref20.method;
-              return _context37.a(2, {
+              query = _ref21.query, params = _ref21.params, body = _ref21.body, headers = _ref21.headers, method = _ref21.method;
+              return _context38.a(2, {
                 json: params
               });
           }
-        }, _callee37);
+        }, _callee38);
       }));
-      function ar_get_mine(_x37) {
+      function ar_get_mine(_x38) {
         return _ar_get_mine.apply(this, arguments);
       }
       return ar_get_mine;
@@ -1454,34 +1663,49 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_id",
     value: function () {
-      var _ar_get_id = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee38(_ref21) {
-        var query, params, body, headers, method, _data;
-        return _regenerator().w(function (_context38) {
-          while (1) switch (_context38.n) {
+      var _ar_get_id = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee39(_ref22) {
+        var _tx$_data;
+        var query, params, body, headers, method, _data, tx, contentType, ctTag, send;
+        return _regenerator().w(function (_context39) {
+          while (1) switch (_context39.n) {
             case 0:
-              query = _ref21.query, params = _ref21.params, body = _ref21.body, headers = _ref21.headers, method = _ref21.method;
-              _context38.n = 1;
+              query = _ref22.query, params = _ref22.params, body = _ref22.body, headers = _ref22.headers, method = _ref22.method;
+              _context39.n = 1;
               return this._ar.data(params.id);
             case 1:
-              _data = _context38.v;
+              _data = _context39.v;
               if (_data) {
-                _context38.n = 2;
+                _context39.n = 2;
                 break;
               }
-              return _context38.a(2, {
+              return _context39.a(2, {
                 status: 404,
                 send: null
               });
             case 2:
-              return _context38.a(2, {
-                send: Buffer.from(_data, "base64")
-              });
+              _context39.n = 3;
+              return this.mem.getTx(params.id);
             case 3:
-              return _context38.a(2);
+              tx = _context39.v;
+              contentType = (tx === null || tx === void 0 || (_tx$_data = tx._data) === null || _tx$_data === void 0 ? void 0 : _tx$_data.type) || "";
+              if (!contentType && tx !== null && tx !== void 0 && tx.tags) {
+                ctTag = tx.tags.find(function (t) {
+                  return t.name === "Content-Type";
+                });
+                if (ctTag) contentType = ctTag.value;
+              }
+              if (!contentType) contentType = "application/octet-stream";
+              send = Buffer.isBuffer(_data) || _data instanceof Uint8Array ? _data : Buffer.from(String(_data), "base64");
+              return _context39.a(2, {
+                send: send,
+                headers: {
+                  "Content-Type": contentType
+                }
+              });
           }
-        }, _callee38, this);
+        }, _callee39, this);
       }));
-      function ar_get_id(_x38) {
+      function ar_get_id(_x39) {
         return _ar_get_id.apply(this, arguments);
       }
       return ar_get_id;
@@ -1489,19 +1713,19 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_get_price",
     value: function () {
-      var _ar_get_price = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee39(_ref22) {
+      var _ar_get_price = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee40(_ref23) {
         var query, params, body, headers, method;
-        return _regenerator().w(function (_context39) {
-          while (1) switch (_context39.n) {
+        return _regenerator().w(function (_context40) {
+          while (1) switch (_context40.n) {
             case 0:
-              query = _ref22.query, params = _ref22.params, body = _ref22.body, headers = _ref22.headers, method = _ref22.method;
-              return _context39.a(2, {
+              query = _ref23.query, params = _ref23.params, body = _ref23.body, headers = _ref23.headers, method = _ref23.method;
+              return _context40.a(2, {
                 send: "0"
               });
           }
-        }, _callee39);
+        }, _callee40);
       }));
-      function ar_get_price(_x39) {
+      function ar_get_price(_x40) {
         return _ar_get_price.apply(this, arguments);
       }
       return ar_get_price;
@@ -1509,67 +1733,57 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_post_graphql",
     value: function () {
-      var _ar_post_graphql = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee40(_ref23) {
-        var query, params, body, headers, method, _query, variables, _toGraphObj, tar, args, res2, edges, _t14;
-        return _regenerator().w(function (_context40) {
-          while (1) switch (_context40.p = _context40.n) {
+      var _ar_post_graphql = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee41(_ref24) {
+        var query, params, body, headers, method, _args$first, _query, variables, _toGraphObj, tar, args, first, res2, fn, hasNextPage, edges, _t30;
+        return _regenerator().w(function (_context41) {
+          while (1) switch (_context41.p = _context41.n) {
             case 0:
-              query = _ref23.query, params = _ref23.params, body = _ref23.body, headers = _ref23.headers, method = _ref23.method;
-              _context40.p = 1;
+              query = _ref24.query, params = _ref24.params, body = _ref24.body, headers = _ref24.headers, method = _ref24.method;
+              _context41.p = 1;
               _query = body.query, variables = body.variables;
               _toGraphObj = (0, _utils.toGraphObj)({
                 query: _query,
                 variables: variables
               }), tar = _toGraphObj.tar, args = _toGraphObj.args;
+              first = (_args$first = args.first) !== null && _args$first !== void 0 ? _args$first : 10;
               res2 = null;
-              if (!(tar === "transactions")) {
-                _context40.n = 3;
-                break;
-              }
-              _context40.n = 2;
-              return this.gql.txs(_objectSpread({}, args));
+              fn = tar === "blocks" ? "blocks" : "txs";
+              _context41.n = 2;
+              return this.gql[fn](_objectSpread(_objectSpread({}, args), {}, {
+                first: first + 1
+              }));
             case 2:
-              res2 = _context40.v;
-              _context40.n = 5;
-              break;
-            case 3:
-              if (!(tar === "blocks")) {
-                _context40.n = 5;
-                break;
-              }
-              _context40.n = 4;
-              return this.gql.blocks(_objectSpread({}, args));
-            case 4:
-              res2 = _context40.v;
-            case 5:
+              res2 = _context41.v;
+              hasNextPage = res2.length > first;
+              if (hasNextPage) res2 = res2.slice(0, first);
               edges = (0, _ramda.map)(function (v) {
                 return {
                   node: v,
                   cursor: v.cursor
                 };
               }, res2);
-              return _context40.a(2, {
+              return _context41.a(2, {
                 json: {
                   data: _defineProperty({}, tar, {
                     pageInfo: {
-                      hasNextPage: true
+                      hasNextPage: hasNextPage
                     },
                     edges: edges
                   })
                 }
               });
-            case 6:
-              _context40.p = 6;
-              _t14 = _context40.v;
-              console.log(_t14);
-              return _context40.a(2, {
+            case 3:
+              _context41.p = 3;
+              _t30 = _context41.v;
+              console.log(_t30);
+              return _context41.a(2, {
                 status: 400,
                 error: "bad request"
               });
           }
-        }, _callee40, this, [[1, 6]]);
+        }, _callee41, this, [[1, 3]]);
       }));
-      function ar_post_graphql(_x40) {
+      function ar_post_graphql(_x41) {
         return _ar_post_graphql.apply(this, arguments);
       }
       return ar_post_graphql;
@@ -1577,20 +1791,21 @@ var Adaptor = /*#__PURE__*/function () {
   }, {
     key: "ar_post_id",
     value: function () {
-      var _ar_post_id = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee41(_ref24) {
+      var _ar_post_id = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee42(_ref25) {
         var query, params, body, headers, method, buf;
-        return _regenerator().w(function (_context41) {
-          while (1) switch (_context41.n) {
+        return _regenerator().w(function (_context42) {
+          while (1) switch (_context42.n) {
             case 0:
-              query = _ref24.query, params = _ref24.params, body = _ref24.body, headers = _ref24.headers, method = _ref24.method;
+              query = _ref25.query, params = _ref25.params, body = _ref25.body, headers = _ref25.headers, method = _ref25.method;
               if (!body.chunk) {
-                _context41.n = 3;
+                _context42.n = 3;
                 break;
               }
               if (!this.data[body.data_root]) {
-                _context41.n = 2;
+                _context42.n = 2;
                 break;
               }
+              this._dataTimestamps[body.data_root] = Date.now();
               this.data[body.data_root].data += body.chunk;
               buf = Buffer.from(body.chunk, "base64");
               if (!this.data[body.data_root].chunks) {
@@ -1600,43 +1815,45 @@ var Adaptor = /*#__PURE__*/function () {
               }
               delete body.chunk;
               if (!(this.data[body.data_root].data_size <= this.data[body.data_root].chunks.length)) {
-                _context41.n = 2;
+                _context42.n = 2;
                 break;
               }
               this.data[body.data_root].data = this.data[body.data_root].chunks.toString("base64");
-              _context41.n = 1;
+              _context42.n = 1;
               return this._ar.postTx(this.data[body.data_root]);
             case 1:
               delete this.data[body.data_root];
+              delete this._dataTimestamps[body.data_root];
             case 2:
-              return _context41.a(2, {
+              return _context42.a(2, {
                 json: {
                   id: body.id
                 }
               });
             case 3:
               if (!(body.data_root && body.data === "")) {
-                _context41.n = 4;
+                _context42.n = 4;
                 break;
               }
               this.data[body.data_root] = body;
-              _context41.n = 5;
+              this._dataTimestamps[body.data_root] = Date.now();
+              _context42.n = 5;
               break;
             case 4:
-              _context41.n = 5;
+              _context42.n = 5;
               return this._ar.postTx(body);
             case 5:
-              return _context41.a(2, {
+              return _context42.a(2, {
                 json: {
                   id: body.id
                 }
               });
             case 6:
-              return _context41.a(2);
+              return _context42.a(2);
           }
-        }, _callee41, this);
+        }, _callee42, this);
       }));
-      function ar_post_id(_x41) {
+      function ar_post_id(_x42) {
         return _ar_post_id.apply(this, arguments);
       }
       return ar_post_id;