wao 0.4.1 → 0.4.3

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/test.js

@@ -16,6 +16,12 @@ Object.defineProperty(exports, "AR", {
     return _tar["default"];
   }
 });
+Object.defineProperty(exports, "Src", {
+  enumerable: true,
+  get: function get() {
+    return _helpers.Src;
+  }
+});
 Object.defineProperty(exports, "acc", {
   enumerable: true,
   get: function get() {
@@ -35,13 +41,31 @@ Object.defineProperty(exports, "cu", {
     return _accounts.cu;
   }
 });
+Object.defineProperty(exports, "fail", {
+  enumerable: true,
+  get: function get() {
+    return _helpers.fail;
+  }
+});
 Object.defineProperty(exports, "mu", {
   enumerable: true,
   get: function get() {
     return _accounts.mu;
   }
 });
+Object.defineProperty(exports, "ok", {
+  enumerable: true,
+  get: function get() {
+    return _helpers.ok;
+  }
+});
 exports.scheduler = void 0;
+Object.defineProperty(exports, "setup", {
+  enumerable: true,
+  get: function get() {
+    return _helpers.setup;
+  }
+});
 Object.defineProperty(exports, "su", {
   enumerable: true,
   get: function get() {
@@ -55,6 +79,7 @@ var _aoconnect = require("./aoconnect.js");
 var _tao = _interopRequireDefault(require("./tao.js"));
 var _tar = _interopRequireDefault(require("./tar.js"));
 var _utils = require("./utils.js");
+var _helpers = require("./helpers.js");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }

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/test.js

@@ -5,10 +5,24 @@ import { connect } from "./aoconnect.js"
 import AO from "./tao.js"
 import AR from "./tar.js"
 import { dirname } from "./utils.js"
-
+import { Src, setup, ok, fail } from "./helpers.js"
 const blueprint = async pkg => {
   return readFileSync(resolve(await dirname(), `lua/${pkg}.lua`), "utf8")
 }
 const scheduler = "GQ33BkPtZrqxA84vM8Zk-N2aO0toNNu_C-l-rawrBA"
 
-export { AO, AR, connect, acc, mu, su, cu, blueprint, scheduler }
+export {
+  AO,
+  AR,
+  connect,
+  acc,
+  mu,
+  su,
+  cu,
+  blueprint,
+  scheduler,
+  ok,
+  fail,
+  Src,
+  setup,
+}

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 }