wao 0.8.3 → 0.8.5

package/cjs/tao.js

@@ -87,7 +87,6 @@ var AO = /*#__PURE__*/function (_MAO) {
       monitor = _connect.monitor,
       unmonitor = _connect.unmonitor,
       mem = _connect.mem;
-    _this.module = mem.modules.aos2_0_1;
     _this.assign = assign;
     _this.result = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res,

package/cjs/utils.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.isData = exports.isCheckComplete = exports.getTagVal = exports.getTag = exports.dirname = exports.checkTag = exports.buildTags = exports.action = void 0;
+exports.isData = exports.isCheckComplete = exports.getTagVal = exports.getTag = exports.dirname = exports.checkTag = exports.buildTags = exports.allChecked = exports.action = void 0;
 exports.isJSON = isJSON;
 exports.wait = exports.validAddress = exports.udl = exports.toGraphObj = exports.tags = exports.tagEq = exports.tag = exports.srcs = exports.searchTag = exports.optServer = exports.optAO = exports.mergeOut = exports.mergeChecks = exports.ltags = exports.jsonToStr = exports.isRegExp = exports.isOutComplete = exports.isLocalhost = void 0;
 var _graphql = require("graphql");
@@ -200,6 +200,8 @@ var isData = exports.isData = function isData(data, res) {
         try {
           if (data.test(v.Data)) return true;
         } catch (e) {}
+      } else if (typeof data === "function") {
+        return data(v.Data);
       } else {
         if (data === true || v.Data === data) return true;
       }
@@ -274,21 +276,21 @@ var modGet = function modGet(get) {
     } finally {
       _iterator4.f();
     }
-  } else if ((0, _ramda.is)(Object, get) && (0, _ramda.isNil)(get.data) && (0, _ramda.isNil)(get.json) && (0, _ramda.isNil)(get.name) && (0, _ramda.isNil)(get.obj)) {
+  } else if ((0, _ramda.is)(Object, get) && (0, _ramda.isNil)(get.data) && (0, _ramda.isNil)(get.from) && (0, _ramda.isNil)(get.json) && (0, _ramda.isNil)(get.name) && (0, _ramda.isNil)(get.obj)) {
     _get = {
       obj: get
     };
   }
   return _get;
 };
