wao 0.4.1 → 0.4.2

package/cjs/aoconnect.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.connect = void 0;
 var _warpArbundles = require("warp-arbundles");
+var _crypto = _interopRequireDefault(require("crypto"));
 var _base64url = _interopRequireDefault(require("base64url"));
 var _utils = require("./utils.js");
 var _armem = _interopRequireDefault(require("./armem.js"));
@@ -185,7 +186,7 @@ var connect = exports.connect = function connect(mem) {
   }();
   var spawn = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _opt$module, _opt$tags;
+      var _opt$module, _opt$tags, _opt$tags2;
       var opt,
         mod,
         __dirname,
@@ -264,9 +265,18 @@ var connect = exports.connect = function connect(mem) {
             }
             throw Error("module not found");
           case 17:
+            opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags = opt.tags) !== null && _opt$tags !== void 0 ? _opt$tags : []), {
+              "Data-Protocol": "ao",
+              Variant: "ao.TN.1",
+              Type: "Process",
+              SDK: "aoconnect",
+              Module: opt.module,
+              Scheduler: opt.scheduler,
+              "Content-Type": "text/plain"
+            }));
             _module = mem.modmap[mod];
             ex = false;
-            (_opt$tags = opt.tags) !== null && _opt$tags !== void 0 ? _opt$tags : opt.tags = [];
+            (_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : opt.tags = [];
             _iterator = _createForOfIteratorHelper(opt.tags);
             try {
               for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -282,27 +292,29 @@ var connect = exports.connect = function connect(mem) {
               name: "Type",
               value: "Process"
             });
-            _context2.next = 25;
+            _context2.next = 26;
             return ar.dataitem({
               data: opt.data,
               signer: opt.signer,
               tags: (0, _utils.tags)(opt.tags)
             });
-          case 25:
+          case 26:
             _yield$ar$dataitem2 = _context2.sent;
             id = _yield$ar$dataitem2.id;
             owner = _yield$ar$dataitem2.owner;
             item = _yield$ar$dataitem2.item;
-            _context2.next = 31;
+            _context2.next = 32;
             return ar.postItem(item, _test.su.jwk);
-          case 31:
+          case 32:
             _tags = (0, _utils.tags)(opt.tags);
             res = null;
             memory = null;
             p = {
               id: id,
+              epochs: [],
               handle: _module.handle,
               module: _module.id,
+              hash: id,
               memory: memory,
               owner: owner,
               height: 0,
@@ -312,7 +324,7 @@ var connect = exports.connect = function connect(mem) {
               opt: opt
             };
             if (!_tags["On-Boot"]) {
-              _context2.next = 49;
+              _context2.next = 50;
               break;
             }
             data = "";
@@ -325,51 +337,51 @@ var connect = exports.connect = function connect(mem) {
               auth: _test.mu.addr
             });
             _t = (0, _utils.tags)(msg.Tags);
-            _context2.next = 43;
+            _context2.next = 44;
             return _module.handle(null, msg, _env);
-          case 43:
+          case 44:
             res = _context2.sent;
             p.memory = res.Memory;
             delete res.Memory;
             p.res[id] = res;
-            _context2.next = 50;
+            _context2.next = 51;
             break;
-          case 49:
-            p.height += 1;
           case 50:
+            p.height += 1;
+          case 51:
             mem.msgs[id] = opt;
             mem.env[id] = p;
             if (!_tags["Cron-Interval"]) {
-              _context2.next = 76;
+              _context2.next = 77;
               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;
             _context2.t0 = unit.replace(/s$/, "");
-            _context2.next = _context2.t0 === "millisecond" ? 58 : _context2.t0 === "second" ? 60 : _context2.t0 === "minute" ? 62 : _context2.t0 === "hour" ? 64 : _context2.t0 === "day" ? 66 : _context2.t0 === "month" ? 68 : _context2.t0 === "year" ? 70 : 72;
+            _context2.next = _context2.t0 === "millisecond" ? 59 : _context2.t0 === "second" ? 61 : _context2.t0 === "minute" ? 63 : _context2.t0 === "hour" ? 65 : _context2.t0 === "day" ? 67 : _context2.t0 === "month" ? 69 : _context2.t0 === "year" ? 71 : 73;
             break;
-          case 58:
+          case 59:
             _int = num;
-            return _context2.abrupt("break", 72);
-          case 60:
+            return _context2.abrupt("break", 73);
+          case 61:
             _int = num * 1000;
-            return _context2.abrupt("break", 72);
-          case 62:
+            return _context2.abrupt("break", 73);
+          case 63:
             _int = num * 1000 * 60;
-            return _context2.abrupt("break", 72);
-          case 64:
+            return _context2.abrupt("break", 73);
+          case 65:
             _int = num * 1000 * 60 * 60;
-            return _context2.abrupt("break", 72);
-          case 66:
+            return _context2.abrupt("break", 73);
+          case 67:
             _int = num * 1000 * 60 * 60 * 24;
-            return _context2.abrupt("break", 72);
-          case 68:
+            return _context2.abrupt("break", 73);
+          case 69:
             _int = num * 1000 * 60 * 60 * 24 * 30;
-            return _context2.abrupt("break", 72);
-          case 70:
+            return _context2.abrupt("break", 73);
+          case 71:
             _int = num * 1000 * 60 * 60 * 24 * 365;
-            return _context2.abrupt("break", 72);
-          case 72:
+            return _context2.abrupt("break", 73);
+          case 73:
             cronTags = [];
             for (k in _tags) {
               if (/^Cron-Tag-/.test(k)) {
@@ -381,9 +393,9 @@ var connect = exports.connect = function connect(mem) {
             }
             mem.env[id].cronTags = cronTags;
             mem.env[id].span = _int;
-          case 76:
-            return _context2.abrupt("return", id);
           case 77:
+            return _context2.abrupt("return", id);
+          case 78:
           case "end":
             return _context2.stop();
         }
@@ -393,125 +405,242 @@ var connect = exports.connect = function connect(mem) {
       return _ref6.apply(this, arguments);
     };
   }();
-  var assign = /*#__PURE__*/function () {
+  function genHashChain(previousHash) {
+    var previousMessageId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+    var hasher = _crypto["default"].createHash("sha256");
+    hasher.update(Buffer.from(previousHash, "base64url"));
+    if (previousMessageId) {
+      hasher.update(Buffer.from(previousMessageId, "base64url"));
+    }
+    return (0, _base64url["default"])(hasher.digest());
+  }
+  var _assign = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(opt) {
-      var p, _opt, _yield$ar$dataitem3, id, owner, item, _opt$data2, _opt$from, _res$Messages, msg, _env, res, _iterator2, _step2, v;
+      var _opt$tags3;
+      var p, _opt, hash, _yield$ar$dataitem3, id, owner, item, _opt$data2, _ref8, _opt$from, _res$Messages, _res$Spawns, _res$Assignments, msg, _env, res, _iterator2, _step2, v, _iterator3, _step3, _v, _tags, _iterator4, _step4, _v2, _iterator5, _step5, v2;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             p = mem.env[opt.process];
-            _opt = (0, _ramda.clone)(mem.msgs[opt.message]);
-            _context3.next = 4;
+            _opt = mem.msgs[opt.message];
+            hash = genHashChain(p.hash, opt.message);
+            p.hash = hash;
+            opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags3 = opt.tags) !== null && _opt$tags3 !== void 0 ? _opt$tags3 : []), {
+              Timestamp: Date.now(),
+              Epoch: p.epochs.length,
+              Nonce: "0",
+              "Data-Protocol": "ao",
+              Variant: "ao.TN.1",
+              SDK: "aoconnect",
+              Type: "Assignment",
+              "Block-Height": mem.height,
+              Process: opt.process,
+              Message: opt.message,
+              "Hash-Chain": hash
+            }));
+            p.epochs.push([opt.id]);
+            _context3.next = 8;
             return ar.dataitem({
-              data: _opt.data,
-              signer: _opt.signer,
-              tags: (0, _utils.tags)(_opt.tags),
+              data: opt.data,
+              signer: opt.signer,
+              tags: (0, _utils.tags)(opt.tags),
               target: opt.process
             });
