wao 0.4.0 → 0.4.1

package/cjs/ao.js

@@ -658,7 +658,12 @@ var AO = /*#__PURE__*/function () {
                         return (0, _utils.wait)(1000);
                       case 6:
                         _context9.next = 8;
-                        return _this3.ar.txs(pid);
+                        return _this3.ar.gql.txs({
+                          recipient: pid,
+                          fields: ["id", "recipient", "tags", {
+                            owner: ["address"]
+                          }]
+                        });
                       case 8:
                         txs = _context9.sent;
                         ex = exRef(ref, txs);

package/cjs/aoconnect.js

@@ -405,7 +405,8 @@ var connect = exports.connect = function connect(mem) {
             return ar.dataitem({
               data: _opt.data,
               signer: _opt.signer,
-              tags: (0, _utils.tags)(_opt.tags)
+              tags: (0, _utils.tags)(_opt.tags),
+              target: opt.process
             });
           case 4:
             _yield$ar$dataitem3 = _context3.sent;
@@ -515,7 +516,8 @@ var connect = exports.connect = function connect(mem) {
             return ar.dataitem({
               data: opt.data,
               signer: opt.signer,
-              tags: (0, _utils.tags)(opt.tags)
+              tags: (0, _utils.tags)(opt.tags),
+              target: opt.process
             });
           case 7:
             _yield$ar$dataitem4 = _context4.sent;
@@ -844,7 +846,9 @@ var connect = exports.connect = function connect(mem) {
             case 0:
               p = mem.env[opt.process];
               _context10.next = 3;
-              return ar.dataitem(opt);
+              return ar.dataitem(_objectSpread(_objectSpread({}, opt), {}, {
+                target: opt.process
+              }));
             case 3:
               _yield$ar$dataitem5 = _context10.sent;
               id = _yield$ar$dataitem5.id;

package/cjs/ar.js

@@ -8,6 +8,7 @@ var _arweave2 = _interopRequireDefault(require("arweave"));
 var _arbundles = require("arbundles");
 var _utils = require("./utils.js");
 var _ramda = require("ramda");
+var _gql = _interopRequireDefault(require("./gql.js"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -38,13 +39,16 @@ var AR = /*#__PURE__*/function () {
       port: port,
       protocol: protocol
     };
-    if (!_arweave.host) _arweave.host = port === 443 ? "arweave.net" : "127.0.0.1";
+    if (!_arweave.host) _arweave.host = port === 443 ? "arweave.net" : "localhost";
     if (!_arweave.protocol) _arweave.protocol = (0, _utils.isLocalhost)(_arweave.host) ? "http" : "https";
     if (!_arweave.port) _arweave.port = (0, _utils.isLocalhost)(_arweave.host) ? 1984 : 443;
     this.port = _arweave.port;
     this.host = _arweave.host;
     this.protocol = _arweave.protocol;
     this.arweave = _arweave2["default"].init(_arweave);
+    this.gql = new _gql["default"]({
+      url: "".concat(_arweave.protocol, "://").concat(_arweave.host, ":").concat(_arweave.port, "/graphql")
+    });
   }
   return _createClass(AR, [{
     key: "isArConnect",
@@ -695,29 +699,35 @@ var AR = /*#__PURE__*/function () {
     key: "tx",
     value: function () {
       var _tx = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(txid) {
-        var _json$data$transactio;
-        var json;
+        var _yield$this$gql$txs$;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
               _context12.next = 2;
-              return fetch("".concat(this.protocol, "://").concat(this.host, ":").concat(this.port, "/graphql"), {
-                method: "POST",
-                headers: {
-                  "Content-Type": "application/json"
-                },
-                body: JSON.stringify({
-                  query: (0, _utils.query)(txid)
-                })
-              }).then(function (r) {
-                return r.json();
+              return this.gql.txs({
+                id: txid
               });
             case 2:
-              json = _context12.sent;
-              return _context12.abrupt("return", (_json$data$transactio = json.data.transactions.edges.map(function (v) {
-                return v.node;
-              })[0]) !== null && _json$data$transactio !== void 0 ? _json$data$transactio : null);
-            case 4:
+              _context12.t1 = _yield$this$gql$txs$ = _context12.sent[0];
+              _context12.t0 = _context12.t1 !== null;
+              if (!_context12.t0) {
+                _context12.next = 6;
+                break;
+              }
+              _context12.t0 = _yield$this$gql$txs$ !== void 0;
+            case 6:
+              if (!_context12.t0) {
+                _context12.next = 10;
+                break;
+              }
+              _context12.t2 = _yield$this$gql$txs$;
+              _context12.next = 11;
+              break;
+            case 10:
+              _context12.t2 = null;
+            case 11:
+              return _context12.abrupt("return", _context12.t2);
+            case 12:
             case "end":
               return _context12.stop();
           }
@@ -728,66 +738,30 @@ var AR = /*#__PURE__*/function () {
       }
       return tx;
     }()
-  }, {
-    key: "txs",
-    value: function () {
-      var _txs = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(to) {
-        var json;
-        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
-          while (1) switch (_context13.prev = _context13.next) {
-            case 0:
-              _context13.next = 2;
-              return fetch("".concat(this.protocol, "://").concat(this.host, ":").concat(this.port, "/graphql"), {
-                method: "POST",
-                headers: {
-                  "Content-Type": "application/json"
-                },
-                body: JSON.stringify({
-                  query: (0, _utils.queries)(to)
-                })
-              }).then(function (r) {
-                return r.json();
-              });
-            case 2:
-              json = _context13.sent;
-              return _context13.abrupt("return", json.data.transactions.edges.map(function (v) {
-                return v.node;
-              }));
-            case 4:
-            case "end":
-              return _context13.stop();
-          }
-        }, _callee13, this);
-      }));
-      function txs(_x15) {
-        return _txs.apply(this, arguments);
-      }
-      return txs;
-    }()
   }, {
     key: "data",
     value: function () {
-      var _data = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee14(txid) {
+      var _data = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(txid) {
         var string,
-          _args14 = arguments;
-        return _regeneratorRuntime().wrap(function _callee14$(_context14) {
-          while (1) switch (_context14.prev = _context14.next) {
+          _args13 = arguments;
+        return _regeneratorRuntime().wrap(function _callee13$(_context13) {
+          while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              string = _args14.length > 1 && _args14[1] !== undefined ? _args14[1] : false;
-              _context14.next = 3;
+              string = _args13.length > 1 && _args13[1] !== undefined ? _args13[1] : false;
+              _context13.next = 3;
               return this.arweave.transactions.getData(txid, {
                 decode: true,
                 string: string
               });
             case 3:
-              return _context14.abrupt("return", _context14.sent);
+              return _context13.abrupt("return", _context13.sent);
             case 4:
             case "end":
-              return _context14.stop();
+              return _context13.stop();
           }
-        }, _callee14, this);
+        }, _callee13, this);
       }));
-      function data(_x16) {
+      function data(_x15) {
         return _data.apply(this, arguments);
       }
       return data;

package/cjs/armem.js

@@ -19,14 +19,16 @@ var ArMem = exports["default"] = /*#__PURE__*/_createClass(function ArMem() {
   this.__type__ = "mem";
   this.arweave = _arweave["default"].init();
   this.arweave.transactions.getTransactionAnchor = function () {
-    return _this.blocks.length === 0 ? "" : (0, _ramda.last)(_this.blocks);
+    return _this.blocks.length === 0 ? "" : (0, _ramda.last)(_this.blockmap[(0, _ramda.last)(_this.blocks)].txs);
   };
   this.arweave.transactions.getPrice = function () {
     return 0;
   };
   this.txs = {};
+  this.jwks = {};
   this.height = 0;
   this.blocks = [];
+  this.blockmap = {};
   this.env = {};
   this.modules = {
     aos2_0_1: "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM",

package/cjs/tar.js

@@ -10,11 +10,13 @@ var _utils = require("./utils.js");
 var _warpArbundles = require("warp-arbundles");
 var _base64url = _interopRequireDefault(require("base64url"));
 var _armem = _interopRequireDefault(require("./armem.js"));
+var _tgql = _interopRequireDefault(require("./tgql.js"));
+var _ramda = require("ramda");
 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 _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
+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); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -43,82 +45,52 @@ var AR = /*#__PURE__*/function (_MAR) {
     })]);
     _this.in_memory = true;
     _this.mem = (_opt$mem = opt.mem) !== null && _opt$mem !== void 0 ? _opt$mem : new _armem["default"]();
+    _this.gql = new _tgql["default"]({
+      mem: _this.mem
+    });
+    _this.arweave = _this.mem.arweave;
     return _this;
   }
   _inherits(AR, _MAR);
   return _createClass(AR, [{
-    key: "txs",
+    key: "dataitem",
     value: function () {
-      var _txs2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(pid) {
-        var _txs, _iterator, _step, v;
+      var _dataitem = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
+        var _ref$target, target, _ref$data, data, _ref$tags, tags, signer, _tags, item, di, raw_owner, hashBuffer, owner;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
-              _txs = [];
-              _iterator = _createForOfIteratorHelper(this.mem.env[pid].txs);
-              try {
-                for (_iterator.s(); !(_step = _iterator.n()).done;) {
-                  v = _step.value;
-                  _txs.push({
-                    tags: v.tags,
-                    id: v.id
-                  });
-                }
-              } catch (err) {
-                _iterator.e(err);
-              } finally {
-                _iterator.f();
-              }
-              return _context.abrupt("return", _txs);
-            case 4:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee, this);
-      }));
-      function txs(_x) {
-        return _txs2.apply(this, arguments);
-      }
-      return txs;
-    }()
-  }, {
-    key: "dataitem",
-    value: function () {
-      var _dataitem = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref) {
-        var _ref$data, data, _ref$tags, tags, signer, _tags, item, di, raw_owner, hashBuffer, owner;
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-          while (1) switch (_context2.prev = _context2.next) {
-            case 0:
-              _ref$data = _ref.data, data = _ref$data === void 0 ? "1984" : _ref$data, _ref$tags = _ref.tags, tags = _ref$tags === void 0 ? {} : _ref$tags, signer = _ref.signer;
+              _ref$target = _ref.target, target = _ref$target === void 0 ? "" : _ref$target, _ref$data = _ref.data, data = _ref$data === void 0 ? "1984" : _ref$data, _ref$tags = _ref.tags, tags = _ref$tags === void 0 ? {} : _ref$tags, signer = _ref.signer;
               _tags = (0, _utils.buildTags)(tags);
-              _context2.next = 4;
+              _context.next = 4;
               return signer({
                 data: data,
-                tags: _tags
+                tags: _tags,
+                target: target
               });
             case 4:
-              item = _context2.sent;
+              item = _context.sent;
               di = new _warpArbundles.DataItem(item.raw);
               raw_owner = di.rawOwner;
-              _context2.t0 = Buffer;
-              _context2.next = 10;
+              _context.t0 = Buffer;
+              _context.next = 10;
               return crypto.subtle.digest("SHA-256", raw_owner);
             case 10:
-              _context2.t1 = _context2.sent;
-              hashBuffer = _context2.t0.from.call(_context2.t0, _context2.t1);
+              _context.t1 = _context.sent;
+              hashBuffer = _context.t0.from.call(_context.t0, _context.t1);
               owner = _base64url["default"].encode(hashBuffer);
-              return _context2.abrupt("return", {
+              return _context.abrupt("return", {
                 id: item.id,
                 owner: owner,
                 item: item
               });
             case 14:
             case "end":
-              return _context2.stop();
+              return _context.stop();
           }
-        }, _callee2);
+        }, _callee);
       }));
-      function dataitem(_x2) {
+      function dataitem(_x) {
         return _dataitem.apply(this, arguments);
       }
       return dataitem;
@@ -126,46 +98,56 @@ var AR = /*#__PURE__*/function (_MAR) {
   }, {
     key: "post",
     value: function () {
-      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref2) {
-        var _ref2$data, data, _ref2$tags, tags, jwk, tx, _tags, _iterator2, _step2, v;
-        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
-          while (1) switch (_context3.prev = _context3.next) {
+      var _post = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+        var _ref2$data, data, _ref2$tags, tags, jwk, tx, _tags, _iterator, _step, v;
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _ref2$data = _ref2.data, data = _ref2$data === void 0 ? "1984" : _ref2$data, _ref2$tags = _ref2.tags, tags = _ref2$tags === void 0 ? {} : _ref2$tags, jwk = _ref2.jwk;
-              _context3.next = 3;
+              _context2.next = 3;
               return this.arweave.createTransaction({
                 data: data
               });
             case 3:
-              tx = _context3.sent;
+              tx = _context2.sent;
               _tags = (0, _utils.buildTags)(null, tags);
-              _iterator2 = _createForOfIteratorHelper(_tags);
+              _iterator = _createForOfIteratorHelper(_tags);
               try {
-                for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                  v = _step2.value;
+                for (_iterator.s(); !(_step = _iterator.n()).done;) {
+                  v = _step.value;
                   tx.addTag(v.name, v.value);
                 }
               } catch (err) {
-                _iterator2.e(err);
+                _iterator.e(err);
               } finally {
-                _iterator2.f();
+                _iterator.f();
               }
-              this.mem.height += 1;
-              _context3.next = 10;
-              return this.postTx(tx, jwk, {
-                height: this.mem.height,
-                tags: _tags,
-                data: data
-              });
-            case 10:
-              return _context3.abrupt("return", _context3.sent);
-            case 11:
+              _context2.t0 = this;
+              _context2.t1 = tx;
+              _context2.t2 = jwk;
+              _context2.t3 = _tags;
+              _context2.t4 = data;
+              _context2.next = 14;
+              return this.arweave.wallets.jwkToAddress(jwk);
+            case 14:
+              _context2.t5 = _context2.sent;
+              _context2.t6 = {
+                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:
+              return _context2.abrupt("return", _context2.sent);
+            case 19:
             case "end":
-              return _context3.stop();
+              return _context2.stop();
           }
-        }, _callee3, this);
+        }, _callee2, this);
       }));
