wao 0.40.1 → 0.41.0

package/cjs/aoconnect-base.js

@@ -15,7 +15,7 @@ var _aoconnect = require("@permaweb/aoconnect");
 var _weavedrive = _interopRequireDefault(require("./weavedrive.js"));
 var _ramda = require("ramda");
 var _Arweave$default, _WarpArBundles$defaul;
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t128 in e) "default" !== _t128 && {}.hasOwnProperty.call(e, _t128) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t128)) && (i.get || i.set) ? o(f, _t128, i) : f[_t128] = e[_t128]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t134 in e) "default" !== _t134 && {}.hasOwnProperty.call(e, _t134) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t134)) && (i.get || i.set) ? o(f, _t134, i) : f[_t134] = e[_t134]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regeneratorValues(e) { if (null != e) { var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"], r = 0; if (t) return t.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) return { next: function next() { return e && r >= e.length && (e = void 0), { value: e && e[r++], done: !e }; } }; } throw new TypeError(_typeof(e) + " is not iterable"); }
 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; }
@@ -59,15 +59,25 @@ var _default = exports["default"] = function _default() {
       _ref2$extensions = _ref2.extensions,
       extensions = _ref2$extensions === void 0 ? {} : _ref2$extensions,
       hb = _ref2.hb,
-      variant = _ref2.variant;
+      variant = _ref2.variant,
+      storage = _ref2.storage,
+      d1 = _ref2.d1,
+      r2 = _ref2.r2,
+      kv = _ref2.kv,
+      ar_url = _ref2.ar_url;
     var isMem = ((_mem = mem) === null || _mem === void 0 ? void 0 : _mem.__type__) === "mem";
     if (!isMem) {
       var _mem2;
       var args = {
-        cache: cache
+        cache: cache,
+        storage: storage,
+        scheduler: scheduler,
+        d1: d1,
+        r2: r2,
+        kv: kv,
+        ar_url: ar_url
       };
       if ((_mem2 = mem) !== null && _mem2 !== void 0 && _mem2.SU_URL) {
-        args.scheduler = scheduler;
         args.variant = variant;
         args = (0, _ramda.mergeLeft)(mem, args);
       }
@@ -317,6 +327,12 @@ var _default = exports["default"] = function _default() {
           _step2,
           v,
           _yield$ar$dataitem,
+          _tags2,
+          _ext,
+          _p,
+          _opt$data,
+          cuResult,
+          _msg2,
           now,
           t,
           ext,
@@ -328,7 +344,7 @@ var _default = exports["default"] = function _default() {
           memory,
           p,
           __msg,
-          _opt$data,
+          _opt$data2,
           _yield$mem$get$data,
           _yield$mem$get,
           data,
@@ -356,7 +372,8 @@ var _default = exports["default"] = function _default() {
           _t39,
           _t40,
           _t41,
-          _t42;
+          _t42,
+          _t43;
         return _regenerator().w(function (_context3) {
           while (1) switch (_context3.p = _context3.n) {
             case 0:
@@ -467,43 +484,102 @@ var _default = exports["default"] = function _default() {
               _context3.n = 12;
               return ar.postItems(item, su.jwk);
             case 12:
-              now = Date.now;
-              t = (0, _utils.tags)(opt.tags);
-              ext = t.Extension || "WeaveDrive";
-              wdrive = extensions[ext];
-              handle = null;
+              if (!opt._cu_url) {
+                _context3.n = 19;
+                break;
+              }
+              _tags2 = (0, _utils.tags)(opt.tags);
+              _ext = _tags2.Extension || "WeaveDrive";
+              _p = {
+                _cu_url: opt._cu_url,
+                extension: _ext,
+                format: format,
+                id: id,
+                epochs: [],
+                module: mod,
+                hash: id,
+                memory: null,
+                owner: owner,
+                height: 0,
+                results: [id]
+              };
               _context3.p = 13;
-              _t29 = AoLoader;
-              _t30 = wasm;
-              _t31 = format;
-              _t32 = wdrive;
-              _t33 = item;
               _context3.n = 14;
-              return mem.getTx(mod);
+              return fetch("".concat(opt._cu_url, "/cu/evaluate"), {
+                method: "POST",
+                headers: {
+                  "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                  message: id,
+                  process: id,
+                  data: (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "",
+                  tags: opt.tags,
+                  from: owner,
+                  is_spawn: true
+                })
+              }).then(function (r) {
+                return r.json();
+              });
             case 14:
-              _t34 = _context3.v;
-              _context3.n = 15;
-              return _t29(_t30, {
-                format: _t31,
-                WeaveDrive: _t32,
-                spawn: _t33,
-                module: _t34
+              cuResult = _context3.v;
+              _msg2 = _objectSpread(_objectSpread({}, (0, _ramda.o)((0, _ramda.dissoc)("signer"), (0, _ramda.dissoc)("memory"))(opt)), {}, {
+                res: cuResult,
+                msg: null
               });
+              _context3.n = 15;
+              return mem.set(_msg2, "msgs", id);
             case 15:
-              handle = _context3.v;
               _context3.n = 17;
               break;
             case 16:
               _context3.p = 16;
-              _t35 = _context3.v;
-              console.log(mod, _t35);
+              _t29 = _context3.v;
+              console.log("Remote CU spawn error:", _t29);
             case 17:
+              _context3.n = 18;
+              return mem.set(_p, "env", id);
+            case 18:
+              delete ongoing[id];
+              return _context3.a(2, id);
+            case 19:
+              now = Date.now;
+              t = (0, _utils.tags)(opt.tags);
+              ext = t.Extension || "WeaveDrive";
+              wdrive = extensions[ext];
+              handle = null;
+              _context3.p = 20;
+              _t30 = AoLoader;
+              _t31 = wasm;
+              _t32 = format;
+              _t33 = wdrive;
+              _t34 = item;
+              _context3.n = 21;
+              return mem.getTx(mod);
+            case 21:
+              _t35 = _context3.v;
+              _context3.n = 22;
+              return _t30(_t31, {
+                format: _t32,
+                WeaveDrive: _t33,
+                spawn: _t34,
+                module: _t35
+              });
+            case 22:
+              handle = _context3.v;
+              _context3.n = 24;
+              break;
+            case 23:
+              _context3.p = 23;
+              _t36 = _context3.v;
+              console.log(mod, _t36);
+            case 24:
               if (handle) {
-                _context3.n = 18;
+                _context3.n = 25;
                 break;
               }
               return _context3.a(2, null);
-            case 18:
+            case 25:
               _module = null;
               _module = {
                 handle: handle,
@@ -528,128 +604,128 @@ var _default = exports["default"] = function _default() {
               };
               __msg = null;
               if (!memory) {
-                _context3.n = 19;
+                _context3.n = 26;
                 break;
               }
-              _context3.n = 33;
+              _context3.n = 40;
               break;
-            case 19:
+            case 26:
               if (!(_tags["On-Boot"] || true)) {
-                _context3.n = 32;
+                _context3.n = 39;
                 break;
               }
               data = "";
               if (!(_tags["On-Boot"] === "Data")) {
-                _context3.n = 20;
+                _context3.n = 27;
                 break;
               }
-              data = (_opt$data = opt.data) !== null && _opt$data !== void 0 ? _opt$data : "";
-              _context3.n = 28;
+              data = (_opt$data2 = opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
+              _context3.n = 35;
               break;
-            case 20:
-              _context3.n = 21;
+            case 27:
+              _context3.n = 28;
               return mem.get("msgs", _tags["On-Boot"]);
-            case 21:
-              _t38 = _yield$mem$get = _context3.v;
-              _t37 = _t38 === null;
-              if (_t37) {
-                _context3.n = 22;
+            case 28:
+              _t39 = _yield$mem$get = _context3.v;
+              _t38 = _t39 === null;
+              if (_t38) {
+                _context3.n = 29;
                 break;
               }
-              _t37 = _yield$mem$get === void 0;
-            case 22:
-              if (!_t37) {
-                _context3.n = 23;
+              _t38 = _yield$mem$get === void 0;
+            case 29:
+              if (!_t38) {
+                _context3.n = 30;
                 break;
               }
-              _t39 = void 0;
-              _context3.n = 24;
+              _t40 = void 0;
+              _context3.n = 31;
               break;
-            case 23:
-              _t39 = _yield$mem$get.data;
-            case 24:
-              _t40 = _yield$mem$get$data = _t39;
-              _t36 = _t40 !== null;
-              if (!_t36) {
-                _context3.n = 25;
+            case 30:
+              _t40 = _yield$mem$get.data;
+            case 31:
+              _t41 = _yield$mem$get$data = _t40;
+              _t37 = _t41 !== null;
+              if (!_t37) {
+                _context3.n = 32;
                 break;
               }
-              _t36 = _yield$mem$get$data !== void 0;
-            case 25:
-              if (!_t36) {
-                _context3.n = 26;
+              _t37 = _yield$mem$get$data !== void 0;
+            case 32:
+              if (!_t37) {
+                _context3.n = 33;
                 break;
               }
-              _t41 = _yield$mem$get$data;
-              _context3.n = 27;
+              _t42 = _yield$mem$get$data;
+              _context3.n = 34;
               break;
-            case 26:
-              _t41 = "";
-            case 27:
-              data = _t41;
-            case 28:
-              _context3.n = 29;
+            case 33:
+              _t42 = "";
+            case 34:
+              data = _t42;
+            case 35:
+              _context3.n = 36;
               return genMsg(id, p, data, opt.tags, owner, msg_owner, true);
-            case 29:
+            case 36:
               msg = _context3.v;
               __msg = msg;
-              _context3.n = 30;
+              _context3.n = 37;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 30:
+            case 37:
               _env = _context3.v;
-              _context3.n = 31;
+              _context3.n = 38;
               return _module.handle(null, msg, _env);
-            case 31:
+            case 38:
               res = _context3.v;
               p.memory = res.Memory;
               delete res.Memory;
-              _context3.n = 33;
+              _context3.n = 40;
               break;
-            case 32:
+            case 39:
               p.height += 1;
-            case 33:
+            case 40:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.o)((0, _ramda.dissoc)("signer"), (0, _ramda.dissoc)("memory"))(opt)), {}, {
                 res: res,
                 msg: __msg
               });
-              _context3.n = 34;
+              _context3.n = 41;
               return mem.set(_msg, "msgs", id);
-            case 34:
+            case 41:
               if (!_tags["Cron-Interval"]) {
-                _context3.n = 43;
+                _context3.n = 50;
                 break;
               }
               _tags$CronInterval$s = _tags["Cron-Interval"].split("-"), _tags$CronInterval$s2 = _slicedToArray(_tags$CronInterval$s, 2), num = _tags$CronInterval$s2[0], unit = _tags$CronInterval$s2[1];
               _int = 0;
-              _t42 = unit.replace(/s$/, "");
-              _context3.n = _t42 === "millisecond" ? 35 : _t42 === "second" ? 36 : _t42 === "minute" ? 37 : _t42 === "hour" ? 38 : _t42 === "day" ? 39 : _t42 === "month" ? 40 : _t42 === "year" ? 41 : 42;
+              _t43 = unit.replace(/s$/, "");
+              _context3.n = _t43 === "millisecond" ? 42 : _t43 === "second" ? 43 : _t43 === "minute" ? 44 : _t43 === "hour" ? 45 : _t43 === "day" ? 46 : _t43 === "month" ? 47 : _t43 === "year" ? 48 : 49;
               break;
-            case 35:
+            case 42:
               _int = num;
-              return _context3.a(3, 42);
-            case 36:
+              return _context3.a(3, 49);
+            case 43:
               _int = num * 1000;
-              return _context3.a(3, 42);
-            case 37:
+              return _context3.a(3, 49);
+            case 44:
               _int = num * 1000 * 60;
-              return _context3.a(3, 42);
-            case 38:
+              return _context3.a(3, 49);
+            case 45:
               _int = num * 1000 * 60 * 60;
-              return _context3.a(3, 42);
-            case 39:
+              return _context3.a(3, 49);
+            case 46:
               _int = num * 1000 * 60 * 60 * 24;
-              return _context3.a(3, 42);
-            case 40:
+              return _context3.a(3, 49);
+            case 47:
               _int = num * 1000 * 60 * 60 * 24 * 30;
-              return _context3.a(3, 42);
-            case 41:
+              return _context3.a(3, 49);
+            case 48:
               _int = num * 1000 * 60 * 60 * 24 * 365;
-              return _context3.a(3, 42);
-            case 42:
+              return _context3.a(3, 49);
+            case 49:
               cronTags = [];
               for (_k in _tags) {
                 if (/^Cron-Tag-/.test(_k)) {
@@ -661,14 +737,14 @@ var _default = exports["default"] = function _default() {
               }
               p.cronTags = cronTags;
               p.span = _int;
-            case 43:
-              _context3.n = 44;
+            case 50:
+              _context3.n = 51;
               return mem.set(p, "env", id);
-            case 44:
+            case 51:
               delete ongoing[id];
               return _context3.a(2, id);
           }
-        }, _callee3, null, [[13, 16]]);
+        }, _callee3, null, [[20, 23], [13, 16]]);
       }));
       return function spawn() {
         return _ref8.apply(this, arguments);
@@ -686,7 +762,7 @@ var _default = exports["default"] = function _default() {
     var _assign = /*#__PURE__*/function () {
       var _ref9 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(opt) {
         var _opt$tags2;
-        var p, _opt, hash, _yield$ar$dataitem2, id, owner, item, _opt$data2, _ref0, _opt$from, _opt$message_item, _res$Messages, _res$Spawns, _res$Assignments, data, _tags, from, t, _owner, msg, _env, _yield$mem$getTx3, _yield$mem$getWasm2, format, mod, wasm, wdrive, start, res, _msg, _iterator3, _step3, _loop, _iterator4, _step4, v, __tags, _iterator5, _step5, _v, _iterator6, _step6, v2, _t65, _t66, _t67, _t68, _t69, _t70, _t71, _t72, _t73, _t74, _t75, _t76, _t77, _t78, _t79, _t80, _t81, _t82, _t83, _t84, _t85, _t86, _t87, _t88;
+        var p, _opt, hash, _yield$ar$dataitem2, id, owner, item, _opt$data3, _opt$from, _cuResult$Messages, _cuResult$Spawns, evalData, evalTags, evalFrom, decoded, t, cuResult, _msg, _iterator3, _step3, v, envExists, fwdTags, _iterator4, _step4, _v, __tags, _opt$data4, _ref0, _opt$from2, _opt$message_item, _res$Messages, _res$Spawns, _res$Assignments, data, _tags, from, _t44, _owner, msg, _env, _yield$mem$getTx3, _yield$mem$getWasm2, format, mod, wasm, wdrive, start, res, _msg3, _iterator5, _step5, _loop, _iterator6, _step6, _v2, _tags6, _iterator7, _step7, _v3, _iterator8, _step8, v2, _t68, _t69, _t70, _t71, _t72, _t73, _t74, _t75, _t76, _t77, _t78, _t79, _t80, _t81, _t82, _t83, _t84, _t85, _t86, _t87, _t88, _t89, _t90, _t91, _t92, _t93, _t94;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.p = _context6.n) {
             case 0:
@@ -711,30 +787,30 @@ var _default = exports["default"] = function _default() {
                 console.log(e);
               }
               p.hash = hash;
-              _t65 = _utils.buildTags;
-              _t66 = _ramda.mergeLeft;
-              _t67 = (0, _utils.tags)((_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : []);
-              _t68 = Date.now();
-              _t69 = p.epochs.length;
-              _t70 = variant !== null && variant !== void 0 ? variant : "ao.TN.1";
+              _t68 = _utils.buildTags;
+              _t69 = _ramda.mergeLeft;
+              _t70 = (0, _utils.tags)((_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : []);
+              _t71 = Date.now();
+              _t72 = p.epochs.length;
+              _t73 = variant !== null && variant !== void 0 ? variant : "ao.TN.1";
               _context6.n = 4;
               return mem.get("height");
             case 4:
-              _t71 = _context6.v;
-              _t72 = opt.process;
-              _t73 = opt.message;
-              _t74 = hash;
-              opt.tags = _t65(null, _t66(_t67, {
-                Timestamp: _t68,
-                Epoch: _t69,
+              _t74 = _context6.v;
+              _t75 = opt.process;
+              _t76 = opt.message;
+              _t77 = hash;
+              opt.tags = _t68(null, _t69(_t70, {
+                Timestamp: _t71,
+                Epoch: _t72,
                 Nonce: "0",
                 "Data-Protocol": "ao",
-                Variant: _t70,
+                Variant: _t73,
                 Type: "Assignment",
-                "Block-Height": _t71,
-                Process: _t72,
-                Message: _t73,
-                "Hash-Chain": _t74
+                "Block-Height": _t74,
+                Process: _t75,
+                Message: _t76,
+                "Hash-Chain": _t77
               }));
               p.epochs.push([opt.message]);
               _context6.n = 5;
@@ -762,128 +838,302 @@ var _default = exports["default"] = function _default() {
               _context6.n = 8;
               return ar.postItems(item, su.jwk);
             case 8:
-              _context6.p = 8;
-              data = (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
+              if (!p._cu_url) {
+                _context6.n = 33;
+                break;
+              }
+              _context6.p = 9;
+              evalData = (_opt$data3 = _opt === null || _opt === void 0 ? void 0 : _opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "";
+              evalTags = _opt === null || _opt === void 0 ? void 0 : _opt.tags;
+              evalFrom = (_opt$from = _opt === null || _opt === void 0 ? void 0 : _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from;
+              if (!(_opt !== null && _opt !== void 0 && _opt.item)) {
+                _context6.n = 11;
+                break;
+              }
+              decoded = _base64url["default"].decode(_opt.item.data);
+              evalData = typeof decoded === "string" ? decoded : Buffer.from(decoded).toString("utf-8");
+              evalTags = _opt.item.tags;
+              t = (0, _utils.tags)(evalTags);
+              if (t["From-Process"]) evalFrom = t["From-Process"];
+              if (evalFrom) {
+                _context6.n = 11;
+                break;
+              }
+              _context6.n = 10;
+              return arweave.wallets.jwkToAddress({
+                kty: "RSA",
+                n: _opt.item.owner,
+                e: "AQAB"
+              });
+            case 10:
+              evalFrom = _context6.v;
+            case 11:
+              // Cranked messages use MU addr as From for AOS trust
+              if (_opt !== null && _opt !== void 0 && _opt["for"]) evalFrom = mu.addr;
+              _context6.n = 12;
+              return fetch("".concat(p._cu_url, "/cu/evaluate"), {
+                method: "POST",
+                headers: {
+                  "Content-Type": "application/json"
+                },
+                body: JSON.stringify({
+                  message: opt.message,
+                  process: opt.process,
+                  data: evalData,
+                  tags: evalTags,
+                  from: evalFrom
+                })
+              }).then(function (r) {
+                return r.json();
+              });
+            case 12:
+              cuResult = _context6.v;
+              p.results.push(opt.message);
+              _context6.n = 13;
+              return mem.set(p, "env", opt.process);
+            case 13:
+              _msg = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
+                res: cuResult,
+                msg: null
+              });
+              _context6.n = 14;
+              return mem.set(_msg, "msgs", opt.message);
+            case 14:
+              // Route outbox from CU response
+              _iterator3 = _createForOfIteratorHelper((_cuResult$Messages = cuResult === null || cuResult === void 0 ? void 0 : cuResult.Messages) !== null && _cuResult$Messages !== void 0 ? _cuResult$Messages : []);
+              _context6.p = 15;
+              _iterator3.s();
+            case 16:
+              if ((_step3 = _iterator3.n()).done) {
+                _context6.n = 21;
+                break;
+              }
+              v = _step3.value;
+              _context6.n = 17;
+              return mem.get("env", v.Target);
+            case 17:
+              envExists = _context6.v;
+              if (!envExists) {
+                _context6.n = 19;
+                break;
+              }
+              _context6.n = 18;
+              return message({
+                "for": opt.message,
+                process: v.Target,
+                tags: v.Tags,
+                data: v.Data,
+                signer: mu.signer,
+                from: opt.process,
+                target: v.Target
+              });
+            case 18:
+              _context6.n = 20;
+              break;
+            case 19:
+              if (!mem._remote) {
+                _context6.n = 20;
+                break;
+              }
+              // Forward to main AR's MU for routing
+              fwdTags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)(v.Tags), {
+                "Data-Protocol": "ao",
+                Variant: variant !== null && variant !== void 0 ? variant : "ao.TN.1",
+                Type: "Message",
+                "From-Process": opt.process,
+                "Pushed-For": opt.message
+              }));
+              _context6.n = 20;
+              return record({
+                "for": opt.message,
+                tags: fwdTags,
+                data: v.Data,
+                signer: mu.signer,
+                from: opt.process,
+                target: v.Target
+              });
+            case 20:
+              _context6.n = 16;
+              break;
+            case 21:
+              _context6.n = 23;
+              break;
+            case 22:
+              _context6.p = 22;
+              _t78 = _context6.v;
+              _iterator3.e(_t78);
+            case 23:
+              _context6.p = 23;
+              _iterator3.f();
+              return _context6.f(23);
+            case 24:
+              _iterator4 = _createForOfIteratorHelper((_cuResult$Spawns = cuResult === null || cuResult === void 0 ? void 0 : cuResult.Spawns) !== null && _cuResult$Spawns !== void 0 ? _cuResult$Spawns : []);
+              _context6.p = 25;
+              _iterator4.s();
+            case 26:
+              if ((_step4 = _iterator4.n()).done) {
+                _context6.n = 28;
+                break;
+              }
+              _v = _step4.value;
+              __tags = (0, _utils.tags)(_v.Tags);
+              _context6.n = 27;
+              return spawn({
+                "for": opt.message,
+                module: __tags.Module,
+                scheduler: scheduler,
+                tags: _v.Tags,
+                data: _v.Data,
+                from: __tags["From-Process"],
+                signer: mu.signer
+              });
+            case 27:
+              _context6.n = 26;
+              break;
+            case 28:
+              _context6.n = 30;
+              break;
+            case 29:
+              _context6.p = 29;
+              _t79 = _context6.v;
+              _iterator4.e(_t79);
+            case 30:
+              _context6.p = 30;
+              _iterator4.f();
+              return _context6.f(30);
+            case 31:
+              return _context6.a(2, id);
+            case 32:
+              _context6.p = 32;
+              _t80 = _context6.v;
+              console.log("Remote CU assign error:", _t80);
+              return _context6.a(2, null);
+            case 33:
+              _context6.p = 33;
+              data = (_opt$data4 = _opt.data) !== null && _opt$data4 !== void 0 ? _opt$data4 : "";
               _tags = _opt.tags;
-              from = (_ref0 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref0 !== void 0 ? _ref0 : owner;
+              from = (_ref0 = (_opt$from2 = _opt.from) !== null && _opt$from2 !== void 0 ? _opt$from2 : opt.from) !== null && _ref0 !== void 0 ? _ref0 : owner;
               if (!_opt.item) {
-                _context6.n = 10;
+                _context6.n = 35;
                 break;
               }
               data = _base64url["default"].decode(_opt.item.data);
               _tags = _opt.item.tags;
-              t = (0, _utils.tags)(_tags);
-              if (t["From-Process"]) from = t["From-Process"];
+              _t44 = (0, _utils.tags)(_tags);
+              if (_t44["From-Process"]) from = _t44["From-Process"];
               if (from) {
-                _context6.n = 10;
+                _context6.n = 35;
                 break;
               }
-              _context6.n = 9;
+              _context6.n = 34;
               return arweave.wallets.jwkToAddress({
                 kty: "RSA",
                 n: _opt.item.owner,
                 e: "AQAB"
               });
-            case 9:
+            case 34:
               from = _context6.v;
-            case 10:
+            case 35:
+              // Cranked messages (inter-process) use MU addr as From for AOS trust
+              // From-Process tag still tracks the originating process
+              if (_opt["for"]) from = mu.addr;
               // check: is owner=mu.addr right?
               _owner = (_opt$message_item = opt.message_item) !== null && _opt$message_item !== void 0 && _opt$message_item.owner ? (0, _utils.toAddr)(opt.message_item.owner) : mu.addr;
-              _context6.n = 11;
+              _context6.n = 36;
               return genMsg(opt.message, p, data, _tags, from, _owner);
-            case 11:
+            case 36:
               msg = _context6.v;
-              _context6.n = 12;
+              _context6.n = 37;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 12:
+            case 37:
               _env = _context6.v;
               if (p.handle) {
-                _context6.n = 20;
+                _context6.n = 45;
                 break;
               }
-              _context6.n = 13;
+              _context6.n = 38;
               return mem.getWasm(p.module);
-            case 13:
+            case 38:
               _yield$mem$getWasm2 = _context6.v;
               format = _yield$mem$getWasm2.format;
               mod = _yield$mem$getWasm2.mod;
               wasm = _yield$mem$getWasm2.wasm;
               wdrive = extensions[p.extension];
-              _t75 = AoLoader;
-              _t76 = wasm;
-              _t77 = format;
-              _t78 = wdrive;
-              _context6.n = 14;
+              _t81 = AoLoader;
+              _t82 = wasm;
+              _t83 = format;
+              _t84 = wdrive;
+              _context6.n = 39;
               return mem.getTx(p.id);
-            case 14:
-              _t80 = _yield$mem$getTx3 = _context6.v;
-              _t79 = _t80 === null;
-              if (_t79) {
-                _context6.n = 15;
+            case 39:
+              _t86 = _yield$mem$getTx3 = _context6.v;
+              _t85 = _t86 === null;
+              if (_t85) {
+                _context6.n = 40;
                 break;
               }
-              _t79 = _yield$mem$getTx3 === void 0;
-            case 15:
-              if (!_t79) {
-                _context6.n = 16;
+              _t85 = _yield$mem$getTx3 === void 0;
+            case 40:
+              if (!_t85) {
+                _context6.n = 41;
                 break;
               }
-              _t81 = void 0;
-              _context6.n = 17;
+              _t87 = void 0;
+              _context6.n = 42;
               break;
-            case 16:
-              _t81 = _yield$mem$getTx3.item;
-            case 17:
-              _t82 = _t81;
-              _context6.n = 18;
+            case 41:
+              _t87 = _yield$mem$getTx3.item;
+            case 42:
+              _t88 = _t87;
+              _context6.n = 43;
               return mem.getTx(mod);
-            case 18:
-              _t83 = _context6.v;
-              _context6.n = 19;
-              return _t75(_t76, {
-                format: _t77,
-                WeaveDrive: _t78,
-                spawn: _t82,
-                module: _t83
+            case 43:
+              _t89 = _context6.v;
+              _context6.n = 44;
+              return _t81(_t82, {
+                format: _t83,
+                WeaveDrive: _t84,
+                spawn: _t88,
+                module: _t89
               });
-            case 19:
+            case 44:
               p.handle = _context6.v;
-              mem.env[opt.process].handle = p.handle;
-            case 20:
+              if (mem.env[opt.process]) mem.env[opt.process].handle = p.handle;
+            case 45:
               if (p.compressed) {
                 start = Date.now();
                 p.memory = mem.decompress(p.memory, p.original_size);
                 p.compressed = false;
               }
-              _context6.n = 21;
+              _context6.n = 46;
               return p.handle(p.memory, msg, _env);
-            case 21:
+            case 46:
               res = _context6.v;
               p.memory = res.Memory;
               delete res.Memory;
               p.results.push(opt.message);
-              _context6.n = 22;
+              _context6.n = 47;
               return mem.set(p, "env", opt.process);
-            case 22:
-              _msg = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
+            case 47:
+              _msg3 = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res,
                 msg: msg
               });
-              _context6.n = 23;
-              return mem.set(_msg, "msgs", opt.message);
-            case 23:
-              _iterator3 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-              _context6.p = 24;
+              _context6.n = 48;
+              return mem.set(_msg3, "msgs", opt.message);
+            case 48:
+              _iterator5 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
+              _context6.p = 49;
               _loop = /*#__PURE__*/_regenerator().m(function _loop() {
-                var v, _t43, _result, slot, fetchHB, info, _connect, request, _tags2, _yield$request, _res2, _data, sch, tar, ao, _yield$mem$getTx$tags3, _yield$mem$getTx4, _tags3$Action, _v$Data, _tags3, pr, module, act, _yield$ao$msg, mid, _yield$fetch$then$Pro, _yield$fetch$then, _sch, _tar, procs, _ao, _yield$mem$getTx$tags4, _yield$mem$getTx5, _tags4$Action, _v$Data2, _tags4, _pr, _module2, _yield$_ao$msg, _mid, _t44, _t45, _t46, _t47, _t48, _t49, _t50, _t51, _t52, _t53, _t54, _t55, _t56, _t57, _t58, _t59, _t60, _t61, _t62, _t63, _t64;
+                var v, _t45, _result, slot, fetchHB, info, _connect, request, _tags3, _yield$request, _res2, _data, sch, tar, ao, _yield$mem$getTx$tags3, _yield$mem$getTx4, _tags4$Action, _v$Data, _tags4, pr, module, act, _yield$ao$msg, mid, _yield$fetch$then$Pro, _yield$fetch$then, _sch, _tar, procs, _ao, _yield$mem$getTx$tags4, _yield$mem$getTx5, _tags5$Action, _v$Data2, _tags5, _pr, _module2, _yield$_ao$msg, _mid, _v$Data3, di, _t46, _t47, _t48, _t49, _t50, _t51, _t52, _t53, _t54, _t55, _t56, _t57, _t58, _t59, _t60, _t61, _t62, _t63, _t64, _t65, _t66, _t67;
                 return _regenerator().w(function (_context5) {
                   while (1) switch (_context5.p = _context5.n) {
                     case 0:
-                      v = _step3.value;
+                      v = _step5.value;
                       _context5.n = 1;
                       return mem.get("env", v.Target);
                     case 1:
@@ -902,11 +1152,11 @@ var _default = exports["default"] = function _default() {
                         target: v.Target
                       });
                     case 2:
-                      _context5.n = 44;
+                      _context5.n = 50;
                       break;
                     case 3:
-                      _t43 = (0, _utils.tags)(v.Tags); // this behaviour is different from AOS (temporary hack for remote tests)
-                      if (!_t43.__HyperBEAM__) {
+                      _t45 = (0, _utils.tags)(v.Tags); // this behaviour is different from AOS (temporary hack for remote tests)
+                      if (!_t45.__HyperBEAM__) {
                         _context5.n = 10;
                         break;
                       }
@@ -926,7 +1176,7 @@ var _default = exports["default"] = function _default() {
                               case 0:
                                 _ref10 = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : {}, _ref10$json = _ref10.json, json = _ref10$json === void 0 ? true : _ref10$json, _ref10$params = _ref10.params, params = _ref10$params === void 0 ? "" : _ref10$params;
                                 _context4.n = 1;
-                                return fetch("".concat(_t43.__HyperBEAM__).concat(path).concat(json ? "/serialize~json@1.0" : "").concat(params ? "?" + params : "")).then(function (r) {
+                                return fetch("".concat(_t45.__HyperBEAM__).concat(path).concat(json ? "/serialize~json@1.0" : "").concat(params ? "?" + params : "")).then(function (r) {
                                   return r[json ? "json" : "text"]();
                                 });
                               case 1:
@@ -944,11 +1194,11 @@ var _default = exports["default"] = function _default() {
                       info = _context5.v;
                       _connect = (0, _aoconnect.connect)({
                         MODE: "mainnet",
-                        URL: _t43.__HyperBEAM__,
+                        URL: _t45.__HyperBEAM__,
                         device: "",
                         signer: (0, _aoconnect.createSigner)(mu.jwk)
                       }), request = _connect.request;
-                      _tags2 = _objectSpread(_objectSpread({}, _t43), {}, {
+                      _tags3 = _objectSpread(_objectSpread({}, _t45), {}, {
                         "From-Process": opt.process,
                         "Pushed-For": id,
                         method: "POST",
@@ -956,7 +1206,7 @@ var _default = exports["default"] = function _default() {
                         scheduler: info.address
                       });
                       _context5.n = 6;
-                      return request(_tags2);
+                      return request(_tags3);
                     case 6:
                       _yield$request = _context5.v;
                       slot = _yield$request.slot;
@@ -972,8 +1222,8 @@ var _default = exports["default"] = function _default() {
                       break;
                     case 8:
                       _context5.p = 8;
-                      _t44 = _context5.v;
-                      console.log(_t44);
+                      _t46 = _context5.v;
+                      console.log(_t46);
                     case 9:
                       if (_result) {
                         /*
@@ -989,14 +1239,14 @@ var _default = exports["default"] = function _default() {
                           target: opt.process,
                         })*/
                       }
-                      _context5.n = 44;
+                      _context5.n = 50;
                       break;
                     case 10:
-                      if (!_t43.__SU__) {
+                      if (!_t45.__SU__) {
                         _context5.n = 23;
                         break;
                       }
-                      sch = _t43.__SU__;
+                      sch = _t45.__SU__;
                       tar = v.Target;
                       /*const procs =
                         (await fetch(sch).then(r => r.json()))?.Processes ?? []*/
@@ -1007,59 +1257,59 @@ var _default = exports["default"] = function _default() {
                     case 11:
                       ao = _context5.v;
                       _context5.p = 12;
-                      _tags3 = _objectSpread(_objectSpread({}, _t43), {}, {
+                      _tags4 = _objectSpread(_objectSpread({}, _t45), {}, {
                         "From-Process": opt.process,
                         "Pushed-For": id
                       });
                       _context5.n = 13;
                       return mem.getTx(opt.process);
                     case 13:
-                      _t47 = _yield$mem$getTx4 = _context5.v;
-                      _t46 = _t47 === null;
-                      if (_t46) {
+                      _t49 = _yield$mem$getTx4 = _context5.v;
+                      _t48 = _t49 === null;
+                      if (_t48) {
                         _context5.n = 14;
                         break;
                       }
-                      _t46 = _yield$mem$getTx4 === void 0;
+                      _t48 = _yield$mem$getTx4 === void 0;
                     case 14:
-                      if (!_t46) {
+                      if (!_t48) {
                         _context5.n = 15;
                         break;
                       }
-                      _t48 = void 0;
+                      _t50 = void 0;
                       _context5.n = 16;
                       break;
                     case 15:
-                      _t48 = _yield$mem$getTx4.tags;
+                      _t50 = _yield$mem$getTx4.tags;
                     case 16:
-                      _t49 = _yield$mem$getTx$tags3 = _t48;
-                      _t45 = _t49 !== null;
-                      if (!_t45) {
+                      _t51 = _yield$mem$getTx$tags3 = _t50;
+                      _t47 = _t51 !== null;
+                      if (!_t47) {
                         _context5.n = 17;
                         break;
                       }
-                      _t45 = _yield$mem$getTx$tags3 !== void 0;
+                      _t47 = _yield$mem$getTx$tags3 !== void 0;
                     case 17:
-                      if (!_t45) {
+                      if (!_t47) {
                         _context5.n = 18;
                         break;
                       }
-                      _t50 = _yield$mem$getTx$tags3;
+                      _t52 = _yield$mem$getTx$tags3;
                       _context5.n = 19;
                       break;
                     case 18:
-                      _t50 = [];
+                      _t52 = [];
                     case 19:
-                      pr = _t50;
+                      pr = _t52;
                       module = (0, _utils.tags)(pr).Module;
-                      if (module) _tags3["From-Module"] = module;
-                      act = (_tags3$Action = _tags3["Action"]) !== null && _tags3$Action !== void 0 ? _tags3$Action : null;
-                      delete _tags3["Action"];
+                      if (module) _tags4["From-Module"] = module;
+                      act = (_tags4$Action = _tags4["Action"]) !== null && _tags4$Action !== void 0 ? _tags4$Action : null;
+                      delete _tags4["Action"];
                       _context5.n = 20;
                       return ao.msg({
                         act: act,
                         pid: tar,
-                        tags: _tags3,
+                        tags: _tags4,
                         data: (_v$Data = v.Data) !== null && _v$Data !== void 0 ? _v$Data : ""
                       });
                     case 20:
@@ -1069,60 +1319,60 @@ var _default = exports["default"] = function _default() {
                       break;
                     case 21:
                       _context5.p = 21;
-                      _t51 = _context5.v;
-                      console.log(_t51);
+                      _t53 = _context5.v;
+                      console.log(_t53);
                     case 22:
-                      _context5.n = 44;
+                      _context5.n = 50;
                       break;
                     case 23:
-                      if (!_t43.__Scheduler__) {
+                      if (!_t45.__Scheduler__) {
                         _context5.n = 43;
                         break;
                       }
-                      _sch = _t43.__Scheduler__;
+                      _sch = _t45.__Scheduler__;
                       _tar = v.Target;
                       _context5.n = 24;
                       return fetch(_sch).then(function (r) {
                         return r.json();
                       });
                     case 24:
-                      _t54 = _yield$fetch$then = _context5.v;
-                      _t53 = _t54 === null;
-                      if (_t53) {
+                      _t56 = _yield$fetch$then = _context5.v;
+                      _t55 = _t56 === null;
+                      if (_t55) {
                         _context5.n = 25;
                         break;
                       }
-                      _t53 = _yield$fetch$then === void 0;
+                      _t55 = _yield$fetch$then === void 0;
                     case 25:
-                      if (!_t53) {
+                      if (!_t55) {
                         _context5.n = 26;
                         break;
                       }
-                      _t55 = void 0;
+                      _t57 = void 0;
                       _context5.n = 27;
                       break;
                     case 26:
-                      _t55 = _yield$fetch$then.Processes;
+                      _t57 = _yield$fetch$then.Processes;
                     case 27:
-                      _t56 = _yield$fetch$then$Pro = _t55;
-                      _t52 = _t56 !== null;
-                      if (!_t52) {
+                      _t58 = _yield$fetch$then$Pro = _t57;
+                      _t54 = _t58 !== null;
+                      if (!_t54) {
                         _context5.n = 28;
                         break;
                       }
-                      _t52 = _yield$fetch$then$Pro !== void 0;
+                      _t54 = _yield$fetch$then$Pro !== void 0;
                     case 28:
-                      if (!_t52) {
+                      if (!_t54) {
                         _context5.n = 29;
                         break;
                       }
-                      _t57 = _yield$fetch$then$Pro;
+                      _t59 = _yield$fetch$then$Pro;
                       _context5.n = 30;
                       break;
                     case 29:
-                      _t57 = [];
+                      _t59 = [];
                     case 30:
-                      procs = _t57;
+                      procs = _t59;
                       _context5.n = 31;
                       return new _ao2["default"]({
                         port: _sch.split(":").pop() - 3
@@ -1130,57 +1380,57 @@ var _default = exports["default"] = function _default() {
                     case 31:
                       _ao = _context5.v;
                       _context5.p = 32;
-                      _tags4 = _objectSpread(_objectSpread({}, _t43), {}, {
+                      _tags5 = _objectSpread(_objectSpread({}, _t45), {}, {
                         "From-Process": opt.process,
                         "Pushed-For": id
                       });
                       _context5.n = 33;
                       return mem.getTx(opt.process);
                     case 33:
-                      _t60 = _yield$mem$getTx5 = _context5.v;
-                      _t59 = _t60 === null;
-                      if (_t59) {
+                      _t62 = _yield$mem$getTx5 = _context5.v;
+                      _t61 = _t62 === null;
+                      if (_t61) {
                         _context5.n = 34;
                         break;
                       }
-                      _t59 = _yield$mem$getTx5 === void 0;
+                      _t61 = _yield$mem$getTx5 === void 0;
                     case 34:
-                      if (!_t59) {
+                      if (!_t61) {
                         _context5.n = 35;
                         break;
                       }
-                      _t61 = void 0;
+                      _t63 = void 0;
                       _context5.n = 36;
                       break;
                     case 35:
-                      _t61 = _yield$mem$getTx5.tags;
+                      _t63 = _yield$mem$getTx5.tags;
                     case 36:
-                      _t62 = _yield$mem$getTx$tags4 = _t61;
-                      _t58 = _t62 !== null;
-                      if (!_t58) {
+                      _t64 = _yield$mem$getTx$tags4 = _t63;
+                      _t60 = _t64 !== null;
+                      if (!_t60) {
                         _context5.n = 37;
                         break;
                       }
-                      _t58 = _yield$mem$getTx$tags4 !== void 0;
+                      _t60 = _yield$mem$getTx$tags4 !== void 0;
                     case 37:
-                      if (!_t58) {
+                      if (!_t60) {
                         _context5.n = 38;
                         break;
                       }
-                      _t63 = _yield$mem$getTx$tags4;
+                      _t65 = _yield$mem$getTx$tags4;
                       _context5.n = 39;
                       break;
                     case 38:
-                      _t63 = [];
+                      _t65 = [];
                     case 39:
-                      _pr = _t63;
+                      _pr = _t65;
                       _module2 = (0, _utils.tags)(_pr).Module;
-                      if (_module2) _tags4["From-Module"] = _module2;
+                      if (_module2) _tags5["From-Module"] = _module2;
                       _context5.n = 40;
                       return _ao.msg({
-                        act: (_tags4$Action = _tags4["Action"]) !== null && _tags4$Action !== void 0 ? _tags4$Action : null,
+                        act: (_tags5$Action = _tags5["Action"]) !== null && _tags5$Action !== void 0 ? _tags5$Action : null,
                         pid: _tar,
-                        tags: _tags4,
+                        tags: _tags5,
                         data: (_v$Data2 = v.Data) !== null && _v$Data2 !== void 0 ? _v$Data2 : ""
                       });
                     case 40:
@@ -1190,13 +1440,46 @@ var _default = exports["default"] = function _default() {
                       break;
                     case 41:
                       _context5.p = 41;
-                      _t64 = _context5.v;
-                      console.log(_t64);
+                      _t66 = _context5.v;
+                      console.log(_t66);
                     case 42:
-                      _context5.n = 44;
+                      _context5.n = 50;
                       break;
                     case 43:
-                      _context5.n = 44;
+                      if (!mem._remote) {
+                        _context5.n = 49;
+                        break;
+                      }
+                      _context5.p = 44;
+                      _context5.n = 45;
+                      return ar.dataitem({
+                        data: (_v$Data3 = v.Data) !== null && _v$Data3 !== void 0 ? _v$Data3 : "",
+                        signer: mu.signer,
+                        tags: (0, _ramda.mergeLeft)((0, _utils.tags)(v.Tags), {
+                          "Data-Protocol": "ao",
+                          Variant: variant !== null && variant !== void 0 ? variant : "ao.TN.1",
+                          Type: "Message",
+                          "From-Process": opt.process,
+                          "Pushed-For": opt.message
+                        }),
+                        target: v.Target
+                      });
+                    case 45:
+                      di = _context5.v;
+                      _context5.n = 46;
+                      return mem._remote.postMU(di.item.getRaw());
+                    case 46:
+                      _context5.n = 48;
+                      break;
+                    case 47:
+                      _context5.p = 47;
+                      _t67 = _context5.v;
+                      console.log("Remote MU forward error:", _t67);
+                    case 48:
+                      _context5.n = 50;
+                      break;
+                    case 49:
+                      _context5.n = 50;
                       return record({
                         "for": opt.message,
                         tags: v.Tags,
@@ -1205,130 +1488,130 @@ var _default = exports["default"] = function _default() {
                         from: opt.process,
                         target: v.Target
                       });
-                    case 44:
+                    case 50:
                       return _context5.a(2);
                   }
-                }, _loop, null, [[32, 41], [12, 21], [4, 8]]);
+                }, _loop, null, [[44, 47], [32, 41], [12, 21], [4, 8]]);
               });
-              _iterator3.s();
-            case 25:
-              if ((_step3 = _iterator3.n()).done) {
-                _context6.n = 27;
+              _iterator5.s();
+            case 50:
+              if ((_step5 = _iterator5.n()).done) {
+                _context6.n = 52;
                 break;
               }
-              return _context6.d(_regeneratorValues(_loop()), 26);
-            case 26:
-              _context6.n = 25;
+              return _context6.d(_regeneratorValues(_loop()), 51);
+            case 51:
+              _context6.n = 50;
               break;
-            case 27:
-              _context6.n = 29;
+            case 52:
+              _context6.n = 54;
               break;
-            case 28:
-              _context6.p = 28;
-              _t84 = _context6.v;
-              _iterator3.e(_t84);
-            case 29:
-              _context6.p = 29;
-              _iterator3.f();
-              return _context6.f(29);
-            case 30:
-              _iterator4 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-              _context6.p = 31;
-              _iterator4.s();
-            case 32:
-              if ((_step4 = _iterator4.n()).done) {
-                _context6.n = 34;
+            case 53:
+              _context6.p = 53;
+              _t90 = _context6.v;
+              _iterator5.e(_t90);
+            case 54:
+              _context6.p = 54;
+              _iterator5.f();
+              return _context6.f(54);
+            case 55:
+              _iterator6 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
+              _context6.p = 56;
+              _iterator6.s();
+            case 57:
+              if ((_step6 = _iterator6.n()).done) {
+                _context6.n = 59;
                 break;
               }
-              v = _step4.value;
-              __tags = (0, _utils.tags)(v.Tags);
-              _context6.n = 33;
+              _v2 = _step6.value;
+              _tags6 = (0, _utils.tags)(_v2.Tags);
+              _context6.n = 58;
               return spawn({
                 "for": opt.message,
-                module: __tags.Module,
+                module: _tags6.Module,
                 scheduler: scheduler,
-                tags: v.Tags,
-                data: v.Data,
-                from: __tags["From-Process"],
+                tags: _v2.Tags,
+                data: _v2.Data,
+                from: _tags6["From-Process"],
                 signer: mu.signer
               });
-            case 33:
-              _context6.n = 32;
+            case 58:
+              _context6.n = 57;
               break;
-            case 34:
-              _context6.n = 36;
+            case 59:
+              _context6.n = 61;
               break;
-            case 35:
-              _context6.p = 35;
-              _t85 = _context6.v;
-              _iterator4.e(_t85);
-            case 36:
-              _context6.p = 36;
-              _iterator4.f();
-              return _context6.f(36);
-            case 37:
-              _iterator5 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-              _context6.p = 38;
-              _iterator5.s();
-            case 39:
-              if ((_step5 = _iterator5.n()).done) {
-                _context6.n = 47;
+            case 60:
+              _context6.p = 60;
+              _t91 = _context6.v;
+              _iterator6.e(_t91);
+            case 61:
+              _context6.p = 61;
+              _iterator6.f();
+              return _context6.f(61);
+            case 62:
+              _iterator7 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
+              _context6.p = 63;
+              _iterator7.s();
+            case 64:
+              if ((_step7 = _iterator7.n()).done) {
+                _context6.n = 72;
                 break;
               }
-              _v = _step5.value;
-              _iterator6 = _createForOfIteratorHelper(_v.Processes);
-              _context6.p = 40;
-              _iterator6.s();
-            case 41:
-              if ((_step6 = _iterator6.n()).done) {
-                _context6.n = 43;
+              _v3 = _step7.value;
+              _iterator8 = _createForOfIteratorHelper(_v3.Processes);
+              _context6.p = 65;
+              _iterator8.s();
+            case 66:
+              if ((_step8 = _iterator8.n()).done) {
+                _context6.n = 68;
                 break;
               }
-              v2 = _step6.value;
-              _context6.n = 42;
+              v2 = _step8.value;
+              _context6.n = 67;
               return _assign({
-                message: _v.Message,
+                message: _v3.Message,
                 process: v2,
                 from: opt.process,
                 signer: mu.signer
               });
-            case 42:
-              _context6.n = 41;
+            case 67:
+              _context6.n = 66;
               break;
-            case 43:
-              _context6.n = 45;
+            case 68:
+              _context6.n = 70;
               break;
-            case 44:
-              _context6.p = 44;
-              _t86 = _context6.v;
-              _iterator6.e(_t86);
-            case 45:
-              _context6.p = 45;
-              _iterator6.f();
-              return _context6.f(45);
-            case 46:
-              _context6.n = 39;
+            case 69:
+              _context6.p = 69;
+              _t92 = _context6.v;
+              _iterator8.e(_t92);
+            case 70:
+              _context6.p = 70;
+              _iterator8.f();
+              return _context6.f(70);
+            case 71:
+              _context6.n = 64;
               break;
-            case 47:
-              _context6.n = 49;
+            case 72:
+              _context6.n = 74;
               break;
-            case 48:
-              _context6.p = 48;
-              _t87 = _context6.v;
-              _iterator5.e(_t87);
-            case 49:
-              _context6.p = 49;
-              _iterator5.f();
-              return _context6.f(49);
-            case 50:
+            case 73:
+              _context6.p = 73;
+              _t93 = _context6.v;
+              _iterator7.e(_t93);
+            case 74:
+              _context6.p = 74;
+              _iterator7.f();
+              return _context6.f(74);
+            case 75:
               return _context6.a(2, id);
-            case 51:
-              _context6.p = 51;
-              _t88 = _context6.v;
-              console.log(_t88);
+            case 76:
+              _context6.p = 76;
+              _t94 = _context6.v;
+              console.log(_t94);
               return _context6.a(2, null);
           }
-        }, _callee5, null, [[40, 44, 45, 46], [38, 48, 49, 50], [31, 35, 36, 37], [24, 28, 29, 30], [8, 51]]);
+        }, _callee5, null, [[65, 69, 70, 71], [63, 73, 74, 75], [56, 60, 61, 62], [49, 53, 54, 55], [33, 76], [25, 29, 30, 31], [15, 22, 23, 24], [9, 32]]);
       }));
       return function assign(_x8) {
         return _ref9.apply(this, arguments);
@@ -1336,7 +1619,7 @@ var _default = exports["default"] = function _default() {
     }();
     var message = /*#__PURE__*/function () {
       var _ref11 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(opt) {
-        var id, owner, item, _opt$id2, _key, i, _yield$ar$httpmsg2, _p, new_slot, last_slot, _opt$item$id, _opt$item, _opt$owner, p, _opt$tags3, _yield$mem$getTx$tags5, _yield$mem$getTx6, pr, module, _yield$ar$dataitem3, _msg, _opt, _ref12, _opt$from2, _opt$http_msg$data, from, data, _tags, msg, _env, _yield$mem$getTx7, _yield$mem$getWasm3, format, mod, wasm, wdrive, start, res, _msg2, key, _t89, _t90, _t91, _t92, _t93, _t94, _t95, _t96, _t97, _t98, _t99, _t100, _t101, _t102, _t103, _t104;
+        var id, owner, item, _opt$id2, _key, i, _yield$ar$httpmsg2, _p2, new_slot, last_slot, _opt$item$id, _opt$item, _opt$owner, p, _opt$tags3, _yield$mem$getTx$tags5, _yield$mem$getTx6, pr, module, _yield$ar$dataitem3, _msg, _opt, _ref12, _opt$from3, _opt$http_msg$data, from, data, _tags, msg, _env, _yield$mem$getTx7, _yield$mem$getWasm3, format, mod, wasm, wdrive, start, res, _msg4, key, _t95, _t96, _t97, _t98, _t99, _t100, _t101, _t102, _t103, _t104, _t105, _t106, _t107, _t108, _t109, _t110;
         return _regenerator().w(function (_context7) {
           while (1) switch (_context7.p = _context7.n) {
             case 0:
@@ -1378,9 +1661,9 @@ var _default = exports["default"] = function _default() {
               _context7.n = 6;
               return mem.get("env", opt.process);
             case 6:
-              _p = _context7.v;
+              _p2 = _context7.v;
               new_slot = opt.slot * 1;
-              last_slot = !_p ? -1 : _p.results.length - 1;
+              last_slot = !_p2 ? -1 : _p2.results.length - 1;
               if (!(last_slot + 1 < new_slot)) {
                 _context7.n = 8;
                 break;
@@ -1435,43 +1718,43 @@ var _default = exports["default"] = function _default() {
               _context7.n = 13;
               return mem.getTx(opt.from);
             case 13:
-              _t91 = _yield$mem$getTx6 = _context7.v;
-              _t90 = _t91 === null;
-              if (_t90) {
+              _t97 = _yield$mem$getTx6 = _context7.v;
+              _t96 = _t97 === null;
+              if (_t96) {
                 _context7.n = 14;
                 break;
               }
-              _t90 = _yield$mem$getTx6 === void 0;
+              _t96 = _yield$mem$getTx6 === void 0;
             case 14:
-              if (!_t90) {
+              if (!_t96) {
                 _context7.n = 15;
                 break;
               }
-              _t92 = void 0;
+              _t98 = void 0;
               _context7.n = 16;
               break;
             case 15:
-              _t92 = _yield$mem$getTx6.tags;
+              _t98 = _yield$mem$getTx6.tags;
             case 16:
-              _t93 = _yield$mem$getTx$tags5 = _t92;
-              _t89 = _t93 !== null;
-              if (!_t89) {
+              _t99 = _yield$mem$getTx$tags5 = _t98;
+              _t95 = _t99 !== null;
+              if (!_t95) {
                 _context7.n = 17;
                 break;
               }
-              _t89 = _yield$mem$getTx$tags5 !== void 0;
+              _t95 = _yield$mem$getTx$tags5 !== void 0;
             case 17:
-              if (!_t89) {
+              if (!_t95) {
                 _context7.n = 18;
                 break;
               }
-              _t94 = _yield$mem$getTx$tags5;
+              _t100 = _yield$mem$getTx$tags5;
               _context7.n = 19;
               break;
             case 18:
-              _t94 = [];
+              _t100 = [];
             case 19:
-              pr = _t94;
+              pr = _t100;
               module = (0, _utils.tags)(pr).Module;
               if (module) opt.tags.push({
                 name: "From-Module",
@@ -1504,7 +1787,7 @@ var _default = exports["default"] = function _default() {
               _opt = opt;
               _context7.p = 24;
               // todo: not sure if this is correct
-              from = (_ref12 = (_opt$from2 = _opt.from) !== null && _opt$from2 !== void 0 ? _opt$from2 : opt.from) !== null && _ref12 !== void 0 ? _ref12 : owner;
+              from = (_ref12 = (_opt$from3 = _opt.from) !== null && _opt$from3 !== void 0 ? _opt$from3 : opt.from) !== null && _ref12 !== void 0 ? _ref12 : owner;
               data = (_opt$http_msg$data = opt.http_msg.data) !== null && _opt$http_msg$data !== void 0 ? _opt$http_msg$data : "";
               _tags = _opt.http_msg.tags; // todo: check if owner=mu.addr right?
               _context7.n = 25;
@@ -1531,46 +1814,46 @@ var _default = exports["default"] = function _default() {
               mod = _yield$mem$getWasm3.mod;
               wasm = _yield$mem$getWasm3.wasm;
               wdrive = extensions[p.extension];
-              _t95 = AoLoader;
-              _t96 = wasm;
-              _t97 = format;
-              _t98 = wdrive;
+              _t101 = AoLoader;
+              _t102 = wasm;
+              _t103 = format;
+              _t104 = wdrive;
               _context7.n = 28;
               return mem.getTx(p.id);
             case 28:
-              _t100 = _yield$mem$getTx7 = _context7.v;
-              _t99 = _t100 === null;
-              if (_t99) {
+              _t106 = _yield$mem$getTx7 = _context7.v;
+              _t105 = _t106 === null;
+              if (_t105) {
                 _context7.n = 29;
                 break;
               }
-              _t99 = _yield$mem$getTx7 === void 0;
+              _t105 = _yield$mem$getTx7 === void 0;
             case 29:
-              if (!_t99) {
+              if (!_t105) {
                 _context7.n = 30;
                 break;
               }
-              _t101 = void 0;
+              _t107 = void 0;
               _context7.n = 31;
               break;
             case 30:
-              _t101 = _yield$mem$getTx7.item;
+              _t107 = _yield$mem$getTx7.item;
             case 31:
-              _t102 = _t101;
+              _t108 = _t107;
               _context7.n = 32;
               return mem.getTx(mod);
             case 32:
-              _t103 = _context7.v;
+              _t109 = _context7.v;
               _context7.n = 33;
-              return _t95(_t96, {
-                format: _t97,
-                WeaveDrive: _t98,
-                spawn: _t102,
-                module: _t103
+              return _t101(_t102, {
+                format: _t103,
+                WeaveDrive: _t104,
+                spawn: _t108,
+                module: _t109
               });
             case 33:
               p.handle = _context7.v;
-              mem.env[opt.process].handle = p.handle;
+              if (mem.env[opt.process]) mem.env[opt.process].handle = p.handle;
             case 34:
               if (p.compressed) {
                 start = Date.now();
@@ -1587,19 +1870,19 @@ var _default = exports["default"] = function _default() {
               _context7.n = 36;
               return mem.set(p, "env", opt.process);
             case 36:
-              _msg2 = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
+              _msg4 = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res,
                 msg: msg
               });
               _context7.n = 37;
-              return mem.set(_msg2, "msgs", id);
+              return mem.set(_msg4, "msgs", id);
             case 37:
               _context7.n = 39;
               break;
             case 38:
               _context7.p = 38;
-              _t104 = _context7.v;
-              console.log(_t104);
+              _t110 = _context7.v;
+              console.log(_t110);
             case 39:
               _context7.n = 41;
               break;
@@ -1626,7 +1909,7 @@ var _default = exports["default"] = function _default() {
     var record = /*#__PURE__*/function () {
       var _ref13 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(opt) {
         var _opt$item$id2, _opt$item2, _opt$owner2, _opt$tags4;
-        var id, owner, item, _yield$mem$getTx$tags6, _yield$mem$getTx8, pr, module, _yield$ar$dataitem4, _msg, _t105, _t106, _t107, _t108, _t109, _t110;
+        var id, owner, item, _yield$mem$getTx$tags6, _yield$mem$getTx8, pr, module, _yield$ar$dataitem4, _msg, _t111, _t112, _t113, _t114, _t115, _t116;
         return _regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
             case 0:
@@ -1653,43 +1936,43 @@ var _default = exports["default"] = function _default() {
               _context8.n = 1;
               return mem.getTx(opt.from);
             case 1:
-              _t107 = _yield$mem$getTx8 = _context8.v;
-              _t106 = _t107 === null;
-              if (_t106) {
+              _t113 = _yield$mem$getTx8 = _context8.v;
+              _t112 = _t113 === null;
+              if (_t112) {
                 _context8.n = 2;
                 break;
               }
-              _t106 = _yield$mem$getTx8 === void 0;
+              _t112 = _yield$mem$getTx8 === void 0;
             case 2:
-              if (!_t106) {
+              if (!_t112) {
                 _context8.n = 3;
                 break;
               }
-              _t108 = void 0;
+              _t114 = void 0;
               _context8.n = 4;
               break;
             case 3:
-              _t108 = _yield$mem$getTx8.tags;
+              _t114 = _yield$mem$getTx8.tags;
             case 4:
-              _t109 = _yield$mem$getTx$tags6 = _t108;
-              _t105 = _t109 !== null;
-              if (!_t105) {
+              _t115 = _yield$mem$getTx$tags6 = _t114;
+              _t111 = _t115 !== null;
+              if (!_t111) {
                 _context8.n = 5;
                 break;
               }
-              _t105 = _yield$mem$getTx$tags6 !== void 0;
+              _t111 = _yield$mem$getTx$tags6 !== void 0;
             case 5:
-              if (!_t105) {
+              if (!_t111) {
                 _context8.n = 6;
                 break;
               }
-              _t110 = _yield$mem$getTx$tags6;
+              _t116 = _yield$mem$getTx$tags6;
               _context8.n = 7;
               break;
             case 6:
-              _t110 = [];
+              _t116 = [];
             case 7:
-              pr = _t110;
+              pr = _t116;
               module = (0, _utils.tags)(pr).Module;
               if (module) opt.tags.push({
                 name: "From-Module",
@@ -1726,7 +2009,7 @@ var _default = exports["default"] = function _default() {
     }();
     var _recover = /*#__PURE__*/function () {
       var _ref14 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(pid, next) {
-        var count, success, _success, i, p, from, msgs, _iterator7, _step7, v, item, _k2, _tags, _t111, _t112, _t113;
+        var count, success, _success, i, p, from, msgs, _iterator9, _step9, v, item, _k2, _tags, _t117, _t118, _t119;
         return _regenerator().w(function (_context9) {
           while (1) switch (_context9.p = _context9.n) {
             case 0:
@@ -1785,7 +2068,7 @@ var _default = exports["default"] = function _default() {
               _context9.n = 9;
               return next();
             case 9:
-              _t111 = _context9.v;
+              _t117 = _context9.v;
               _context9.n = 12;
               break;
             case 10:
@@ -1795,18 +2078,18 @@ var _default = exports["default"] = function _default() {
                 from: from
               });
             case 11:
-              _t111 = _context9.v;
+              _t117 = _context9.v;
             case 12:
-              msgs = _t111;
-              _iterator7 = _createForOfIteratorHelper(msgs.edges);
+              msgs = _t117;
+              _iterator9 = _createForOfIteratorHelper(msgs.edges);
               _context9.p = 13;
-              _iterator7.s();
+              _iterator9.s();
             case 14:
-              if ((_step7 = _iterator7.n()).done) {
+              if ((_step9 = _iterator9.n()).done) {
                 _context9.n = 19;
                 break;
               }
-              v = _step7.value;
+              v = _step9.value;
               item = {};
               for (_k2 in v.node.message) {
                 item[_k2.toLowerCase()] = v.node.message[_k2];
@@ -1865,11 +2148,11 @@ var _default = exports["default"] = function _default() {
               break;
             case 20:
               _context9.p = 20;
-              _t112 = _context9.v;
-              _iterator7.e(_t112);
+              _t118 = _context9.v;
+              _iterator9.e(_t118);
             case 21:
               _context9.p = 21;
-              _iterator7.f();
+              _iterator9.f();
               return _context9.f(21);
             case 22:
               if (!msgs.next) {
@@ -1883,8 +2166,8 @@ var _default = exports["default"] = function _default() {
               break;
             case 24:
               _context9.p = 24;
-              _t113 = _context9.v;
-              console.log(_t113);
+              _t119 = _context9.v;
+              console.log(_t119);
             case 25:
               delete onRecovery[pid];
             case 26:
@@ -1902,84 +2185,264 @@ var _default = exports["default"] = function _default() {
         return _ref14.apply(this, arguments);
       };
     }();
-    var result = /*#__PURE__*/function () {
-      var _ref15 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(opt) {
-        var _yield$mem$get2;
-        var _t114, _t115, _t116;
+
+    // Satellite CU evaluate: WASM execution only, no DataItem creation or AR posting.
+    // Used by cu_post_evaluate on remote CU workers.
+    var evaluate = /*#__PURE__*/function () {
+      var _ref16 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(_ref15) {
+        var msgId, pid, data, msgTags, from, is_spawn, modId, sch, _ref17, _spawnTx$item, mod, _yield$mem$getWasm4, resolvedMod, wasm, format, _tags, ext, wdrive, spawnTx, moduleTx, handle, _owner2, _p3, bootData, _msg5, _env2, _res3, p, _ref18, _spawnTx$item2, _yield$mem$getWasm5, _format, _mod, _wasm, _wdrive, _spawnTx, _moduleTx, owner, msg, _env, res;
         return _regenerator().w(function (_context0) {
           while (1) switch (_context0.n) {
             case 0:
-              _context0.n = 1;
+              msgId = _ref15.message, pid = _ref15.process, data = _ref15.data, msgTags = _ref15.tags, from = _ref15.from, is_spawn = _ref15.is_spawn, modId = _ref15.module, sch = _ref15.scheduler;
+              if (!is_spawn) {
+                _context0.n = 11;
+                break;
+              }
+              mod = modId || (0, _utils.tags)(msgTags || []).Module;
+              if (mod) {
+                _context0.n = 1;
+                break;
+              }
+              throw Error("module missing for evaluate spawn");
+            case 1:
+              _context0.n = 2;
+              return mem.getWasm(mod);
+            case 2:
+              _yield$mem$getWasm4 = _context0.v;
+              resolvedMod = _yield$mem$getWasm4.mod;
+              wasm = _yield$mem$getWasm4.wasm;
+              format = _yield$mem$getWasm4.format;
+              _tags = (0, _utils.tags)(msgTags || []);
+              ext = _tags.Extension || "WeaveDrive";
+              wdrive = extensions[ext];
+              _context0.n = 3;
+              return mem.getTx(pid);
+            case 3:
+              spawnTx = _context0.v;
+              _context0.n = 4;
+              return mem.getTx(resolvedMod);
+            case 4:
+              moduleTx = _context0.v;
+              _context0.n = 5;
+              return AoLoader(wasm, {
+                format: format,
+                WeaveDrive: wdrive,
+                spawn: (_ref17 = (_spawnTx$item = spawnTx === null || spawnTx === void 0 ? void 0 : spawnTx.item) !== null && _spawnTx$item !== void 0 ? _spawnTx$item : spawnTx) !== null && _ref17 !== void 0 ? _ref17 : null,
+                module: moduleTx
+              });
+            case 5:
+              handle = _context0.v;
+              _owner2 = from || mu.addr;
+              _p3 = {
+                extension: ext,
+                format: format,
+                id: pid,
+                epochs: [],
+                handle: handle,
+                module: resolvedMod,
+                hash: pid,
+                memory: null,
+                owner: _owner2,
+                height: 0,
+                results: [pid]
+              };
+              bootData = "";
+              if (_tags["On-Boot"] === "Data") bootData = data !== null && data !== void 0 ? data : "";else bootData = data !== null && data !== void 0 ? data : "";
+              _context0.n = 6;
+              return genMsg(pid, _p3, bootData, msgTags || [], _owner2, _owner2, true);
+            case 6:
+              _msg5 = _context0.v;
+              _context0.n = 7;
+              return genEnv({
+                pid: pid,
+                owner: _owner2,
+                module: resolvedMod
+              });
+            case 7:
+              _env2 = _context0.v;
+              _context0.n = 8;
+              return handle(null, _msg5, _env2);
+            case 8:
+              _res3 = _context0.v;
+              _p3.memory = _res3.Memory;
+              delete _res3.Memory;
+              _context0.n = 9;
+              return mem.set({
+                tags: msgTags,
+                data: data,
+                res: _res3,
+                msg: _msg5
+              }, "msgs", pid);
+            case 9:
+              _context0.n = 10;
+              return mem.set(_p3, "env", pid);
+            case 10:
+              return _context0.a(2, _res3);
+            case 11:
+              _context0.n = 12;
+              return mem.get("env", pid);
+            case 12:
+              p = _context0.v;
+              if (p) {
+                _context0.n = 13;
+                break;
+              }
+              throw Error("process ".concat(pid, " not found on satellite CU"));
+            case 13:
+              if (p.handle) {
+                _context0.n = 18;
+                break;
+              }
+              _context0.n = 14;
+              return mem.getWasm(p.module);
+            case 14:
+              _yield$mem$getWasm5 = _context0.v;
+              _format = _yield$mem$getWasm5.format;
+              _mod = _yield$mem$getWasm5.mod;
+              _wasm = _yield$mem$getWasm5.wasm;
+              _wdrive = extensions[p.extension];
+              _context0.n = 15;
+              return mem.getTx(p.id);
+            case 15:
+              _spawnTx = _context0.v;
+              _context0.n = 16;
+              return mem.getTx(_mod);
+            case 16:
+              _moduleTx = _context0.v;
+              _context0.n = 17;
+              return AoLoader(_wasm, {
+                format: _format,
+                WeaveDrive: _wdrive,
+                spawn: (_ref18 = (_spawnTx$item2 = _spawnTx === null || _spawnTx === void 0 ? void 0 : _spawnTx.item) !== null && _spawnTx$item2 !== void 0 ? _spawnTx$item2 : _spawnTx) !== null && _ref18 !== void 0 ? _ref18 : null,
+                module: _moduleTx
+              });
+            case 17:
+              p.handle = _context0.v;
+            case 18:
+              if (p.compressed) {
+                p.memory = mem.decompress(p.memory, p.original_size);
+                p.compressed = false;
+              }
+              p.height += 1;
+              owner = from || mu.addr;
+              _context0.n = 19;
+              return genMsg(msgId, p, data !== null && data !== void 0 ? data : "", msgTags || [], owner, owner);
+            case 19:
+              msg = _context0.v;
+              _context0.n = 20;
+              return genEnv({
+                pid: pid,
+                owner: p.owner,
+                module: p.module
+              });
+            case 20:
+              _env = _context0.v;
+              _context0.n = 21;
+              return p.handle(p.memory, msg, _env);
+            case 21:
+              res = _context0.v;
+              p.memory = res.Memory;
+              delete res.Memory;
+              p.results.push(msgId);
+              _context0.n = 22;
+              return mem.set(p, "env", pid);
+            case 22:
+              _context0.n = 23;
+              return mem.set({
+                tags: msgTags,
+                data: data,
+                from: from,
+                res: res,
+                msg: msg
+              }, "msgs", msgId);
+            case 23:
+              return _context0.a(2, res);
+          }
+        }, _callee9);
+      }));
+      return function evaluate(_x12) {
+        return _ref16.apply(this, arguments);
+      };
+    }();
+    var result = /*#__PURE__*/function () {
+      var _ref19 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(opt) {
+        var _yield$mem$get2;
+        var _t120, _t121, _t122;
+        return _regenerator().w(function (_context1) {
+          while (1) switch (_context1.n) {
+            case 0:
+              _context1.n = 1;
               return mem.get("msgs", opt.message);
             case 1:
-              _t115 = _yield$mem$get2 = _context0.v;
-              _t114 = _t115 === null;
-              if (_t114) {
-                _context0.n = 2;
+              _t121 = _yield$mem$get2 = _context1.v;
+              _t120 = _t121 === null;
+              if (_t120) {
+                _context1.n = 2;
                 break;
               }
-              _t114 = _yield$mem$get2 === void 0;
+              _t120 = _yield$mem$get2 === void 0;
             case 2:
-              if (!_t114) {
-                _context0.n = 3;
+              if (!_t120) {
+                _context1.n = 3;
                 break;
               }
-              _t116 = void 0;
-              _context0.n = 4;
+              _t122 = void 0;
+              _context1.n = 4;
               break;
             case 3:
-              _t116 = _yield$mem$get2.res;
+              _t122 = _yield$mem$get2.res;
             case 4:
-              return _context0.a(2, _t116);
+              return _context1.a(2, _t122);
           }
-        }, _callee9);
+        }, _callee0);
       }));
-      return function result(_x12) {
-        return _ref15.apply(this, arguments);
+      return function result(_x13) {
+        return _ref19.apply(this, arguments);
       };
     }();
     return {
       message: message,
       unmonitor: function () {
-        var _unmonitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(opt) {
+        var _unmonitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(opt) {
           var p;
-          return _regenerator().w(function (_context1) {
-            while (1) switch (_context1.n) {
+          return _regenerator().w(function (_context10) {
+            while (1) switch (_context10.n) {
               case 0:
-                _context1.n = 1;
+                _context10.n = 1;
                 return mem.get("env", opt.process);
               case 1:
-                p = _context1.v;
+                p = _context10.v;
                 try {
                   clearInterval(p.cron);
                   p.cron = null;
                 } catch (e) {}
               case 2:
-                return _context1.a(2);
+                return _context10.a(2);
             }
-          }, _callee0);
+          }, _callee1);
         }));
-        function unmonitor(_x13) {
+        function unmonitor(_x14) {
           return _unmonitor.apply(this, arguments);
         }
         return unmonitor;
       }(),
       monitor: function () {
-        var _monitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(opt) {
+        var _monitor = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(opt) {
           var p;
-          return _regenerator().w(function (_context11) {
-            while (1) switch (_context11.n) {
+          return _regenerator().w(function (_context12) {
+            while (1) switch (_context12.n) {
               case 0:
-                _context11.n = 1;
+                _context12.n = 1;
                 return mem.get("env", opt.process);
               case 1:
-                p = _context11.v;
+                p = _context12.v;
                 if ((0, _ramda.isNil)(p.cron)) {
-                  p.cron = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1() {
-                    return _regenerator().w(function (_context10) {
-                      while (1) switch (_context10.n) {
+                  p.cron = setInterval(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10() {
+                    return _regenerator().w(function (_context11) {
+                      while (1) switch (_context11.n) {
                         case 0:
-                          _context10.n = 1;
+                          _context11.n = 1;
                           return message({
                             tags: p.cronTags,
                             process: opt.process,
@@ -1987,17 +2450,17 @@ var _default = exports["default"] = function _default() {
                             from: mu.addr
                           });
                         case 1:
-                          return _context10.a(2);
+                          return _context11.a(2);
                       }
-                    }, _callee1);
+                    }, _callee10);
                   })), p.span);
                 }
               case 2:
-                return _context11.a(2);
+                return _context12.a(2);
             }
-          }, _callee10);
+          }, _callee11);
         }));
-        function monitor(_x14) {
+        function monitor(_x15) {
           return _monitor.apply(this, arguments);
         }
         return monitor;
@@ -2007,131 +2470,131 @@ var _default = exports["default"] = function _default() {
       ar: ar,
       result: result,
       results: function () {
-        var _results = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee11(opt) {
-          var p, results, _ref17, _ref17$from, from, _ref17$to, to, _ref17$sort, sort, _ref17$limit, limit, _res, count, started, _iterator8, _step8, v, _t117, _t118, _t119, _t120;
-          return _regenerator().w(function (_context12) {
-            while (1) switch (_context12.p = _context12.n) {
+        var _results = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(opt) {
+          var p, results, _ref21, _ref21$from, from, _ref21$to, to, _ref21$sort, sort, _ref21$limit, limit, _res, count, started, _iterator0, _step0, v, _t123, _t124, _t125, _t126;
+          return _regenerator().w(function (_context13) {
+            while (1) switch (_context13.p = _context13.n) {
               case 0:
-                _context12.n = 1;
+                _context13.n = 1;
                 return mem.get("env", opt.process);
               case 1:
-                p = _context12.v;
+                p = _context13.v;
                 if (p) {
-                  _context12.n = 2;
+                  _context13.n = 2;
                   break;
                 }
-                return _context12.a(2, {
+                return _context13.a(2, {
                   edges: []
                 });
               case 2:
                 results = (p === null || p === void 0 ? void 0 : p.results) || [];
-                _ref17 = opt || {}, _ref17$from = _ref17.from, from = _ref17$from === void 0 ? null : _ref17$from, _ref17$to = _ref17.to, to = _ref17$to === void 0 ? null : _ref17$to, _ref17$sort = _ref17.sort, sort = _ref17$sort === void 0 ? "ASC" : _ref17$sort, _ref17$limit = _ref17.limit, limit = _ref17$limit === void 0 ? 25 : _ref17$limit;
+                _ref21 = opt || {}, _ref21$from = _ref21.from, from = _ref21$from === void 0 ? null : _ref21$from, _ref21$to = _ref21.to, to = _ref21$to === void 0 ? null : _ref21$to, _ref21$sort = _ref21.sort, sort = _ref21$sort === void 0 ? "ASC" : _ref21$sort, _ref21$limit = _ref21.limit, limit = _ref21$limit === void 0 ? 25 : _ref21$limit;
                 if (sort === "DESC") results = (0, _ramda.reverse)(results);
                 _res = [];
                 count = 0;
                 started = (0, _ramda.isNil)(from);
-                _iterator8 = _createForOfIteratorHelper(results);
-                _context12.p = 3;
-                _iterator8.s();
+                _iterator0 = _createForOfIteratorHelper(results);
+                _context13.p = 3;
+                _iterator0.s();
               case 4:
-                if ((_step8 = _iterator8.n()).done) {
-                  _context12.n = 10;
+                if ((_step0 = _iterator0.n()).done) {
+                  _context13.n = 10;
                   break;
                 }
-                v = _step8.value;
+                v = _step0.value;
                 if (!started) {
-                  _context12.n = 8;
+                  _context13.n = 8;
                   break;
                 }
-                _t117 = _res;
-                _t118 = v;
-                _context12.n = 5;
+                _t123 = _res;
+                _t124 = v;
+                _context13.n = 5;
                 return result({
                   message: v
                 });
               case 5:
-                _t119 = _context12.v;
-                _t117.push.call(_t117, {
-                  cursor: _t118,
-                  node: _t119
+                _t125 = _context13.v;
+                _t123.push.call(_t123, {
+                  cursor: _t124,
+                  node: _t125
                 });
                 count++;
                 if (!(!(0, _ramda.isNil)(to) && v === to)) {
-                  _context12.n = 6;
+                  _context13.n = 6;
                   break;
                 }
-                return _context12.a(3, 10);
+                return _context13.a(3, 10);
               case 6:
                 if (!(limit <= count)) {
-                  _context12.n = 7;
+                  _context13.n = 7;
                   break;
                 }
-                return _context12.a(3, 10);
+                return _context13.a(3, 10);
               case 7:
-                _context12.n = 9;
+                _context13.n = 9;
                 break;
               case 8:
                 if (from === v) started = true;
               case 9:
-                _context12.n = 4;
+                _context13.n = 4;
                 break;
               case 10:
-                _context12.n = 12;
+                _context13.n = 12;
                 break;
               case 11:
-                _context12.p = 11;
-                _t120 = _context12.v;
-                _iterator8.e(_t120);
+                _context13.p = 11;
+                _t126 = _context13.v;
+                _iterator0.e(_t126);
               case 12:
-                _context12.p = 12;
-                _iterator8.f();
-                return _context12.f(12);
+                _context13.p = 12;
+                _iterator0.f();
+                return _context13.f(12);
               case 13:
-                return _context12.a(2, {
+                return _context13.a(2, {
                   edges: _res
                 });
             }
-          }, _callee11, null, [[3, 11, 12, 13]]);
+          }, _callee12, null, [[3, 11, 12, 13]]);
         }));
-        function results(_x15) {
+        function results(_x16) {
           return _results.apply(this, arguments);
         }
         return results;
       }(),
       dryrun: function () {
-        var _dryrun = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee12(opt) {
+        var _dryrun = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee13(opt) {
           var _opt$id3, _opt$owner3;
-          var p, id, owner, _yield$ar$dataitem5, _opt$data3, cloneMemory, msg, _env, _yield$mem$getWasm4, format, mod, wasm, wdrive, start, res, _t121, _t122, _t123, _t124, _t125, _t126, _t127;
-          return _regenerator().w(function (_context13) {
-            while (1) switch (_context13.p = _context13.n) {
+          var p, id, owner, _yield$ar$dataitem5, _opt$data5, cloneMemory, msg, _env, _yield$mem$getWasm6, format, mod, wasm, wdrive, start, res, _t127, _t128, _t129, _t130, _t131, _t132, _t133;
+          return _regenerator().w(function (_context14) {
+            while (1) switch (_context14.p = _context14.n) {
               case 0:
-                _context13.n = 1;
+                _context14.n = 1;
                 return mem.get("env", opt.process);
               case 1:
-                p = _context13.v;
+                p = _context14.v;
                 if (p) {
-                  _context13.n = 2;
+                  _context14.n = 2;
                   break;
                 }
-                return _context13.a(2, null);
+                return _context14.a(2, null);
               case 2:
                 id = (_opt$id3 = opt.id) !== null && _opt$id3 !== void 0 ? _opt$id3 : "";
                 owner = (_opt$owner3 = opt.owner) !== null && _opt$owner3 !== void 0 ? _opt$owner3 : mu.addr;
                 if (!(!opt.id && opt.signer)) {
-                  _context13.n = 4;
+                  _context14.n = 4;
                   break;
                 }
                 ;
-                _context13.n = 3;
+                _context14.n = 3;
                 return ar.dataitem(_objectSpread(_objectSpread({}, opt), {}, {
                   target: opt.process
                 }));
               case 3:
-                _yield$ar$dataitem5 = _context13.v;
+                _yield$ar$dataitem5 = _context14.v;
                 id = _yield$ar$dataitem5.id;
                 owner = _yield$ar$dataitem5.owner;
               case 4:
-                _context13.p = 4;
+                _context14.p = 4;
                 cloneMemory = function cloneMemory(memory) {
                   var buffer = memory.buffer.slice(0);
                   return new WebAssembly.Memory({
@@ -2140,78 +2603,79 @@ var _default = exports["default"] = function _default() {
                     shared: memory.shared || false
                   });
                 };
-                _context13.n = 5;
-                return genMsg(id, p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, owner, true);
+                _context14.n = 5;
+                return genMsg(id, p, (_opt$data5 = opt.data) !== null && _opt$data5 !== void 0 ? _opt$data5 : "", opt.tags, owner, owner, true);
               case 5:
-                msg = _context13.v;
-                _context13.n = 6;
+                msg = _context14.v;
+                _context14.n = 6;
                 return genEnv({
                   pid: p.id,
                   owner: p.owner,
                   module: p.module
                 });
               case 6:
-                _env = _context13.v;
+                _env = _context14.v;
                 if (p.handle) {
-                  _context13.n = 11;
+                  _context14.n = 11;
                   break;
                 }
-                _context13.n = 7;
+                _context14.n = 7;
                 return mem.getWasm(p.module);
               case 7:
-                _yield$mem$getWasm4 = _context13.v;
-                format = _yield$mem$getWasm4.format;
-                mod = _yield$mem$getWasm4.mod;
-                wasm = _yield$mem$getWasm4.wasm;
+                _yield$mem$getWasm6 = _context14.v;
+                format = _yield$mem$getWasm6.format;
+                mod = _yield$mem$getWasm6.mod;
+                wasm = _yield$mem$getWasm6.wasm;
                 wdrive = extensions[p.extension];
-                _t121 = AoLoader;
-                _t122 = wasm;
-                _t123 = format;
-                _t124 = wdrive;
-                _context13.n = 8;
+                _t127 = AoLoader;
+                _t128 = wasm;
+                _t129 = format;
+                _t130 = wdrive;
+                _context14.n = 8;
                 return mem.getTx(p.id);
               case 8:
-                _t125 = _context13.v.item;
-                _context13.n = 9;
+                _t131 = _context14.v.item;
+                _context14.n = 9;
                 return mem.getTx(mod);
               case 9:
-                _t126 = _context13.v;
-                _context13.n = 10;
-                return _t121(_t122, {
-                  format: _t123,
-                  WeaveDrive: _t124,
-                  spawn: _t125,
-                  module: _t126
+                _t132 = _context14.v;
+                _context14.n = 10;
+                return _t127(_t128, {
+                  format: _t129,
+                  WeaveDrive: _t130,
+                  spawn: _t131,
+                  module: _t132
                 });
               case 10:
-                p.handle = _context13.v;
-                mem.env[opt.process].handle = p.handle;
+                p.handle = _context14.v;
+                if (mem.env[opt.process]) mem.env[opt.process].handle = p.handle;
               case 11:
                 if (p.compressed) {
                   start = Date.now();
                   p.memory = mem.decompress(p.memory, p.original_size);
                   p.compressed = false;
                 }
-                _context13.n = 12;
+                _context14.n = 12;
                 return p.handle(p.memory, msg, _env);
               case 12:
-                res = _context13.v;
+                res = _context14.v;
                 delete res.Memory;
-                return _context13.a(2, res);
+                return _context14.a(2, res);
               case 13:
-                _context13.p = 13;
-                _t127 = _context13.v;
-                console.log(_t127);
-                return _context13.a(2, null);
+                _context14.p = 13;
+                _t133 = _context14.v;
+                console.log(_t133);
+                return _context14.a(2, null);
             }
-          }, _callee12, null, [[4, 13]]);
+          }, _callee13, null, [[4, 13]]);
         }));
-        function dryrun(_x16) {
+        function dryrun(_x17) {
           return _dryrun.apply(this, arguments);
         }
         return dryrun;
       }(),
       recover: _recover,
+      evaluate: evaluate,
       mem: mem
     };
   };