-          case 4:
+          case 8:
             _yield$ar$dataitem3 = _context3.sent;
             id = _yield$ar$dataitem3.id;
             owner = _yield$ar$dataitem3.owner;
             item = _yield$ar$dataitem3.item;
-            _context3.next = 10;
+            _context3.next = 14;
             return ar.postItem(item, _test.su.jwk);
-          case 10:
-            _context3.prev = 10;
-            msg = genMsg(p, (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "", _opt.tags, (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : owner, _test.mu.addr);
+          case 14:
+            _context3.prev = 14;
+            msg = genMsg(p, (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "", _opt.tags, (_ref8 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref8 !== void 0 ? _ref8 : owner, _test.mu.addr);
             _env = genEnv({
               pid: p.id,
               owner: p.owner,
               module: p.module,
               auth: _test.mu.addr
             });
-            _context3.next = 15;
+            _context3.next = 19;
             return p.handle(p.memory, msg, _env);
-          case 15:
+          case 19:
             res = _context3.sent;
             p.memory = res.Memory;
             delete res.Memory;
-            p.res[id] = res;
-            p.results.push(id);
+            p.res[opt.message] = res;
+            p.results.push(opt.message);
             p.txs.unshift(_objectSpread({
-              id: id
-            }, _opt));
-            mem.msgs[id] = _opt;
+              id: opt.message
+            }, opt));
+            mem.msgs[opt.message] = _opt;
             _iterator2 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-            _context3.prev = 23;
+            _context3.prev = 27;
             _iterator2.s();
-          case 25:
+          case 29:
             if ((_step2 = _iterator2.n()).done) {
-              _context3.next = 32;
+              _context3.next = 36;
               break;
             }
             v = _step2.value;
             if (!mem.env[v.Target]) {
-              _context3.next = 30;
+              _context3.next = 34;
               break;
             }
-            _context3.next = 30;
-            return _message({
+            _context3.next = 34;
+            return message({
               process: v.Target,
               tags: v.Tags,
               data: v.Data,
               signer: _test.mu.signer,
               from: opt.process
             });
-          case 30:
-            _context3.next = 25;
+          case 34:
+            _context3.next = 29;
             break;
-          case 32:
-            _context3.next = 37;
+          case 36:
+            _context3.next = 41;
             break;
-          case 34:
-            _context3.prev = 34;
-            _context3.t0 = _context3["catch"](23);
+          case 38:
+            _context3.prev = 38;
+            _context3.t0 = _context3["catch"](27);
             _iterator2.e(_context3.t0);
-          case 37:
-            _context3.prev = 37;
+          case 41:
+            _context3.prev = 41;
             _iterator2.f();
-            return _context3.finish(37);
-          case 40:
+            return _context3.finish(41);
+          case 44:
+            _iterator3 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
+            _context3.prev = 45;
+            _iterator3.s();
+          case 47:
+            if ((_step3 = _iterator3.n()).done) {
+              _context3.next = 54;
+              break;
+            }
+            _v = _step3.value;
+            _tags = (0, _utils.tags)(_v.Tags);
+            _context3.next = 52;
+            return spawn({
+              module: _tags.Module,
+              scheduler: _test.scheduler,
+              tags: _v.Tags,
+              data: _v.Data,
+              from: _tags["From-Process"],
+              signer: _test.mu.signer
+            });
+          case 52:
+            _context3.next = 47;
+            break;
+          case 54:
+            _context3.next = 59;
+            break;
+          case 56:
+            _context3.prev = 56;
+            _context3.t1 = _context3["catch"](45);
+            _iterator3.e(_context3.t1);
+          case 59:
+            _context3.prev = 59;
+            _iterator3.f();
+            return _context3.finish(59);
+          case 62:
+            _iterator4 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
+            _context3.prev = 63;
+            _iterator4.s();
+          case 65:
+            if ((_step4 = _iterator4.n()).done) {
+              _context3.next = 86;
+              break;
+            }
+            _v2 = _step4.value;
+            _iterator5 = _createForOfIteratorHelper(_v2.Processes);
+            _context3.prev = 68;
+            _iterator5.s();
+          case 70:
+            if ((_step5 = _iterator5.n()).done) {
+              _context3.next = 76;
+              break;
+            }
+            v2 = _step5.value;
+            _context3.next = 74;
+            return _assign({
+              message: _v2.Message,
+              process: v2,
+              from: opt.process,
+              signer: _test.mu.signer
+            });
+          case 74:
+            _context3.next = 70;
+            break;
+          case 76:
+            _context3.next = 81;
+            break;
+          case 78:
+            _context3.prev = 78;
+            _context3.t2 = _context3["catch"](68);
+            _iterator5.e(_context3.t2);
+          case 81:
+            _context3.prev = 81;
+            _iterator5.f();
+            return _context3.finish(81);
+          case 84:
+            _context3.next = 65;
+            break;
+          case 86:
+            _context3.next = 91;
+            break;
+          case 88:
+            _context3.prev = 88;
+            _context3.t3 = _context3["catch"](63);
+            _iterator4.e(_context3.t3);
+          case 91:
+            _context3.prev = 91;
+            _iterator4.f();
+            return _context3.finish(91);
+          case 94:
             return _context3.abrupt("return", id);
-          case 43:
-            _context3.prev = 43;
-            _context3.t1 = _context3["catch"](10);
-            console.log(_context3.t1);
-          case 46:
+          case 97:
+            _context3.prev = 97;
+            _context3.t4 = _context3["catch"](14);
+            console.log(_context3.t4);
+          case 100:
             return _context3.abrupt("return", null);
-          case 47:
+          case 101:
           case "end":
             return _context3.stop();
         }
-      }, _callee3, null, [[10, 43], [23, 34, 37, 40]]);
+      }, _callee3, null, [[14, 97], [27, 38, 41, 44], [45, 56, 59, 62], [63, 88, 91, 94], [68, 78, 81, 84]]);
     }));
     return function assign(_x2) {
       return _ref7.apply(this, arguments);
     };
   }();