-      function post(_x3) {
+      function post(_x2) {
         return _post.apply(this, arguments);
       }
       return post;
@@ -173,53 +155,52 @@ var AR = /*#__PURE__*/function (_MAR) {
   }, {
     key: "postItem",
     value: function () {
-      var _postItem = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(item, jwk) {
-        var tx, di, rowner, hashBuffer, owner, data;
-        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
-          while (1) switch (_context4.prev = _context4.next) {
+      var _postItem = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item, jwk) {
+        var tx, di, rowner, hashBuffer, owner, data, _item;
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+          while (1) switch (_context3.prev = _context3.next) {
             case 0:
-              _context4.next = 2;
+              _context3.next = 2;
               return this.mem.arweave.createTransaction({
                 data: item.raw
-              });
+              }, jwk);
             case 2:
-              tx = _context4.sent;
+              tx = _context3.sent;
               tx.addTag("Bundle-Format", "binary");
               tx.addTag("Bundle-Version", "2.0.0");
               di = new _warpArbundles.DataItem(item.raw);
               rowner = di.rawOwner;
-              _context4.t0 = Buffer;
-              _context4.next = 10;
+              _context3.t0 = Buffer;
+              _context3.next = 10;
               return crypto.subtle.digest("SHA-256", rowner);
             case 10:
-              _context4.t1 = _context4.sent;
-              hashBuffer = _context4.t0.from.call(_context4.t0, _context4.t1);
+              _context3.t1 = _context3.sent;
+              hashBuffer = _context3.t0.from.call(_context3.t0, _context3.t1);
               owner = _base64url["default"].encode(hashBuffer);
-              this.mem.height += 1;
               data = di.data;
               try {
                 data = _base64url["default"].decode(di.data);
               } catch (e) {}
-              this.mem.txs[item.id] = {
+              _item = {
+                recipient: di.target,
                 id: item.id,
                 item: di,
                 owner: owner,
-                height: this.mem.height,
                 tags: di.tags,
                 data: data
               };
-              this.mem.blocks.push(item.id);
-              _context4.next = 20;
-              return this.postTx(tx, jwk);
+              this.mem.txs[item.id] = _item;
+              _context3.next = 19;
+              return this.postTx(tx, jwk, _item);
+            case 19:
+              return _context3.abrupt("return", _context3.sent);
             case 20:
-              return _context4.abrupt("return", _context4.sent);
-            case 21:
             case "end":
-              return _context4.stop();
+              return _context3.stop();
           }
-        }, _callee4, this);
+        }, _callee3, this);
       }));