-var _getTagVal2 = function _getTagVal(get, res) {
+var _getTagVal2 = function _getTagVal(get, res, from) {
   var out = null;
   var _get = modGet(get);
   if (_typeof(_get) === "object" && _get.obj) {
     out = {};
     for (var k in (_get$obj = _get.obj) !== null && _get$obj !== void 0 ? _get$obj : {}) {
       var _get$obj;
-      out[k] = _getTagVal2(_get.obj[k], res);
+      out[k] = _getTagVal2(_get.obj[k], res, from);
     }
   } else {
     var _res$Messages2;
@@ -298,13 +300,22 @@ var _getTagVal2 = function _getTagVal(get, res) {
       for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
         var _v$Tags2;
         var v = _step5.value;
+        if (_typeof(_get) === "object" && (0, _ramda.isNil)(_get.name) && (0, _ramda.isNil)(_get.data)) {
+          _get.data = true;
+        }
         if (_typeof(_get) === "object" && _get.data || typeof _get === "boolean") {
+          var _from = null;
+          if ((0, _ramda.is)(Object, _get) && _get.from) _from = _get.from;
+          if (_from && _from !== from) break;
           if (v.Data) out = v.Data;
           try {
             if (_get.json || _get === true) out = JSON.parse(out);
           } catch (e) {}
         } else if (_typeof(_get) === "object" && typeof _get.name === "string") {
           var _v$Tags;
+          var _from2 = null;
+          if ((0, _ramda.is)(Object, _get) && _get.from) _from2 = _get.from;
+          if (_from2 && _from2 !== from) break;
           out = getTag((_v$Tags = v.Tags) !== null && _v$Tags !== void 0 ? _v$Tags : [], _get.name);
           try {
             if (_get.json) out = JSON.parse(out);
@@ -320,16 +331,19 @@ var _getTagVal2 = function _getTagVal(get, res) {
   }
   return out;
 };
-var getTagVal = exports.getTagVal = function getTagVal(get, res) {
+var getTagVal = exports.getTagVal = function getTagVal(get, res, from) {
   var _get = modGet(get);
-  return _getTagVal2(_get, res);
+  return _getTagVal2(_get, res, from);
 };
 var srcs = exports.srcs = {
   module: "cNlipBptaF9JeFAf4wUmpi43EojNanIBos3EfNrEOWo",
   module_sqlite: "ghSkge2sIUD_F00ym5sEimC63BDBuBrq4b5OcwxOjiw",
   module_aos2: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
   scheduler: "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
-  authority: "fcoN_xJeisVsPXA-trzVAuIiqO3ydLQxM-L4XbrQKzY"
+  authority: "fcoN_xJeisVsPXA-trzVAuIiqO3ydLQxM-L4XbrQKzY",
+  module_wao: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",
+  scheduler_wao: "_GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA",
+  authority_wao: "eNaLJLsMiWCSWvQKNbk_YT-9ydeWl9lrWwXxLVp9kcg"
 };
 var buildTags = exports.buildTags = function buildTags(act, tags) {
   var _tags = [];
@@ -358,7 +372,7 @@ var buildTags = exports.buildTags = function buildTags(act, tags) {
 };
 var mergeOut = exports.mergeOut = function mergeOut(out, out2, get) {
   var _get = modGet(get);
-  if (_get.obj) {
+  if (_get !== null && _get !== void 0 && _get.obj) {
     for (var k in out2 !== null && out2 !== void 0 ? out2 : {}) {
       var _out;
       if ((0, _ramda.isNil)((_out = out) === null || _out === void 0 ? void 0 : _out[k])) {
@@ -382,27 +396,20 @@ var isOutComplete = exports.isOutComplete = function isOutComplete(out, get) {
   if ((0, _ramda.isNil)(get)) return true;
   if ((0, _ramda.isNil)(out)) return false;
   var _get = modGet(get);
-  if (_get.obj) {
-    for (var k in out !== null && out !== void 0 ? out : {}) {
-      if ((0, _ramda.isNil)(out[k])) return false;
-    }
-  }
+  if (_get.obj) for (var k in out !== null && out !== void 0 ? out : {}) if ((0, _ramda.isNil)(out[k])) return false;
   return true;
 };
 var isCheckComplete = exports.isCheckComplete = function isCheckComplete(checks, check) {
   var i = 0;
-  var _iterator7 = _createForOfIteratorHelper(checks),
+  var _iterator7 = _createForOfIteratorHelper(checks || []),
     _step7;
   try {
     for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
       var v = _step7.value;
+      if (!v) return false;
       if (isRegExp(check[i]) || (0, _ramda.includes)(_typeof(check[i]))(["string", "boolean"])) {
         if (!v) return false;
-      } else {
-        for (var k in v) {
-          if (!v[k]) return false;
-        }
-      }
+      } else for (var k in v) if (!v[k]) return false;
       i++;
     }
   } catch (err) {
@@ -611,4 +618,114 @@ var optServer = exports.optServer = function optServer(port) {
     su: port + 3,
     cu: port + 4
   };
+};
+var allChecked = exports.allChecked = function allChecked(check, res, from) {
+  var checks = [];
+  var i = 0;
+  var _iterator11 = _createForOfIteratorHelper(check || []),
+    _step11;
+  try {
+    var _loop = function _loop() {
+      var _checks$i;
+      var v = _step11.value;
+      var _checks = (_checks$i = checks[i]) !== null && _checks$i !== void 0 ? _checks$i : null;
+      if (isRegExp(v) || (0, _ramda.includes)(_typeof(v))(["string", "boolean", "function"])) {
+        _checks = isData(v, res);
+      } else {
+        var _checkVal2 = function _checkVal(val, data) {
+          if (isRegExp(val)) {
+            try {
+              if (val.test(data)) return true;
+            } catch (e) {}
+          } else if (typeof val === "function") {
+            return val(data);
+          } else if (_typeof(val) === "object" && !(0, _ramda.isNil)(val.json)) {
+            try {
+              data = JSON.parse(data);
+              if (typeof val.json === "function") {
+                return val.json(data);
+              } else if (_typeof(val.json) === "object") {
+                if (val.eq) return (0, _ramda.equals)(data, val.json);
+                var ok = true;
+                for (var k in val.json) {
+                  if (!_checkVal2(val.json[k], data[k])) {
+                    ok = false;
+                    break;
+                  }
+                }
+                return ok;
+              } else if (val.json === true) {
+                return true;
+              }
+            } catch (e) {
+              return false;
+            }
+          } else {
+            if (val === true || data === val) return true;
+          }
+          return false;
+        };
+        var checkVal = function checkVal(res, val, name) {
+          var _iterator12 = _createForOfIteratorHelper(res.Messages || []),
+            _step12;
+          try {
+            for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
+              var _v2 = _step12.value;
+              var data = _v2.Data;
+              if (!(0, _ramda.isNil)(name)) {
+                var t = tags(_v2.Tags || []);
+                data = t[name];
+              }
+              if ((0, _ramda.isNil)(data)) return false;
+              return _checkVal2(val, data);
+            }
+          } catch (err) {
+            _iterator12.e(err);
+          } finally {
+            _iterator12.f();
+          }
+          return false;
+        };
+        if (_typeof(v) === "object") {
+          var _v$from;
+          if (!(0, _ramda.isNil)(v.json)) {
+            var _from3 = v.from;
+            v = {
+              data: v,
+              from: _from3
+            };
+          } else if ((0, _ramda.isNil)(v.tags) && (0, _ramda.isNil)(v.data) && (0, _ramda.isNil)(v.from)) {
+            v = {
+              tags: v
+            };
+          }
+          var _from = (_v$from = v.from) !== null && _v$from !== void 0 ? _v$from : null;
+          var checks2 = {};
+          if (!(0, _ramda.isNil)(v.from) && v.from !== from) {
+            _checks = false;
+          } else {
+            var ok = true;
+            if (!(0, _ramda.isNil)(v.data)) {
+              if (!checkVal(res, v.data)) ok = false;
+            }
+            for (var k in (_v$tags = v.tags) !== null && _v$tags !== void 0 ? _v$tags : {}) {
+              var _v$tags;
+              if (!checkVal(res, v.tags[k], k)) ok = false;
+            }
+            _checks = ok;
+          }
+        }
+      }
+      checks[i] = _checks;
+      i++;
+    };
+    for (_iterator11.s(); !(_step11 = _iterator11.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator11.e(err);
+  } finally {
+    _iterator11.f();
+  }
+  return isCheckComplete(checks, check);
 };

package/esm/.db/766288/data/ppl/bob.json

@@ -0,0 +1 @@
+{"name":"Bob","age":40}

package/esm/ao.js

@@ -17,6 +17,7 @@ import {
 } from "@permaweb/aoconnect"
 
 import {
+  equals,
   concat,
   is,
   mergeLeft,
@@ -29,6 +30,7 @@ import {
 } from "ramda"
 
 import {
+  allChecked,
   searchTag,
   checkTag,
   wait,
@@ -78,10 +80,11 @@ class AO {
       in_memory = false,
       port,
     } = opt
-
     if (!_port && port) _port = port
     if (!aoconnect && _port) aoconnect = optAO(_port)
     if (!ar && _port) ar = { port: _port }
+    this.wao = opt.wao
+    if (isNil(this.wao)) this.wao = in_memory || !isNil(ar?.port)
     if (!module) {
       switch (module_type) {
         case "sqlite":
@@ -130,9 +133,15 @@ class AO {
       this.monitor = monitor
       this.unmonitor = unmonitor
     }
-    this.module = module
-    this.scheduler = scheduler
-    this.authority = authority
+    if (this.wao) {
+      this.module = srcs.module_wao
+      this.scheduler = srcs.scheduler_wao
+      this.authority = srcs.authority_wao
+    } else {
+      this.module = module
+      this.scheduler = scheduler
+      this.authority = authority
+    }
   }
 
   async init(jwk) {
@@ -372,11 +381,42 @@ class AO {
     tags = {},
     check = [],
     get,
-    timeout = 10000,
+    timeout = 0,
   }) {
     let err = null
     ;({ jwk, err } = await this.ar.checkWallet({ jwk }))
     if (err) return { err }
+    const getNewTxs = async (pid, _txs, _txmap) => {
+      const txs = await this.ar.gql.txs({
+        recipient: pid,
+        fields: ["id", "recipient", "tags", { owner: ["address"] }],
+      })
+      for (const v of txs) {
+        if (isNil(_txmap[v.id])) {
+          const t = ltags(v.tags)
+          if (t.type === "Message") {
+            v.from = t["from-process"] ?? v.owner?.address
+            _txs.unshift(v)
+            _txmap[v.id] = { checked: false, ref: t["x-reference"] }
+          }
+        }
+      }
+    }
+    const checkOut = async (get, _txs, _txmap) => {
+      let out = null
+      for (let v of _txs) {
+        if (isNil(_txmap[v.id].res)) {
+          const res = await this.result({ process: pid, message: v.id })
+          _txmap[v.id].res = res
+        }
+        if (!isNil(_txmap[v.id].res) && _txmap[v.id].out !== true) {
+          _txmap[v.id].out = true
+          out = getTagVal(get, _txmap[v.id].res, v.from)
+          if (out) break
+        }
+      }
+      return out
+    }
     let [res, out, mid, results] = [null, null, null, []]
     let _tags = buildTags(act, tags)
     let start = Date.now()
@@ -387,108 +427,51 @@ class AO {
         tags: _tags,
         data: jsonToStr(data),
       })
-
-      const exRef = (ref, txs) => {
-        for (const v2 of txs ?? []) {
-          const t = ltags(v2.tags)
-          if (t.type === "Message" && t["x-reference"] === ref) return true
-        }
-        return false
-      }
-
-      const getRef = async (ref, txs = []) => {
-        let ex = exRef(ref, txs)
-        if (!ex) {
-          if (!this.in_memory) await wait(1000)
-          txs = await this.ar.gql.txs({
-            recipient: pid,
-            fields: ["id", "recipient", "tags", { owner: ["address"] }],
-          })
-          ex = exRef(ref, txs)
-        }
-        if (ex) return txs
-        if (this.in_memory) await wait(1)
-        return Date.now() - start < timeout ? await getRef(ref) : []
-      }
-
-      let [cache, checks, isOK] = [[], [], false]
-      const getResult = async mid => {
-        const res = await this.result({ process: pid, message: mid })
-        results.push({ mid, res })
-        let err = null
-        if (res.Error) err = res.Error
-        else {
-          if (!is(Array, check)) check = [check]
-          let i = 0
-          for (const v of check) {
-            let _checks = checks[i] ?? null
-            if (isRegExp(v) || includes(typeof v)(["string", "boolean"])) {
-              _checks = mergeChecks(_checks, isData(v, res), v)
-            } else {
-              const checks2 = {}
-              for (const k in v ?? {}) {
-                checks2[k] = checkTag(res, k, v[k])
-              }
-              _checks = mergeChecks(_checks, checks2, v)
+      if (!is(Array, check)) check = [check]
+      let _txs = [{ id: mid, from: await this.ar.toAddr(jwk) }]
+      let _txmap = {}
+      const t = ltags(_tags)
+      let checked = false
+      _txmap[mid] = { checked: false, ref: t["x-reference"] }
+      do {
+        for (let v of _txs) {
+          if (!_txmap[v.id].checked) {
+            _txmap[v.id].checked = true
+            const _res = await this.result({ process: pid, message: v.id })
+            if (isNil(res)) {
+              res = _res
+              mid = v.id
+              results.push({ mid, res })
             }
-            checks[i] = _checks
-            i++
-          }
-          if (isCheckComplete(checks, check)) isOK = true
-          if (!isNil(get) && !isOutComplete(out, get)) {
-            out = mergeOut(out, getTagVal(get, res), get)
+            _txmap[v.id].res = _res
+            checked = allChecked(check, _res, v.from)
+            if (checked) break
           }
         }
-        if ((!isOutComplete(out, get) || !isOK) && !err) {
-          let refs = []
-          for (const v of res.Messages) {
-            const _ltags = ltags(v.Tags)
-            if (_ltags.type === "Message" && _ltags.reference) {
-              refs.push(_ltags.reference)
-            }
-          }
-
-          for (const v of res.Messages) {
-            const _ltags = ltags(v.Tags)
-            if (_ltags.type === "Message" && _ltags.reference) {
-              const txs = await getRef(_ltags.reference, cache)
-              cache = o(uniqBy(prop("id")), concat(cache))(txs)
-              for (const v2 of txs) {
-                const _ltags2 = ltags(v2.tags)
-                if (
-                  _ltags2.type === "Message" &&
-                  _ltags2["x-reference"] === _ltags.reference
-                ) {
-                  const {
-                    res: _res,
-                    out: _out,
-                    err: _err,
-                    ok: _ok,
-                  } = await getResult(v2.id)
-                  if (_err) {
-                    err = _err
-                    break
-                  }
-                  if (!isOutComplete(out, get) && _out)
-                    out = mergeOut(out, _out, get)
-                  if (isOutComplete(out, get) && isOK) break
-                }
-              }
-              if (isOutComplete(out, get) && isOK) break
-            }
+        if (checked) break
+        await wait(1000)
+        await getNewTxs(pid, _txs, _txmap)
+      } while (Date.now() - start < timeout)
+      if (!checked) {
+        err = "something went wrong!"
+      } else {
+        out = mergeOut(out, await checkOut(get, _txs, _txmap), get)
+        if (!isOutComplete(out, get) && !isNil(get)) {
+          while (Date.now() - start < timeout) {
+            await getNewTxs(pid, _txs, _txmap)
+            out = mergeOut(out, await checkOut(get, _txs, _txmap), get)
+            if (isOutComplete(out, get)) break
+            await wait(1000)
           }
         }
-        return { res, err }
       }
-      ;({ res, err } = await getResult(mid))
-      if (!isOK && !err) err = "something went wrong!"
     } catch (e) {
       err = e
     }
     return { mid, res, err, out, results }
   }
 
-  async asgn({ pid, mid, jwk, check, get }) {
+  async asgn({ pid, mid, jwk, check = [], get }) {
     let err = null
     ;({ jwk, err } = await this.ar.checkWallet({ jwk }))
     if (err) return { err }
@@ -502,28 +485,11 @@ class AO {
       })
       res = await this.result({ process: pid, message: mid })
       if (!res) err = "something went wrong"
-
       if (res.Error) err = res.Error
       else {
-        let checks = []
         if (!is(Array, check)) check = [check]
-        let i = 0
-        for (const v of check) {
-          let _checks = checks[i] ?? null
-          if (isRegExp(v) || includes(typeof v)(["string", "boolean"])) {
-            _checks = mergeChecks(_checks, isData(v, res), v)
-          } else {
-            const checks2 = {}
-            for (const k in v ?? {}) {
-              checks2[k] = checkTag(res, k, v[k])
-            }
-            _checks = mergeChecks(_checks, checks2, v)
-          }
-          checks[i] = _checks
-          i++
-        }
-        if (!isCheckComplete(checks, check)) err = "something went wrong"
-        if (!err && !isNil(get)) out = getTagVal(get, res)
+        if (!allChecked(check, res)) err = "something went wrong"
+        if (!err && !isNil(get)) out = getTagVal(get, res) // todo: from
       }
     } catch (e) {
       err = e
@@ -531,16 +497,7 @@ class AO {
     return { mid, res, err, out }
   }
 
-  async dry({
-    pid,
-    jwk,
-    data,
-    act = "Eval",
-    tags = {},
-    check,
-    get,
-    timeout = 10000,
-  }) {
+  async dry({ pid, jwk, data, act = "Eval", tags = {}, check = [], get }) {
     let err = null
     ;({ jwk, err } = await this.ar.checkWallet({ jwk }))
     if (err) return { err }
@@ -556,22 +513,7 @@ class AO {
       res = _res
       let checks = []
       if (!is(Array, check)) check = [check]
-      let i = 0
-      for (const v of check) {
-        let _checks = checks[i] ?? null
-        if (isRegExp(v) || includes(typeof v)(["string", "boolean"])) {
-          _checks = mergeChecks(_checks, isData(v, res), v)
-        } else {
-          const checks2 = {}
-          for (const k in v ?? {}) {
-            checks2[k] = checkTag(res, k, v[k])
-          }
-          _checks = mergeChecks(_checks, checks2, v)
-        }
-        checks[i] = _checks
-        i++
-      }
-      if (!isCheckComplete(checks, check)) err = "something went wrong"
+      if (!allChecked(check, res)) err = "something went wrong"
       if (!err && !isNil(get)) out = getTagVal(get, res)
     } catch (e) {
       err = e

package/esm/aoconnect.js

@@ -72,25 +72,16 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
     }
   }
 
-  const genEnv = ({ pid, owner = "", module = "", auth = "" }) => {
+  const genEnv = async ({ pid, owner = "", module = "" }) => {
     return {
       Process: {
         Id: pid,
-        Tags: [
-          { name: "Data-Protocol", value: "ao" },
-          { name: "Variant", value: "ao.TN.1" },
-          { name: "Type", value: "Process" },
-          { name: "Authority", value: auth },
-        ],
+        Tags: (await mem.get("txs", pid))?.tags ?? [],
         Owner: owner,
       },
       Module: {
         Id: module,
-        Tags: [
-          { name: "Data-Protocol", value: "ao" },
-          { name: "Variant", value: "ao.TN.1" },
-          { name: "Type", value: "Module" },
-        ],
+        Tags: (await mem.get("txs", module))?.tags ?? [],
       },
     }
   }
@@ -108,11 +99,13 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
         Module: mod,
         Scheduler: opt.scheduler,
         "Content-Type": "text/plain",
+        Authority: mu.addr,
       }),
     )
     let ex = false
     for (let v of opt.tags) if (v.name === "Type") ex = true
     if (!ex) opt.tags.push({ name: "Type", value: "Process" })
+    if (opt.for) opt.tags.push({ name: "Pushed-For", value: opt.for })
     const {
       id,
       owner,
@@ -171,11 +164,10 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       if (_tags["On-Boot"] === "Data") data = opt.data ?? ""
       else data = (await mem.get("msgs", _tags["On-Boot"]))?.data ?? ""
       let msg = await genMsg(id, p, data, opt.tags, owner, mu.addr, true)
-      const _env = genEnv({
+      const _env = await genEnv({
         pid: p.id,
         owner: p.owner,
         module: p.module,
-        auth: mu.addr,
       })
       res = await _module.handle(null, msg, _env)
       p.memory = res.Memory
@@ -288,11 +280,10 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       }
       // check: is owner=mu.addr right?
       const msg = await genMsg(opt.message, p, data, _tags, from, mu.addr)
-      const _env = genEnv({
+      const _env = await genEnv({
         pid: p.id,
         owner: p.owner,
         module: p.module,
-        auth: mu.addr,
       })
       if (!p.handle) {
         const { format, mod, wasm } = await mem.getWasm(p.modulea)
@@ -316,6 +307,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       for (const v of res.Messages ?? []) {
         if (await mem.get("env", v.Target)) {
           await message({
+            for: opt.message,
             process: v.Target,
             tags: v.Tags,
             data: v.Data,
@@ -327,6 +319,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
       for (const v of res.Spawns ?? []) {
         const __tags = tags(v.Tags)
         await spawn({
+          for: opt.message,
           module: __tags.Module,
           scheduler,
           tags: v.Tags,
@@ -371,6 +364,14 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
           SDK: "aoconnect",
         }),
       )
+      if (opt.for) {
+        opt.tags.push({ name: "Pushed-For", value: opt.for })
+        opt.tags.push({ name: "From-Process", value: opt.from })
+        const pr = (await mem.get("txs", opt.from))?.tags ?? []
+        const module = tags(pr).Module
+        if (module) opt.tags.push({ name: "From-Module", value: module })
+      }
+
       ;({ item, id, owner } = await ar.dataitem({
         data: opt.data,
         signer: opt.signer,
@@ -414,7 +415,7 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
     spawn,
     assign,
     ar,
-    result: async opt => (await mem.get("env", opt.process)).res[opt.message],
+    result: async opt => (await mem.get("env", opt.process))?.res[opt.message],
     results: async opt => {
       const p = await mem.get("env", opt.process)
       let results = []
@@ -450,11 +451,10 @@ export const connect = (mem, { cache, log = false, extensions = {} } = {}) => {
           mu.addr,
           true,
         )
-        const _env = genEnv({
+        const _env = await genEnv({
           pid: p.id,
           owner: p.owner,
           module: p.module,
-          auth: mu.addr,
         })
         function cloneMemory(memory) {
           const buffer = memory.buffer.slice(0)