-  var _message = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(opt) {
-      var p, ex, _iterator3, _step3, _v3, _yield$ar$dataitem4, item, id, owner, _opt$data3, _opt$from2, _res$Messages2, _res$Spawns, _res$Assignments, msg, _env, res, _iterator4, _step4, v, _iterator5, _step5, _v, _tags, _iterator6, _step6, _v2, _iterator7, _step7, v2;
+  var message = /*#__PURE__*/function () {
+    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(opt) {
+      var _opt$tags4;
+      var p, ex, _iterator6, _step6, v, _yield$ar$dataitem4, item, id, owner;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             p = mem.env[opt.process];
             ex = false;
-            _iterator3 = _createForOfIteratorHelper(opt.tags);
+            _iterator6 = _createForOfIteratorHelper(opt.tags);
             try {
-              for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                _v3 = _step3.value;
-                if (_v3.name === "Type") ex = true;
+              for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+                v = _step6.value;
+                if (v.name === "Type") ex = true;
               }
             } catch (err) {
-              _iterator3.e(err);
+              _iterator6.e(err);
             } finally {
-              _iterator3.f();
+              _iterator6.f();
             }
-            if (!ex) opt.tags.push({
-              name: "Type",
-              value: "Message"
-            });
+            opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags4 = opt.tags) !== null && _opt$tags4 !== void 0 ? _opt$tags4 : []), {
+              "Data-Protocol": "ao",
+              Variant: "ao.TN.1",
+              Type: "Message",
+              SDK: "aoconnect"
+            }));
             _context4.next = 7;
             return ar.dataitem({
               data: opt.data,
@@ -527,169 +656,28 @@ var connect = exports.connect = function connect(mem) {
             _context4.next = 13;
             return ar.postItem(item, _test.su.jwk);
           case 13:
-            _context4.prev = 13;
-            msg = genMsg(p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, (_opt$from2 = opt.from) !== null && _opt$from2 !== void 0 ? _opt$from2 : owner, _test.mu.addr);
-            _env = genEnv({
-              pid: p.id,
-              owner: p.owner,
-              module: p.module,
-              auth: _test.mu.addr
-            });
-            _context4.next = 18;
-            return p.handle(p.memory, msg, _env);
-          case 18:
-            res = _context4.sent;
-            p.memory = res.Memory;
-            delete res.Memory;
-            p.res[id] = res;
-            p.results.push(id);
-            p.txs.unshift(_objectSpread({
-              id: id
-            }, opt));
             mem.msgs[id] = opt;
-            _iterator4 = _createForOfIteratorHelper((_res$Messages2 = res.Messages) !== null && _res$Messages2 !== void 0 ? _res$Messages2 : []);
-            _context4.prev = 26;
-            _iterator4.s();
-          case 28:
-            if ((_step4 = _iterator4.n()).done) {
-              _context4.next = 35;
-              break;
-            }
-            v = _step4.value;
-            if (!mem.env[v.Target]) {
-              _context4.next = 33;
-              break;
-            }
-            _context4.next = 33;
-            return _message({
-              process: v.Target,
-              tags: v.Tags,
-              data: v.Data,
-              signer: _test.mu.signer,
-              from: opt.process
-            });
-          case 33:
-            _context4.next = 28;
-            break;
-          case 35:
-            _context4.next = 40;
-            break;
-          case 37:
-            _context4.prev = 37;
-            _context4.t0 = _context4["catch"](26);
-            _iterator4.e(_context4.t0);
-          case 40:
-            _context4.prev = 40;
-            _iterator4.f();
-            return _context4.finish(40);
-          case 43:
-            _iterator5 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-            _context4.prev = 44;
-            _iterator5.s();
-          case 46:
-            if ((_step5 = _iterator5.n()).done) {
-              _context4.next = 53;
-              break;
-            }
-            _v = _step5.value;
-            _tags = (0, _utils.tags)(_v.Tags);
-            _context4.next = 51;
-            return spawn({
-              module: _tags.Module,
-              scheduler: _test.scheduler,
-              tags: _v.Tags,
-              data: _v.Data,
-              from: _tags["From-Process"],
+            _context4.next = 16;
+            return _assign({
+              message: id,
+              process: opt.process,
+              from: owner,
               signer: _test.mu.signer
             });
-          case 51:
-            _context4.next = 46;
-            break;
-          case 53:
-            _context4.next = 58;
-            break;
-          case 55:
-            _context4.prev = 55;
-            _context4.t1 = _context4["catch"](44);
-            _iterator5.e(_context4.t1);
-          case 58:
-            _context4.prev = 58;
-            _iterator5.f();
-            return _context4.finish(58);
-          case 61:
-            _iterator6 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-            _context4.prev = 62;
-            _iterator6.s();
-          case 64:
-            if ((_step6 = _iterator6.n()).done) {
-              _context4.next = 85;
-              break;
-            }
-            _v2 = _step6.value;
-            _iterator7 = _createForOfIteratorHelper(_v2.Processes);
-            _context4.prev = 67;
-            _iterator7.s();
-          case 69:
-            if ((_step7 = _iterator7.n()).done) {
-              _context4.next = 75;
-              break;
-            }
-            v2 = _step7.value;
-            _context4.next = 73;
-            return assign({
-              message: _v2.Message,
-              process: v2,
-              from: opt.process,
-              signer: _test.mu.signer
-            });
-          case 73:
-            _context4.next = 69;
-            break;
-          case 75:
-            _context4.next = 80;
-            break;
-          case 77:
-            _context4.prev = 77;
-            _context4.t2 = _context4["catch"](67);
-            _iterator7.e(_context4.t2);
-          case 80:
-            _context4.prev = 80;
-            _iterator7.f();
-            return _context4.finish(80);
-          case 83:
-            _context4.next = 64;
-            break;
-          case 85:
-            _context4.next = 90;
-            break;
-          case 87:
-            _context4.prev = 87;
-            _context4.t3 = _context4["catch"](62);
-            _iterator6.e(_context4.t3);
-          case 90:
-            _context4.prev = 90;
-            _iterator6.f();
-            return _context4.finish(90);
-          case 93:
+          case 16:
             return _context4.abrupt("return", id);
-          case 96:
-            _context4.prev = 96;
-            _context4.t4 = _context4["catch"](13);
-            console.log(_context4.t4);
-          case 99:
-            return _context4.abrupt("return", null);
-          case 100:
+          case 17:
           case "end":
             return _context4.stop();
         }
-      }, _callee4, null, [[13, 96], [26, 37, 40, 43], [44, 55, 58, 61], [62, 87, 90, 93], [67, 77, 80, 83]]);
+      }, _callee4);
     }));
     return function message(_x3) {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   return {
-    message: _message,
+    message: message,
     unmonitor: function () {
       var _unmonitor = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(opt) {
         var p;
@@ -725,7 +713,7 @@ var connect = exports.connect = function connect(mem) {
                     while (1) switch (_context6.prev = _context6.next) {
                       case 0:
                         _context6.next = 2;
-                        return _message({
+                        return message({
                           tags: p.cronTags,
                           process: opt.process,
                           signer: _test.mu.signer,
@@ -750,7 +738,7 @@ var connect = exports.connect = function connect(mem) {
       return monitor;
     }(),
     spawn: spawn,
-    assign: assign,
+    assign: _assign,
     result: function () {
       var _result = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(opt) {
         return _regeneratorRuntime().wrap(function _callee8$(_context8) {
@@ -840,7 +828,7 @@ var connect = exports.connect = function connect(mem) {
     }(),
     dryrun: function () {
       var _dryrun = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(opt) {
-        var p, _yield$ar$dataitem5, id, owner, _opt$data4, msg, _env, res;
+        var p, _yield$ar$dataitem5, id, owner, _opt$data3, msg, _env, res;
         return _regeneratorRuntime().wrap(function _callee10$(_context10) {
           while (1) switch (_context10.prev = _context10.next) {
             case 0:
@@ -854,7 +842,7 @@ var connect = exports.connect = function connect(mem) {
               id = _yield$ar$dataitem5.id;
               owner = _yield$ar$dataitem5.owner;
               _context10.prev = 6;
-              msg = genMsg(p, (_opt$data4 = opt.data) !== null && _opt$data4 !== void 0 ? _opt$data4 : "", opt.tags, owner, _test.mu.addr, true);
+              msg = genMsg(p, (_opt$data3 = opt.data) !== null && _opt$data3 !== void 0 ? _opt$data3 : "", opt.tags, owner, _test.mu.addr, true);
               _env = genEnv({
                 pid: p.id,
                 owner: p.owner,

package/cjs/armem.js

@@ -24,6 +24,7 @@ var ArMem = exports["default"] = /*#__PURE__*/_createClass(function ArMem() {
   this.arweave.transactions.getPrice = function () {
     return 0;
   };
+  this.addrmap = {};
   this.txs = {};
   this.jwks = {};
   this.height = 0;

package/cjs/tar.js

@@ -99,7 +99,7 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "post",
     value: function () {
       var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
-        var _ref2$data, data, _ref2$tags, tags, jwk, tx, _tags, _iterator, _step, v;
+        var _ref2$data, data, _ref2$tags, tags, jwk, tx, _tags, _iterator, _step, v, owner;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
@@ -122,26 +122,21 @@ var AR = /*#__PURE__*/function (_MAR) {
               } finally {
                 _iterator.f();
               }
-              _context2.t0 = this;
-              _context2.t1 = tx;
-              _context2.t2 = jwk;
-              _context2.t3 = _tags;
-              _context2.t4 = data;
-              _context2.next = 14;
+              _context2.next = 9;
               return this.arweave.wallets.jwkToAddress(jwk);
-            case 14:
-              _context2.t5 = _context2.sent;
-              _context2.t6 = {
+            case 9:
+              owner = _context2.sent;
+              this.mem.addrmap[owner] = jwk.n;
+              _context2.next = 13;
+              return this.postTx(tx, jwk, {
                 recipient: "",
-                tags: _context2.t3,
-                data: _context2.t4,
-                owner: _context2.t5
-              };
-              _context2.next = 18;
-              return _context2.t0.postTx.call(_context2.t0, _context2.t1, _context2.t2, _context2.t6);
-            case 18:
+                tags: _tags,
+                data: data,
+                owner: owner
+              });
+            case 13:
               return _context2.abrupt("return", _context2.sent);
-            case 19:
+            case 14:
             case "end":
               return _context2.stop();
           }
@@ -156,7 +151,7 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "postItem",
     value: function () {
       var _postItem = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item, jwk) {
-        var tx, di, rowner, hashBuffer, owner, data, _item;
+        var tx, di, data_size, data_type, _iterator2, _step2, t, rowner, hashBuffer, owner, data, _item;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -169,19 +164,39 @@ var AR = /*#__PURE__*/function (_MAR) {
               tx.addTag("Bundle-Format", "binary");
               tx.addTag("Bundle-Version", "2.0.0");
               di = new _warpArbundles.DataItem(item.raw);
+              data_size = Buffer.byteLength(di.rawData).toString();
+              data_type = "";
+              _iterator2 = _createForOfIteratorHelper(di.tags);
+              try {
+                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                  t = _step2.value;
+                  if (t.name === "Content-Type") data_type = t.value;
+                }
+              } catch (err) {
+                _iterator2.e(err);
+              } finally {
+                _iterator2.f();
+              }
               rowner = di.rawOwner;
               _context3.t0 = Buffer;
-              _context3.next = 10;
+              _context3.next = 14;
               return crypto.subtle.digest("SHA-256", rowner);
-            case 10:
+            case 14:
               _context3.t1 = _context3.sent;
               hashBuffer = _context3.t0.from.call(_context3.t0, _context3.t1);
               owner = _base64url["default"].encode(hashBuffer);
+              this.mem.addrmap[owner] = di.owner;
               data = di.data;
               try {
                 data = _base64url["default"].decode(di.data);
               } catch (e) {}
               _item = {
+                _data: {
+                  size: data_size,
+                  type: data_type
+                },
+                anchor: di.anchor,
+                signature: di.signature,
                 recipient: di.target,
                 id: item.id,
                 item: di,
@@ -190,11 +205,11 @@ var AR = /*#__PURE__*/function (_MAR) {
                 data: data
               };
               this.mem.txs[item.id] = _item;
-              _context3.next = 19;
+              _context3.next = 24;
               return this.postTx(tx, jwk, _item);
-            case 19:
+            case 24:
               return _context3.abrupt("return", _context3.sent);
-            case 20:
+            case 25:
             case "end":
               return _context3.stop();
           }
@@ -209,7 +224,7 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "postTx",
     value: function () {
       var _postTx = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tx, jwk, item) {
-        var res, err, _last, block;
+        var res, err, _last, block, data_type, _iterator3, _step3, v, owner;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
@@ -228,19 +243,40 @@ var AR = /*#__PURE__*/function (_MAR) {
                 if (!item.id) {
                   item.id = tx.id;
                   this.mem.txs[item.id] = item;
-                  this.mem.txs[item.id].parent = {
-                    id: block.id
+                  this.mem.txs[item.id].parent = null;
+                  this.mem.txs[item.id].signature = tx.signature;
+                  this.mem.txs[item.id].anchor = tx.last_tx;
+                  data_type = "";
+                  _iterator3 = _createForOfIteratorHelper(tx.tags);
+                  try {
+                    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+                      v = _step3.value;
+                      if (v.get("name", {
+                        decode: true,
+                        string: true
+                      }) === "Content-Type") {
+                        data_type = v.get("value", {
+                          decode: true,
+                          string: true
+                        });
+                      }
+                    }
+                  } catch (err) {
+                    _iterator3.e(err);
+                  } finally {
+                    _iterator3.f();
+                  }
+                  this.mem.txs[item.id]._data = {
+                    size: tx.data_size,
+                    type: data_type
                   };
                 } else {
                   this.mem.txs[item.id].parent = {
-                    id: ""
+                    id: block.id
                   };
                 }
                 block.txs = [item.id];
                 this.mem.txs[item.id].block = block.id;
-                this.mem.txs[item.id].parent = {
-                  id: block.id
-                };
                 this.mem.blocks.push(block.id);
                 this.mem.blockmap[block.id] = block;
               }
@@ -249,12 +285,17 @@ var AR = /*#__PURE__*/function (_MAR) {
                 status: 200,
                 statusText: "200"
               };
+              _context4.next = 7;
+              return this.arweave.wallets.jwkToAddress(jwk);
+            case 7:
+              owner = _context4.sent;
+              this.mem.addrmap[owner] = jwk.n;
               return _context4.abrupt("return", {
                 res: res,
                 err: err,
                 id: tx.id
               });
-            case 6:
+            case 10:
             case "end":
               return _context4.stop();
           }

package/cjs/tgql.js

@@ -348,27 +348,27 @@ var GQL = exports["default"] = /*#__PURE__*/function () {
             case 91:
               _tx = _objectSpread(_objectSpread({
                 cursor: tx.id
-              }, tx), {}, {
+              }, tx), {}, _defineProperty({
+                data: tx._data,
                 block: (0, _ramda.pick)(["id", "timestamp", "height", "previous"], block),
                 anchor: (_tx$anchor = tx.anchor) !== null && _tx$anchor !== void 0 ? _tx$anchor : "",
                 signature: (_tx$signature = tx.signature) !== null && _tx$signature !== void 0 ? _tx$signature : "",
                 owner: {
                   address: tx.owner,
-                  key: ""
+                  key: this.mem.addrmap[tx.owner]
                 },
                 fee: {
-                  ar: 0,
-                  winston: 0
+                  ar: "0",
+                  winston: "0"
                 },
                 quantity: {
-                  ar: 0,
-                  winston: 0
-                },
-                data: {
-                  size: 0,
-                  type: ""
+                  ar: "0",
+                  winston: "0"
                 }
-              });
+              }, "data", {
+                size: "0",
+                type: ""
+              }));
               if (!(0, _ramda.isNil)(opt.fields)) {
                 _tx2 = {
                   cursor: tx.id

package/esm/.cache/opt.json

@@ -1 +1 @@
-{"ar":{"port":4000},"jwk":{"kty":"RSA","n":"vAiSYEBIogdeHhE1c-WoZOrrpsqing6sDQffTJYI7v2Hik7WkjhtxoXH3xlWk-dfUUXdntGEoaU9cBIdBz4EczxIkvBZ0e2bJQgDrZfbuQgy7RMdcvvCDQYXhQqF_DkmCbxDjpnP_W_Z3wL_7Sil5Ru5Jj_M_c6cyODuOiv8WZUZRi1KCoSuUVZr6dgiqGmzU_tBtZgoEtStKb29RHtT0PgpktWTYTk1nHWpOrA0mJMivrDdLmLfexFe_bPpZp-cW9MxOzbdj_jG3VpZE6iT6z-g2H2sQC2xROCvYMrhu2JrV447gOT81PKPw4sUw1aPE17GKg45p58aaa1c28-c0o_VF4CsgKh7SCURWpY0BUvWfw4tJX1l0CCu7OxdDT0pLzagy5mGke0vz-eQH_NEUeAyjqTzV_42WoTEisyGvR1wD9iEd_JKjJBWVII5fbZH3cMB3FDvgNaZRfCMNKQPMdF7evBUEXW0RwVF3Il5TfbIGmLQN01QV_U6L2XdZT69BESRHehUT0W5JM5Og1m9-Kn8ZKN1yL5XifpiGsZlGP5rNw1uKKMLopCAuYzngwjQq-nM-TrGXxlFFuX-L3tc3I8MdNXpTkdXT8xpUetVZrZ2W2oUfSpl8Bp4DvSkqIYssjbxQjMO7KNRO5HvTrWj9iMtuQLST5ooVvEdVmgTDOs","e":"AQAB","d":"U1MxGnoiNbsyF_zkRRG2h9Iaz3Toj0ZNNBETAStTliS_lajOKUncS6cpJVJjLXPQp4FgbmrGbaN-EFXWi0kOS8qhFoxwITk8ETL1_k1XTy20854O5M9v9LmIXqqFKXphwtqszVqX8uVIFS2NIBltOpQIfkyzmJ2gmNwkdZ7cWw5ZfuG-995IKT803xGqehstHsAvJDvjNkUM33x3jQth3y65rZn7j4_8k_MIJTvEcwBw2zQhL9cc1bqi76Z0fcepUH_MR0NO9-f0qE7LPozrz8oIiydV17Ln5W_0B96gHZvFma0r7TiMWgmLb8oIT2_iQ2EyS5y2K_OzjrUGe1oLUfdj-M_gNgFCEsVDsJU7R3JdZp-oR5_D-wYs6uCs4NzkvgiF96zmx0Dnvw6p_eH_vgtZJeD7gBbtzfbKwqwG1IGA8f7qywcdmYSF5igGcyoYhwAUcXDIZSh_So6YdNxN5CVzknTHiPZaPHMSxjK4LZ3YiQj-ajuTefRZgviKFcArOBSkjL2VacleKBOH9PZci_1jaTQklaYVwHJD1K9aWEuF2Jc3_G7dVET2SANHeg2RPjPHAnsk4vt7ratL4ao7N1SsudoumFrJ429Hd6Hu01GDE2gq0RYmBXhAZwXJ7WtGv1kizEHR__ASLpbi21zk2vBnnAiQfrni3xu1wLq5K5E","p":"_gUpJCExeTkLcnp7spqLyMxAk_Rrbgeyec0ra19zGWLFbkIm-tmA1g0mRM18DrLHsO6LTz2_cVjolAs4KQW_3RNMXd2VxS4gWbdtA5kcJIemydayduwVeIf3HHhVzzCAbaJ2144Bnmqsgq3QC3aV36hH9QlBCR95OTzn50FCvR3ryH-A1YZKjADu5dQfsvXFie4vY3qvLSBiivYyXqqTYRExHjtSImaluFTzWa78-HHjLUCVeRbS4AfFxlG6XQEFTKZLuAnO0mth2_IcAHCVbKlXGSt377fQHEYmZ7xKuOw5eyt6abx7CTk_DRJRfgwonbFITfBQwLU2s7SAwBJd1w","q":"vX-_7SauLYNBRP_bRFEiXyf-gf0BAFVCP-hbkqhd6z2CybooIRibL6ZAJ26GPWhWxFlaCUXQhUSABWoroo5mlef9QK297jPz49ZKZcfuem32eo60ZGPNGSrBfhtHmQc8tIqDFHjdLKPBJIvxk4P1gwQwRonYyik9lVUQMJ_sL-rLjNQ7i4x-oKaV-YsUhuBv9zaBD7H00jihWBPSYBX809N0hAXeJXLNwMoLZnmDLl1OJg0VccIuYLTaczT0j_BSULI6VTVifyUHppJntX1WkL0x6bjT25N9bXlwMPFvXi8DRKpaosgJHEUYRrlAbG1VoPdDGN-aqCSlzAIRSwrfDQ","dp":"hkqGKIKf3B1rTtcwBAkuMzbAQTfrf5z0Hu53sOkiOV59T8ALSXypXwBOpfsYRdEAPyqtXXQgfLTrKDESPKW8fAzSx6D4p-it06BkMo3EUg-g_n3RlYtUAoem_Vckzkcu7kcAmw6JDo4Iq4FmRlkn_LjDaei9iCwqczcexqQ6uy5RU4sMulWnnYJ0ye4t3_eMulHAnc_jQnEnh52GnYOCLMPg-sGTt3oazGukx1n6hQH4fxjwrLaDP0r8pM7aPobmnVIhH6eXvqhkcNn7McRTSsHvuO_BFWtQy1HOxfLGciL4dIRU0AeD6ClqiuePS5rz8gIiXonYtzhWNgUMN_69uw","dq":"aN5FrEv3oCA_ApxFD62Gw_oyEmWdJD4Kh6ti4epi70f_FPv8MTSYzOnIHwo_J8SSH98CwJbuKpIZ9uUmeLMtelAECsMblLMTiUaRrXnTM9WezXwjwFqqqf7LTapzGPC0W4U7vRyV6ZpFzJ_VdLlWKMcsoByw6E-iUP3eE8qsvmfFdY4N1dBOU0FdRdf96BZUYA69pZ3pylykjUWK6rnATMl8dYN5yGecDdDCNleQjRv9n3kmIOpBGCt9qLvpi66HHzlCpt0AQTSQ41GqKvnN6hOJh7pNI_qfMvI9cBhsdUa3HEzaE7N3tzlVke37BQYMmSO88grsX5jIV_nc8BZ4EQ","qi":"8XcLLnE-6jPJURB3K-BNPBylUxXwQwEeMs4MX7tFXqxnnh2A23tVhOXESEb6PDkKe2Gql78B6_WrbtiTozV_-c6M0VjqGHRor62dBCvef9mUpiPUxkbflwlmcbqGTuiCNZyoZxR-8Pf0E2al2WxEkKeQjkplNHWt433A6hbx3rx8HsWAdM4RhY3LMsddGpFMc5gjm5PmTKo33uC15X16SmpC00SeVDnKaoiWWI3005RmMP2Wfago9XCTEwBsWeozQC7R2zI3CuW7jX3W6UeUYPoEeS3Qa0suCP4CqCbfNwstl-SQhWtm2IVBpbOZTDQ6e0cYUyyMGVh1AMCoehHMrw"},"module_sqlite":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","ao":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"},"ao2":{"module":"KCRP66Aq-4uQ7R556SgaNtzDNSnRJW4DA1m5sgxirDk","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"},"profile":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","registry_src":"maJGJ2tAa6zVtW1rGhngNlhEZDUqbCwO3r5mYxDBCsQ","registry":"yRmn7BZDk_c916ZNy8JBY-H52vYMrP8SBp-npeOgAbU","profile_src":"LNTKw-wvmybqSrxvtMYtdplOADLAey1c8FpNXoMa638","ao":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"}},"note":{"proxy":"0uUOLKRlt-4zume2JnSeIYFlSK6-5mH51kdj6o3Q4jw","note_src":"XmteOz1FGAFKGLRtVQo65-ggchiQJ1bJ7OrHueZDK8I","profile":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","registry_src":"maJGJ2tAa6zVtW1rGhngNlhEZDUqbCwO3r5mYxDBCsQ","registry":"yRmn7BZDk_c916ZNy8JBY-H52vYMrP8SBp-npeOgAbU","profile_src":"LNTKw-wvmybqSrxvtMYtdplOADLAey1c8FpNXoMa638","ao":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"}}},"notebook":{"notebook_src":"cAa0NBOgYfQPRH6DEcKxrLBm4QExws4FCKAyP-LHufg","registry":"EGVoxgKS9V4z6w21RJ9HiM3Q6TcwgwdwX8INSUTUuKE","registry_src":"6EX6wZ8RfUHbSfUvhU5Aby7q52czm0T-RckiOrIG4Wc","profile":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","registry_src":"maJGJ2tAa6zVtW1rGhngNlhEZDUqbCwO3r5mYxDBCsQ","registry":"yRmn7BZDk_c916ZNy8JBY-H52vYMrP8SBp-npeOgAbU","profile_src":"LNTKw-wvmybqSrxvtMYtdplOADLAey1c8FpNXoMa638","ao":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"}}},"asset":{"asset_src":"sZe0uqoLAlzFtFcATqERh_Jg3yvyJ-P1Fp7MstYUr8E","profile":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","registry_src":"maJGJ2tAa6zVtW1rGhngNlhEZDUqbCwO3r5mYxDBCsQ","registry":"yRmn7BZDk_c916ZNy8JBY-H52vYMrP8SBp-npeOgAbU","profile_src":"LNTKw-wvmybqSrxvtMYtdplOADLAey1c8FpNXoMa638","ao":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"}}},"collection":{"collection_src":"5MGgg1uHqI04MS7ZZNJSDYld2CqxyC9Aws08k4VZey0","registry":"EGVoxgKS9V4z6w21RJ9HiM3Q6TcwgwdwX8INSUTUuKE","registry_src":"6EX6wZ8RfUHbSfUvhU5Aby7q52czm0T-RckiOrIG4Wc","profile":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","registry_src":"maJGJ2tAa6zVtW1rGhngNlhEZDUqbCwO3r5mYxDBCsQ","registry":"yRmn7BZDk_c916ZNy8JBY-H52vYMrP8SBp-npeOgAbU","profile_src":"LNTKw-wvmybqSrxvtMYtdplOADLAey1c8FpNXoMa638","ao":{"module":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs","scheduler":"9uDpdXg7JjC8xonD61nylkcjA2QYIti7jqSKgxOuLWs","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"XztbUZU7D8lAcWlbg0avCD0s2lMBbFGgTC4YzLcOR90"}}},"modules":{"aos2":"KCRP66Aq-4uQ7R556SgaNtzDNSnRJW4DA1m5sgxirDk","aos1":"WpmAgOtIAWrtwyrMpWQv8bsINlFo9N8qu8lXng-Hjv0","sqlite":"I2E4Uu9bVmxCmXmfSfwQ3hOosbGRIKpF5qebATBylzs"}}
+{"ar":{"port":4000},"jwk":{"kty":"RSA","n":"tBba3N1KKiDvu4TnAd_lhYDBXs0QrLH4Hgd6mHTeovFvZDLZHlNukT9SXeHx1_58hQWtcIPvS6F9tASdpMREKMVkG9hb6nMXtUCkTJE7PURvqeJf5VGJt9rUBtYaaJ_8eVJ3w98_RqUR0k0rYsYcJqiFFYaSFG2mIbyP7lBSUifF0dsOI1j1IRlvhZ02BOD7LJpwycX-fsXq7DAbpC6ywkuQ0EU830f3DefhfCQRRreZiKKNHRVvKhe9Z8LTjtMWHcAotg5-lLWLVUT1fO5tUnVwcJ_fGGFtLC1RGjryGg2ZOykktpDuALvZrZd3psIGQPnpuF75QYTVSbiadCK_JOelt8xcwIUphYAeWJQ6BNBmA8afPvVhS6rma0zp30ChXLQJEgtRWm9FpI-DQaM9PPcDlupsDFmmBtZGj0fLSTcpf00i0gpoDVJWcBVrd5aBiks0rRNUWRgWHadWBfBskUCrA1DG99seZOKKL9qLIknK3c6cTO068JegbwAW51eEH-etaoAvZ5mmyIB7LHKEomOQjeobek5_7OChwA66cS882gbFc3CfX0QdQRWWrNJ84hm3_xgHG6VjQOWNTh751WrVe4PnlLPvqKt8u2It4ZIlBxri7JklRxLL4Y1xkuV1a3gKllLVWizULPFN8Dms_7hjGSk1N3UUV3Bv_oxlRTk","e":"AQAB","d":"BQo4tAKraMdrZIhhI9yXIoFw2ybXbYXWuq-dGJ3FfbKB2nOD2QUe7Iixobf8Wf4HKeMRSggfNWYlGIy8HrILC3sOt936IIytBq3ZWBBrPUxoTzOEv7jkjXuRAH0tPjojL8zR79ThHMIeeamFA9DyIiQINj4blRL5s140E8hpE8Ye-dls3JD73aIsTIVF6Qs-bEg8Mzr-_TkSJh8CJW07JBRHG4g8hMeRgr2d28JxcbtOQpRaz6Woat_am9Th5J1ETeI-IW40nUcBY1cFNpEm1RTW6Af8j3gDVqYQ0koBBlKhtBXZyOEAdo7-fHNNoW7_pTTfrudVh9ktIOpXxDuutR0tL57GPvq-GQHJM_wUyYJKPNI3LUzm0HK9W6UFjvCPmHqofw_PT8lgGswwY1isB9TLkuMOv_rcc7a2y2TtjxlHOuIkQXeNdhvcEX_aBUCzvhmWwKR3_MgFaUDCT5ax1leBtnC7ZdWroJSnvF-jGNn8yZqIs8i5llarkc4Ll-3TBwt7bTb4bFcYpWNhTWrIInw1fxQ2fbATGWgWGU-VH8urk8AxPCT4k3Oa3COacQcS_87BaEA8itddp3-rBYSXFVKR2J91_O5lzX65T-y646-oZmcJtSNax5l9_9ceakzTt861zNm9990kUcJ5YJI2w3hVmls-hQh-8lRX9U9RQns","p":"2af2yCQkk8zUNyAHxsnbfhRW2FIPB9poJsqQaxeqza05vyBqbQTnwOUdbFC4fkmMp-9YPAFMP9qcZEIenAcww3hMES9MKJiU3LvFlJ6Fm14HccigfcD9Tt8HED-8fxG-UqGj31N2BWkXbhX6V81SFDAc3DstlKc19Q2ls1RRkY-gn4kMBSQAQd-lsyMPfSIbQj5_iyXIWvkj7tnGoGKRXAzb_d3U00YVpQ4dxXZxEVO5FZnq3pUiYwZP08A5eAdQRsOI0wXWQikNRu2vplm98PToayfmvoWvPrLTJD8E2LpldD-m4eUL4GABjgeOII4t3WRiSmZSAK7aq4rvLxYoxw","q":"09CrtV1BO5CfYSq7w2gKEr-s5UHSxscr4TTbCdoG0XwiwPYX5N963LtswhS-rZaIrdoSPDyvNdTTrY9nHuV-KD8LbjU1CY7rzcA33Wv3QP-HEvoJmCdVB3tjKrW0ypx9hBNKTgjxq0u3-CS6sya1MHLZft0ijXBy5dzguA3OphhxXVHtgbJ2jd3DgjJbj7yocPrye2HMVhkputetYKjjcNg5BlMW6oTDUnFzVpO-bN2qPmOkzqCKPN1Cu8a-6_RcWUuqH5RgfxnL6ApM5ZMQztT3jrR64afZOYeDhz2po24uVcB48o_pl3qzlsKWW3whP2lBaKw23kwNf7i8jmch_w","dp":"b0VPBEJ18JlmZEgbsaTAcVQ0kaJhzMH7PNmRuy3-Q-eq_eq0fcdkM1juEdGyf91Z6wCROxvuvzYjfZ3PyDRk2YlGWgK0DIz0jWPxPmlMJIGNjL3kTmW7GfcqxUPQOaX4hoXcIO-qBloTgFP8B6cPrwJpvq0CQFy7WOwBKgyRJrkmhGirnHUrLIIJU-s4n-Avz03kJl7KbrevhwwOXzAE3-ozDTW698d8iUUOM0S5yQHkPQbS67eSPM2dQcOjnZkfkQ2lhTwWrPwPrZMVmRWH5QdPSni7ner6DDOffYg6EhI4i5V-2z0dNTffk5yJLFuDVwtatG5avb6mS8xbOtc5QQ","dq":"Q8Foa-ecylUE5qwoy-Un879kqyFXL0be_ndN6eTYcYJoC5mtIwVp49oAfETuidCxgAtV8fbnhSzDWa2ZqwR2SqGAIozanmgdff-S3z1-JkiXCLb7ArTyOiZ6HltprbZJYEpbZoLt64GZI8N8BXrIUusqL67FMsFZv7XcHIQuKmt_N_7RHr_btJ3PwIIjT-Nlbl6X2mf6WUBLXP1I9LaRqrM_6ooBtpspb-Hipzszmtd9cd-mBILONZIBmteEky3jrJzLmrZ397BkzaEd4AIfSkpNtlR9SlnK3uA-brCG50SDheK_zbfDXTVe5UbxmeonKIWe6sDL_GgPmV-a0WKkOQ","qi":"ri8WWvi1zib1qNyqXjFvsqi3AdgmH-QFt_cnx4F8vyeEd-4VPP9Ne6I-cr6-BtYJbfZSkpuBY9G7RLnRHnyY9nlbBPyP9mdJiBgs8f5-__2_pKhO5pvzRPCU-N-YLQH0NAKIYlSfWarObe84SW5Ds0OUb46WuoRGDqrLIokt2HxFi6uA_ZzuEvdmxZk9HWRRaPiKCif3uJfZtJ3_4WxpFvw-IYY3p8m3nt9qdU8EPhiZBEKdYdyAkHN6bIN9GbpUpUbEwYJXTCtqOgG4nuiWl8HWijk7QgcEO1gRG-pt4HzzFTa01BBIxdbelBii35uUoUVzco3dntUghotXOMGeCg"},"ao":{"module":"nrwqdbTzLYTALBkzLv9HwmF97b0eoGvlT3YwfJnyOjY","scheduler":"FKtGpY1kBbr8hBIocph3nMvadgBSQtQBTYnlAJetrDU","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"7WspynohDWhx3_Q37pzHmDGStf2T_p8ghdk_XTSUm8s"},"ao2":{"module":"9Xx6YzV2-giIaD8b9HTewr0FxRjugwm5FCuaQU-kJvI","scheduler":"FKtGpY1kBbr8hBIocph3nMvadgBSQtQBTYnlAJetrDU","aoconnect":{"MU_URL":"http://localhost:4002","CU_URL":"http://localhost:4004","GATEWAY_URL":"http://localhost:4000"},"ar":{"port":4000},"authority":"7WspynohDWhx3_Q37pzHmDGStf2T_p8ghdk_XTSUm8s"},"authority":"7WspynohDWhx3_Q37pzHmDGStf2T_p8ghdk_XTSUm8s","targets":{"profile":false,"note":false,"asset":false},"modules":{"aos2":"9Xx6YzV2-giIaD8b9HTewr0FxRjugwm5FCuaQU-kJvI","aos1":"MSCReWoRQ3w3JmPvbsTvPFnJrdzPym0F61cdBGEsBgs","sqlite":"nrwqdbTzLYTALBkzLv9HwmF97b0eoGvlT3YwfJnyOjY"}}

package/esm/aoconnect.js

@@ -1,5 +1,7 @@
 import { DataItem } from "warp-arbundles"
+import crypto from "crypto"
 import base64url from "base64url"
+
 import {
   tags,
   action,
@@ -121,6 +123,18 @@ export const connect = mem => {
       mem.modmap[mod] = { handle, id: mod }
     }
     if (!mod) throw Error("module not found")
+    opt.tags = buildTags(
+      null,
+      mergeLeft(tags(opt.tags ?? []), {
+        "Data-Protocol": "ao",
+        Variant: "ao.TN.1",
+        Type: "Process",
+        SDK: "aoconnect",
+        Module: opt.module,
+        Scheduler: opt.scheduler,
+        "Content-Type": "text/plain",
+      }),
+    )
     const _module = mem.modmap[mod]
     let ex = false
     opt.tags ??= []
@@ -137,8 +151,10 @@ export const connect = mem => {
     let memory = null
     let p = {
       id: id,
+      epochs: [],
       handle: _module.handle,
       module: _module.id,
+      hash: id,
       memory,
       owner,
       height: 0,
@@ -207,62 +223,38 @@ export const connect = mem => {
     return id
   }
 
-  const assign = async opt => {
-    const p = mem.env[opt.process]
-    let _opt = clone(mem.msgs[opt.message])
-    const { id, owner, item } = await ar.dataitem({
-      data: _opt.data,
-      signer: _opt.signer,
-      tags: tags(_opt.tags),
-      target: opt.process,
-    })
-    await ar.postItem(item, su.jwk)
-    try {
-      const msg = genMsg(
-        p,
-        _opt.data ?? "",
-        _opt.tags,
-        _opt.from ?? owner,
-        mu.addr,
-      )
-      const _env = genEnv({
-        pid: p.id,
-        owner: p.owner,
-        module: p.module,
-        auth: mu.addr,
-      })
-      const res = await p.handle(p.memory, msg, _env)
-      p.memory = res.Memory
-      delete res.Memory
-      p.res[id] = res
-      p.results.push(id)
-      p.txs.unshift({ id: id, ..._opt })
-      mem.msgs[id] = _opt
-      for (const v of res.Messages ?? []) {
-        if (mem.env[v.Target]) {
-          await message({
-            process: v.Target,
-            tags: v.Tags,
-            data: v.Data,
-            signer: mu.signer,
-            from: opt.process,
-          })
-        }
-      }
-      return id
-    } catch (e) {
-      console.log(e)
+  function genHashChain(previousHash, previousMessageId = null) {
+    const hasher = crypto.createHash("sha256")
+    hasher.update(Buffer.from(previousHash, "base64url"))
+    if (previousMessageId) {
+      hasher.update(Buffer.from(previousMessageId, "base64url"))
     }
-    return null
+    return base64url(hasher.digest())
   }
 
-  const message = async opt => {
+  const assign = async opt => {
     const p = mem.env[opt.process]
-    let ex = false
-    for (let v of opt.tags) if (v.name === "Type") ex = true
-
-    if (!ex) opt.tags.push({ name: "Type", value: "Message" })
-    const { item, id, owner } = await ar.dataitem({
+    let _opt = mem.msgs[opt.message]
+    let hash = genHashChain(p.hash, opt.message)
+    p.hash = hash
+    opt.tags = buildTags(
+      null,
+      mergeLeft(tags(opt.tags ?? []), {
+        Timestamp: Date.now(),
+        Epoch: p.epochs.length,
+        Nonce: "0",
+        "Data-Protocol": "ao",
+        Variant: "ao.TN.1",
+        SDK: "aoconnect",
+        Type: "Assignment",
+        "Block-Height": mem.height,
+        Process: opt.process,
+        Message: opt.message,
+        "Hash-Chain": hash,
+      }),
+    )
+    p.epochs.push([opt.id])
+    const { id, owner, item } = await ar.dataitem({
       data: opt.data,
       signer: opt.signer,
       tags: tags(opt.tags),
@@ -272,9 +264,9 @@ export const connect = mem => {
     try {
       const msg = genMsg(
         p,
-        opt.data ?? "",
-        opt.tags,
-        opt.from ?? owner,
+        _opt.data ?? "",
+        _opt.tags,
+        _opt.from ?? opt.from ?? owner,
         mu.addr,
       )
       const _env = genEnv({
@@ -286,10 +278,10 @@ export const connect = mem => {
       const res = await p.handle(p.memory, msg, _env)
       p.memory = res.Memory
       delete res.Memory
-      p.res[id] = res
-      p.results.push(id)
-      p.txs.unshift({ id: id, ...opt })
-      mem.msgs[id] = opt
+      p.res[opt.message] = res
+      p.results.push(opt.message)
+      p.txs.unshift({ id: opt.message, ...opt })
+      mem.msgs[opt.message] = _opt
       for (const v of res.Messages ?? []) {
         if (mem.env[v.Target]) {
           await message({
@@ -322,6 +314,7 @@ export const connect = mem => {
           })
         }
       }
+
       return id
     } catch (e) {
       console.log(e)
@@ -329,6 +322,36 @@ export const connect = mem => {
     return null
   }
 
+  const message = async opt => {
+    const p = mem.env[opt.process]
+    let ex = false
+    for (let v of opt.tags) if (v.name === "Type") ex = true
+    opt.tags = buildTags(
+      null,
+      mergeLeft(tags(opt.tags ?? []), {
+        "Data-Protocol": "ao",
+        Variant: "ao.TN.1",
+        Type: "Message",
+        SDK: "aoconnect",
+      }),
+    )
+    const { item, id, owner } = await ar.dataitem({
+      data: opt.data,
+      signer: opt.signer,
+      tags: tags(opt.tags),
+      target: opt.process,
+    })
+    await ar.postItem(item, su.jwk)
+    mem.msgs[id] = opt
+    await assign({
+      message: id,
+      process: opt.process,
+      from: owner,
+      signer: mu.signer,
+    })
+    return id
+  }
+
   return {
     message,
     unmonitor: async opt => {

package/esm/armem.js

@@ -11,6 +11,7 @@ export default class ArMem {
         : last(this.blockmap[last(this.blocks)].txs)
     }
     this.arweave.transactions.getPrice = () => 0
+    this.addrmap = {}
     this.txs = {}
     this.jwks = {}
     this.height = 0

package/esm/tar.js

@@ -30,11 +30,13 @@ class AR extends MAR {
     let tx = await this.arweave.createTransaction({ data: data })
     let _tags = buildTags(null, tags)
     for (const v of _tags) tx.addTag(v.name, v.value)
+    const owner = await this.arweave.wallets.jwkToAddress(jwk)
+    this.mem.addrmap[owner] = jwk.n
     return await this.postTx(tx, jwk, {
       recipient: "",
       tags: _tags,
       data,
-      owner: await this.arweave.wallets.jwkToAddress(jwk),
+      owner,
     })
   }
 
@@ -43,16 +45,23 @@ class AR extends MAR {
     tx.addTag("Bundle-Format", "binary")
     tx.addTag("Bundle-Version", "2.0.0")
     const di = new DataItem(item.raw)
+    const data_size = Buffer.byteLength(di.rawData).toString()
+    let data_type = ""
+    for (const t of di.tags) if (t.name === "Content-Type") data_type = t.value
     const rowner = di.rawOwner
     const hashBuffer = Buffer.from(
       await crypto.subtle.digest("SHA-256", rowner),
     )
     const owner = base64url.encode(hashBuffer)
+    this.mem.addrmap[owner] = di.owner
     let data = di.data
     try {
       data = base64url.decode(di.data)
     } catch (e) {}
     let _item = {
+      _data: { size: data_size, type: data_type },
+      anchor: di.anchor,
+      signature: di.signature,
       recipient: di.target,
       id: item.id,
       item: di,
@@ -69,28 +78,38 @@ class AR extends MAR {
     await this.mem.arweave.transactions.sign(tx, jwk)
     if (item) {
       this.mem.height += 1
-
       const block = {
         id: tx.id,
         timestamp: Date.now(),
         height: this.mem.height,
         previous: last(this.mem.blocks) ?? "",
       }
-
       if (!item.id) {
         item.id = tx.id
         this.mem.txs[item.id] = item
-        this.mem.txs[item.id].parent = { id: block.id }
+        this.mem.txs[item.id].parent = null
+        this.mem.txs[item.id].signature = tx.signature
+        this.mem.txs[item.id].anchor = tx.last_tx
+        let data_type = ""
+        for (const v of tx.tags) {
+          if (
+            v.get("name", { decode: true, string: true }) === "Content-Type"
+          ) {
+            data_type = v.get("value", { decode: true, string: true })
+          }
+        }
+        this.mem.txs[item.id]._data = { size: tx.data_size, type: data_type }
       } else {
-        this.mem.txs[item.id].parent = { id: "" }
+        this.mem.txs[item.id].parent = { id: block.id }
       }
       block.txs = [item.id]
       this.mem.txs[item.id].block = block.id
-      this.mem.txs[item.id].parent = { id: block.id }
       this.mem.blocks.push(block.id)
       this.mem.blockmap[block.id] = block
     }
     res = { id: tx.id, status: 200, statusText: "200" }
+    const owner = await this.arweave.wallets.jwkToAddress(jwk)
+    this.mem.addrmap[owner] = jwk.n
     return { res, err, id: tx.id }
   }
 

package/esm/tgql.js

@@ -127,13 +127,14 @@ export default class GQL {
         let _tx = {
           cursor: tx.id,
           ...tx,
+          data: tx._data,
           block: pick(["id", "timestamp", "height", "previous"], block),
           anchor: tx.anchor ?? "",
           signature: tx.signature ?? "",
-          owner: { address: tx.owner, key: "" },
-          fee: { ar: 0, winston: 0 },
-          quantity: { ar: 0, winston: 0 },
-          data: { size: 0, type: "" },
+          owner: { address: tx.owner, key: this.mem.addrmap[tx.owner] },
+          fee: { ar: "0", winston: "0" },
+          quantity: { ar: "0", winston: "0" },
+          data: { size: "0", type: "" },
         }
         if (!isNil(opt.fields)) {
           let _tx2 = { cursor: tx.id }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "",
   "main": "cjs/index.js",
   "module": "esm/index.js",