-      function postItem(_x4, _x5) {
+      function postItem(_x3, _x4) {
         return _postItem.apply(this, arguments);
       }
       return postItem;
@@ -227,39 +208,59 @@ var AR = /*#__PURE__*/function (_MAR) {
   }, {
     key: "postTx",
     value: function () {
-      var _postTx = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(tx, jwk, item) {
-        var res, err;
-        return _regeneratorRuntime().wrap(function _callee5$(_context5) {
-          while (1) switch (_context5.prev = _context5.next) {
+      var _postTx = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4(tx, jwk, item) {
+        var res, err, _last, block;
+        return _regeneratorRuntime().wrap(function _callee4$(_context4) {
+          while (1) switch (_context4.prev = _context4.next) {
             case 0:
               res = null, err = null;
-              _context5.next = 3;
+              _context4.next = 3;
               return this.mem.arweave.transactions.sign(tx, jwk);
             case 3:
               if (item) {
-                if (!item.id) item.id = tx.id;
-                this.mem.txs[item.id] = item;
-                this.mem.blocks.push(item.id);
+                this.mem.height += 1;
+                block = {
+                  id: tx.id,
+                  timestamp: Date.now(),
+                  height: this.mem.height,
+                  previous: (_last = (0, _ramda.last)(this.mem.blocks)) !== null && _last !== void 0 ? _last : ""
+                };
+                if (!item.id) {
+                  item.id = tx.id;
+                  this.mem.txs[item.id] = item;
+                  this.mem.txs[item.id].parent = {
+                    id: block.id
+                  };
+                } else {
+                  this.mem.txs[item.id].parent = {
+                    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"
               };
-              //res = await this.arweave.transactions.post(tx)
-              //if (res.status !== 200) err = res.statusText
-              return _context5.abrupt("return", {
+              return _context4.abrupt("return", {
                 res: res,
                 err: err,
                 id: tx.id
               });
             case 6:
             case "end":
-              return _context5.stop();
+              return _context4.stop();
           }
-        }, _callee5, this);
+        }, _callee4, this);
       }));
-      function postTx(_x6, _x7, _x8) {
+      function postTx(_x5, _x6, _x7) {
         return _postTx.apply(this, arguments);
       }
       return postTx;