wao 0.40.2 → 0.41.1

package/cjs/bar.js

@@ -12,8 +12,12 @@ var _base64url = _interopRequireDefault(require("base64url"));
 var _tgql = _interopRequireDefault(require("./tgql.js"));
 var _ramda = require("ramda");
 var _WarpArBundles$defaul;
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t30 in e) "default" !== _t30 && {}.hasOwnProperty.call(e, _t30) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t30)) && (i.get || i.set) ? o(f, _t30, i) : f[_t30] = e[_t30]); return f; })(e, t); }
+function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t31 in e) "default" !== _t31 && {}.hasOwnProperty.call(e, _t31) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t31)) && (i.get || i.set) ? o(f, _t31, i) : f[_t31] = e[_t31]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
+function _toConsumableArray(r) { return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArray(r) { if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r); }
+function _arrayWithoutHoles(r) { if (Array.isArray(r)) return _arrayLikeToArray(r); }
 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 _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i["return"]) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
 function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); } r ? i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2)); }, _regeneratorDefine2(e, r, n, t); }
@@ -63,7 +67,7 @@ function parseSignatureInput(input) {
 }
 var AR = /*#__PURE__*/function (_MAR) {
   function AR() {
-    var _opt$mem;
+    var _opt$mem, _opt$batchWindow;
     var _this;
     var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, AR);
@@ -77,6 +81,10 @@ var AR = /*#__PURE__*/function (_MAR) {
       mem: _this.mem
     });
     _this.arweave = _this.mem.arweave;
+    // Block batching (DB path only)
+    _this._pendingBatch = [];
+    _this._flushTimer = null;
+    _this._batchWindow = (_opt$batchWindow = opt.batchWindow) !== null && _opt$batchWindow !== void 0 ? _opt$batchWindow : 0; // ms, 0 = disabled
     return _this;
   }
   _inherits(AR, _MAR);
@@ -270,41 +278,84 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "postItems",
     value: function () {
       var _postItems = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(items, jwk) {
-        var err, _yield$this$checkWall2, _items, _iterator2, _step2, di, data_size, data_type, _iterator3, _step3, _t8, owner, _item, bundle, tx, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18;
+        var _err, _yield$this$checkWall2, _bundle, _tx, err, _yield$this$checkWall3, _items, _iterator2, _step2, _this$mem$db, _this$mem$db2, di, data_size, data_type, _iterator3, _step3, _t8, owner, _item, bundle, tx, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19;
         return _regenerator().w(function (_context5) {
           while (1) switch (_context5.p = _context5.n) {
             case 0:
-              err = null;
+              if (!this.mem._remote) {
+                _context5.n = 6;
+                break;
+              }
+              _err = null;
               _context5.n = 1;
               return this.checkWallet({
                 jwk: jwk
               });
             case 1:
               _yield$this$checkWall2 = _context5.v;
-              err = _yield$this$checkWall2.err;
+              _err = _yield$this$checkWall2.err;
               jwk = _yield$this$checkWall2.jwk;
-              if (!err) {
+              if (!_err) {
                 _context5.n = 2;
                 break;
               }
               return _context5.a(2, {
-                err: err
+                err: _err
               });
             case 2:
+              if (!(0, _ramda.is)(Array, items)) items = [items];
+              _context5.n = 3;
+              return (0, _arbundles.bundleAndSignData)(items, new _arbundles.ArweaveSigner(jwk));
+            case 3:
+              _bundle = _context5.v;
+              _context5.n = 4;
+              return this.mem.arweave.createTransaction({
+                data: _bundle.binary
+              }, jwk);
+            case 4:
+              _tx = _context5.v;
+              _tx.addTag("Bundle-Format", "binary");
+              _tx.addTag("Bundle-Version", "2.0.0");
+              _context5.n = 5;
+              return this.postTx(_tx, jwk, items.map(function (i) {
+                return {
+                  id: i.id
+                };
+              }));
+            case 5:
+              return _context5.a(2, _context5.v);
+            case 6:
+              err = null;
+              _context5.n = 7;
+              return this.checkWallet({
+                jwk: jwk
+              });
+            case 7:
+              _yield$this$checkWall3 = _context5.v;
+              err = _yield$this$checkWall3.err;
+              jwk = _yield$this$checkWall3.jwk;
+              if (!err) {
+                _context5.n = 8;
+                break;
+              }
+              return _context5.a(2, {
+                err: err
+              });
+            case 8:
               if (!(0, _ramda.is)(Array, items)) items = [items];
               _items = [];
               _iterator2 = _createForOfIteratorHelper(items);
-              _context5.p = 3;
+              _context5.p = 9;
               _iterator2.s();
-            case 4:
+            case 10:
               if ((_step2 = _iterator2.n()).done) {
-                _context5.n = 12;
+                _context5.n = 24;
                 break;
               }
               di = _step2.value;
-              _context5.n = 5;
+              _context5.n = 11;
               return di.id;
-            case 5:
+            case 11:
               di._id = _context5.v;
               data_size = Buffer.byteLength(di.rawData).toString();
               data_type = "";
@@ -319,84 +370,111 @@ var AR = /*#__PURE__*/function (_MAR) {
               } finally {
                 _iterator3.f();
               }
-              _context5.n = 6;
+              _context5.n = 12;
               return this.owner(di);
-            case 6:
+            case 12:
               owner = _context5.v;
-              _context5.n = 7;
+              _context5.n = 13;
               return this.mem.set({
                 key: di.owner,
                 address: owner
               }, "addrmap", owner);
-            case 7:
-              _t9 = {
+            case 13:
+              if (!((_this$mem$db = this.mem.db) !== null && _this$mem$db !== void 0 && _this$mem$db.d1WriteAddrmap)) {
+                _context5.n = 17;
+                break;
+              }
+              _context5.p = 14;
+              _context5.n = 15;
+              return this.mem.db.d1WriteAddrmap(owner, {
+                key: di.owner,
+                address: owner
+              });
+            case 15:
+              _context5.n = 17;
+              break;
+            case 16:
+              _context5.p = 16;
+              _t9 = _context5.v;
+            case 17:
+              _t0 = {
                 size: data_size,
                 type: data_type
               };
-              _t0 = di.anchor;
-              _t1 = di.signature;
-              _t10 = di.target;
-              _context5.n = 8;
+              _t1 = di.anchor;
+              _t10 = di.signature;
+              _t11 = di.target;
+              _context5.n = 18;
               return di.id;
-            case 8:
-              _t11 = _context5.v;
-              _t12 = di;
-              _t13 = owner;
-              _t14 = di.tags;
-              _t15 = di.data;
+            case 18:
+              _t12 = _context5.v;
+              _t13 = di;
+              _t14 = owner;
+              _t15 = di.tags;
+              _t16 = di.data;
               _item = {
-                _data: _t9,
-                anchor: _t0,
-                signature: _t1,
-                recipient: _t10,
-                id: _t11,
-                item: _t12,
-                owner: _t13,
-                tags: _t14,
-                data: _t15
+                _data: _t0,
+                anchor: _t1,
+                signature: _t10,
+                recipient: _t11,
+                id: _t12,
+                item: _t13,
+                owner: _t14,
+                tags: _t15,
+                data: _t16
               };
-              _t16 = this.mem;
-              _t17 = _item;
-              _context5.n = 9;
+              if (!(_item.data && (_this$mem$db2 = this.mem.db) !== null && _this$mem$db2 !== void 0 && _this$mem$db2.r2PutTxData)) {
+                _context5.n = 20;
+                break;
+              }
+              _context5.n = 19;
+              return this.mem.db.r2PutTxData(_item.id, _item.data);
+            case 19:
+              _item._r2_data = true;
+              _item.data = "";
+            case 20:
+              _t17 = this.mem;
+              _t18 = _item;
+              _context5.n = 21;
               return di.id;
-            case 9:
-              _context5.n = 10;
-              return _t16.set.call(_t16, _t17, "txs", _context5.v);
-            case 10:
+            case 21:
+              _context5.n = 22;
+              return _t17.set.call(_t17, _t18, "txs", _context5.v);
+            case 22:
               _items.push(_item);
-            case 11:
-              _context5.n = 4;
+            case 23:
+              _context5.n = 10;
               break;
-            case 12:
-              _context5.n = 14;
+            case 24:
+              _context5.n = 26;
               break;
-            case 13:
-              _context5.p = 13;
-              _t18 = _context5.v;
-              _iterator2.e(_t18);
-            case 14:
-              _context5.p = 14;
+            case 25:
+              _context5.p = 25;
+              _t19 = _context5.v;
+              _iterator2.e(_t19);
+            case 26:
+              _context5.p = 26;
               _iterator2.f();
-              return _context5.f(14);
-            case 15:
-              _context5.n = 16;
+              return _context5.f(26);
+            case 27:
+              _context5.n = 28;
               return (0, _arbundles.bundleAndSignData)(items, new _arbundles.ArweaveSigner(jwk));
-            case 16:
+            case 28:
               bundle = _context5.v;
-              _context5.n = 17;
+              _context5.n = 29;
               return this.mem.arweave.createTransaction({
                 data: bundle.binary
               }, jwk);
-            case 17:
+            case 29:
               tx = _context5.v;
               tx.addTag("Bundle-Format", "binary");
               tx.addTag("Bundle-Version", "2.0.0");
-              _context5.n = 18;
+              _context5.n = 30;
               return this.postTx(tx, jwk, _items);
-            case 18:
+            case 30:
               return _context5.a(2, _context5.v);
           }
-        }, _callee5, this, [[3, 13, 14, 15]]);
+        }, _callee5, this, [[14, 16], [9, 25, 26, 27]]);
       }));
       function postItems(_x5, _x6) {
         return _postItems.apply(this, arguments);
@@ -407,12 +485,22 @@ var AR = /*#__PURE__*/function (_MAR) {
     key: "postTx",
     value: function () {
       var _postTx = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(tx, jwk) {
-        var _last;
+        var _last,
+          _this$mem$db3,
+          _this$mem,
+          _this$mem$blocks,
+          _this$mem$db5,
+          _this2 = this;
         var items,
+          _err2,
+          _yield$this$checkWall4,
+          _res,
           err,
-          _yield$this$checkWall3,
+          _yield$this$checkWall5,
           res,
           height,
+          _this$mem$height,
+          previous,
           block,
           msg,
           _iterator4,
@@ -424,16 +512,20 @@ var AR = /*#__PURE__*/function (_MAR) {
           _iterator5,
           _step5,
           v,
+          slim,
           _tags,
           _iterator6,
           _step6,
           _v,
           __tags,
           _txs,
-          blocks,
+          _this$mem$db4,
           owner,
+          mainTx,
+          _iterator7,
+          _step7,
+          _item2,
           _args6 = arguments,
-          _t19,
           _t20,
           _t21,
           _t22,
@@ -442,30 +534,32 @@ var AR = /*#__PURE__*/function (_MAR) {
           _t25,
           _t26,
           _t27,
-          _t28,
-          _t29;
+          _t28;
         return _regenerator().w(function (_context6) {
           while (1) switch (_context6.p = _context6.n) {
             case 0:
               items = _args6.length > 2 && _args6[2] !== undefined ? _args6[2] : [];
-              err = null;
+              if (!this.mem._remote) {
+                _context6.n = 5;
+                break;
+              }
+              _err2 = null;
               _context6.n = 1;
               return this.checkWallet({
                 jwk: jwk
               });
             case 1:
-              _yield$this$checkWall3 = _context6.v;
-              err = _yield$this$checkWall3.err;
-              jwk = _yield$this$checkWall3.jwk;
-              if (!err) {
+              _yield$this$checkWall4 = _context6.v;
+              _err2 = _yield$this$checkWall4.err;
+              jwk = _yield$this$checkWall4.jwk;
+              if (!_err2) {
                 _context6.n = 2;
                 break;
               }
               return _context6.a(2, {
-                err: err
+                err: _err2
               });
             case 2:
-              res = null;
               if (tx.id) {
                 _context6.n = 3;
                 break;
@@ -474,58 +568,119 @@ var AR = /*#__PURE__*/function (_MAR) {
               return this.mem.arweave.transactions.sign(tx, jwk);
             case 3:
               _context6.n = 4;
-              return this.mem.get("height");
+              return this.mem._remote.postTx(tx);
             case 4:
-              _t19 = _context6.v;
-              height = _t19 + 1;
-              _context6.n = 5;
-              return this.mem.set(height, "height");
+              _res = _context6.v;
+              return _context6.a(2, {
+                res: {
+                  id: tx.id,
+                  status: 200
+                },
+                err: null,
+                id: tx.id
+              });
             case 5:
-              _t20 = tx.id;
-              _t21 = Date.now();
-              _t22 = height;
-              _t24 = _ramda.last;
+              err = null;
               _context6.n = 6;
-              return this.mem.get("blocks");
+              return this.checkWallet({
+                jwk: jwk
+              });
             case 6:
-              _t25 = _last = _t24(_context6.v);
-              _t23 = _t25 !== null;
-              if (!_t23) {
+              _yield$this$checkWall5 = _context6.v;
+              err = _yield$this$checkWall5.err;
+              jwk = _yield$this$checkWall5.jwk;
+              if (!err) {
                 _context6.n = 7;
                 break;
               }
-              _t23 = _last !== void 0;
+              return _context6.a(2, {
+                err: err
+              });
             case 7:
-              if (!_t23) {
+              res = null;
+              if (tx.id) {
                 _context6.n = 8;
                 break;
               }
-              _t26 = _last;
-              _context6.n = 9;
-              break;
+              _context6.n = 8;
+              return this.mem.arweave.transactions.sign(tx, jwk);
             case 8:
-              _t26 = "";
+              if (!this.mem._d1Ready) {
+                _context6.n = 10;
+                break;
+              }
+              // D1 ready: increment in-memory, flush every 10 txs
+              this.mem.height = ((_this$mem$height = this.mem.height) !== null && _this$mem$height !== void 0 ? _this$mem$height : 0) + 1;
+              height = this.mem.height;
+              if (!(height % 10 === 0)) {
+                _context6.n = 9;
+                break;
+              }
+              _context6.n = 9;
+              return this.mem.set(height, "height");
             case 9:
-              _t27 = _t26;
-              _t28 = [];
+              _context6.n = 12;
+              break;
+            case 10:
+              _context6.n = 11;
+              return this.mem.get("height");
+            case 11:
+              _t20 = _context6.v;
+              height = _t20 + 1;
+              _context6.n = 12;
+              return this.mem.set(height, "height");
+            case 12:
+              if (!this.mem._d1Ready) {
+                _context6.n = 13;
+                break;
+              }
+              _t21 = this.mem.lastBlockId || "";
+              _context6.n = 18;
+              break;
+            case 13:
+              _t23 = _ramda.last;
+              _context6.n = 14;
+              return this.mem.get("blocks");
+            case 14:
+              _t24 = _last = _t23(_context6.v);
+              _t22 = _t24 !== null;
+              if (!_t22) {
+                _context6.n = 15;
+                break;
+              }
+              _t22 = _last !== void 0;
+            case 15:
+              if (!_t22) {
+                _context6.n = 16;
+                break;
+              }
+              _t25 = _last;
+              _context6.n = 17;
+              break;
+            case 16:
+              _t25 = "";
+            case 17:
+              _t21 = _t25;
+            case 18:
+              previous = _t21;
               block = {
-                id: _t20,
-                timestamp: _t21,
-                height: _t22,
-                previous: _t27,
-                txs: _t28
+                id: tx.id,
+                timestamp: Date.now(),
+                height: height,
+                previous: previous,
+                txs: []
               };
               msg = null;
               if (!items) {
-                _context6.n = 16;
+                _context6.n = 25;
                 break;
               }
               _iterator4 = _createForOfIteratorHelper(items);
-              _context6.p = 10;
+              _context6.p = 19;
               _iterator4.s();
-            case 11:
+            case 20:
               if ((_step4 = _iterator4.n()).done) {
-                _context6.n = 13;
+                _context6.n = 22;
                 break;
               }
               item = _step4.value;
@@ -538,7 +693,7 @@ var AR = /*#__PURE__*/function (_MAR) {
               };
               _txs2.anchor = "";
               _tags2 = (0, _utils.tags)(item.tags);
-              if ((0, _ramda.includes)(_tags2.Type, ["Message", "Process", "Module", "Scheduler-Location", "Attestation", "Available"])) {
+              if ((0, _ramda.includes)(_tags2.Type, ["Message", "Process", "Module", "Scheduler-Location", "Scheduler-Transfer", "Attestation", "Available"])) {
                 msg = {
                   id: item.id,
                   type: _tags2.Type
@@ -559,25 +714,30 @@ var AR = /*#__PURE__*/function (_MAR) {
               }
               block.txs.push(item.id);
               _txs2.block = block.id;
-              _context6.n = 12;
-              return this.mem.set({
+              // Re-store item with parent/bundledIn/block, but drop the raw
+              // DataItem binary (item.item) to save space — data is in R2 or
+              // can be reconstructed from the wrapper bundle tx.
+              slim = _objectSpread(_objectSpread({}, _txs2), {}, {
                 bundle: tx.id
-              }, "txs", item.id);
-            case 12:
-              _context6.n = 11;
+              });
+              delete slim.item;
+              _context6.n = 21;
+              return this.mem.set(slim, "txs", item.id);
+            case 21:
+              _context6.n = 20;
               break;
-            case 13:
-              _context6.n = 15;
+            case 22:
+              _context6.n = 24;
               break;
-            case 14:
-              _context6.p = 14;
-              _t29 = _context6.v;
-              _iterator4.e(_t29);
-            case 15:
-              _context6.p = 15;
+            case 23:
+              _context6.p = 23;
+              _t26 = _context6.v;
+              _iterator4.e(_t26);
+            case 24:
+              _context6.p = 24;
               _iterator4.f();
-              return _context6.f(15);
-            case 16:
+              return _context6.f(24);
+            case 25:
               _tags = [];
               _iterator6 = _createForOfIteratorHelper(tx.tags);
               try {
@@ -595,53 +755,155 @@ var AR = /*#__PURE__*/function (_MAR) {
               }
               __tags = (0, _utils.tags)(_tags);
               if (!(__tags.Type === "Module")) {
-                _context6.n = 17;
+                _context6.n = 26;
                 break;
               }
-              _context6.n = 17;
+              _context6.n = 26;
               return this.mem.set({
                 data: Buffer.from(tx.data, "base64"),
                 format: __tags["Module-Format"]
               }, "wasms", tx.id);
-            case 17:
+            case 26:
               tx.tags = _tags;
-              _context6.n = 18;
+              _context6.n = 27;
               return this.arweave.wallets.jwkToAddress({
                 n: tx.owner
               });
-            case 18:
+            case 27:
               tx.owner = _context6.v;
+              tx.recipient = tx.target || "";
               _txs = tx;
               block.txs.push(tx.id);
               _txs.block = block.id;
-              _context6.n = 19;
+              // Extract raw data to R2
+              if (!(_txs.data && (_this$mem$db3 = this.mem.db) !== null && _this$mem$db3 !== void 0 && _this$mem$db3.r2PutTxData)) {
+                _context6.n = 29;
+                break;
+              }
+              _context6.n = 28;
+              return this.mem.db.r2PutTxData(tx.id, _txs.data);
+            case 28:
+              _txs._r2_data = true;
+              _txs.data = "";
+            case 29:
+              _context6.n = 30;
               return this.mem.set(_txs, "txs", tx.id);
-            case 19:
-              _context6.n = 20;
-              return this.mem.get("blocks");
-            case 20:
-              blocks = _context6.v;
-              blocks.push(block.id);
-              _context6.n = 21;
-              return this.mem.set(blocks, "blocks");
-            case 21:
-              _context6.n = 22;
+            case 30:
+              if (!this.mem._d1Ready) {
+                _context6.n = 32;
+                break;
+              }
+              _context6.n = 31;
+              return this.mem.set(block.id, "lastBlockId");
+            case 31:
+              this.mem.lastBlockId = block.id;
+            case 32:
+              (_this$mem$blocks = (_this$mem = this.mem).blocks) !== null && _this$mem$blocks !== void 0 ? _this$mem$blocks : _this$mem.blocks = [];
+              this.mem.blocks.push(block.id);
+              _context6.n = 33;
+              return this.mem.set(this.mem.blocks, "blocks");
+            case 33:
+              _context6.n = 34;
               return this.mem.set(block, "blockmap", block.id);
-            case 22:
+            case 34:
               if (!jwk) {
-                _context6.n = 24;
+                _context6.n = 40;
                 break;
               }
-              _context6.n = 23;
+              _context6.n = 35;
               return this.arweave.wallets.jwkToAddress(jwk);
-            case 23:
+            case 35:
               owner = _context6.v;
-              _context6.n = 24;
+              _context6.n = 36;
               return this.mem.set({
                 address: owner,
                 key: jwk.n
               }, "addrmap", owner);
-            case 24:
+            case 36:
+              if (!((_this$mem$db4 = this.mem.db) !== null && _this$mem$db4 !== void 0 && _this$mem$db4.d1WriteAddrmap)) {
+                _context6.n = 40;
+                break;
+              }
+              _context6.p = 37;
+              _context6.n = 38;
+              return this.mem.db.d1WriteAddrmap(owner, {
+                address: owner,
+                key: jwk.n
+              });
+            case 38:
+              _context6.n = 40;
+              break;
+            case 39:
+              _context6.p = 39;
+              _t27 = _context6.v;
+            case 40:
+              if (!(this.mem._d1Ready && (_this$mem$db5 = this.mem.db) !== null && _this$mem$db5 !== void 0 && _this$mem$db5.d1WriteBlock)) {
+                _context6.n = 50;
+                break;
+              }
+              mainTx = {
+                id: tx.id,
+                owner: tx.owner,
+                recipient: tx.recipient || "",
+                anchor: tx.anchor || "",
+                signature: tx.signature || "",
+                tags: _tags,
+                _data: tx._data || {
+                  size: tx.data ? String(tx.data.length) : "0",
+                  type: ""
+                },
+                bundledIn: tx.bundledIn,
+                parent: tx.parent
+              };
+              if (!(this._batchWindow > 0)) {
+                _context6.n = 41;
+                break;
+              }
+              this._pendingBatch.push({
+                block: block,
+                mainTx: mainTx,
+                items: _toConsumableArray(items)
+              });
+              if (!this._flushTimer) {
+                this._flushTimer = setTimeout(function () {
+                  return _this2._flushBatch();
+                }, this._batchWindow);
+              }
+              _context6.n = 50;
+              break;
+            case 41:
+              _context6.n = 42;
+              return this.mem.db.d1WriteBlock(block);
+            case 42:
+              _context6.n = 43;
+              return this.mem.db.d1WriteTx(mainTx, block.id, block.height);
+            case 43:
+              _iterator7 = _createForOfIteratorHelper(items);
+              _context6.p = 44;
+              _iterator7.s();
+            case 45:
+              if ((_step7 = _iterator7.n()).done) {
+                _context6.n = 47;
+                break;
+              }
+              _item2 = _step7.value;
+              _context6.n = 46;
+              return this.mem.db.d1WriteTx(_item2, block.id, block.height);
+            case 46:
+              _context6.n = 45;
+              break;
+            case 47:
+              _context6.n = 49;
+              break;
+            case 48:
+              _context6.p = 48;
+              _t28 = _context6.v;
+              _iterator7.e(_t28);
+            case 49:
+              _context6.p = 49;
+              _iterator7.f();
+              return _context6.f(49);
+            case 50:
               res = {
                 id: tx.id,
                 status: 200,
@@ -660,7 +922,7 @@ var AR = /*#__PURE__*/function (_MAR) {
                 id: tx.id
               });
           }
-        }, _callee6, this, [[10, 14, 15, 16]]);
+        }, _callee6, this, [[44, 48, 49, 50], [37, 39], [19, 23, 24, 25]]);
       }));
       function postTx(_x7, _x8) {
         return _postTx.apply(this, arguments);
@@ -668,32 +930,115 @@ var AR = /*#__PURE__*/function (_MAR) {
       return postTx;
     }()
   }, {
-    key: "tx",
+    key: "_flushBatch",
     value: function () {
-      var _tx = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(id) {
+      var _flushBatch2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7() {
+        var batch, _iterator8, _step8, _step8$value, block, mainTx, items, _iterator9, _step9, item, _t29, _t30;
         return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
+          while (1) switch (_context7.p = _context7.n) {
+            case 0:
+              this._flushTimer = null;
+              if (this._pendingBatch.length) {
+                _context7.n = 1;
+                break;
+              }
+              return _context7.a(2);
+            case 1:
+              batch = this._pendingBatch.splice(0);
+              _iterator8 = _createForOfIteratorHelper(batch);
+              _context7.p = 2;
+              _iterator8.s();
+            case 3:
+              if ((_step8 = _iterator8.n()).done) {
+                _context7.n = 13;
+                break;
+              }
+              _step8$value = _step8.value, block = _step8$value.block, mainTx = _step8$value.mainTx, items = _step8$value.items;
+              _context7.n = 4;
+              return this.mem.db.d1WriteBlock(block);
+            case 4:
+              _context7.n = 5;
+              return this.mem.db.d1WriteTx(mainTx, block.id, block.height);
+            case 5:
+              _iterator9 = _createForOfIteratorHelper(items);
+              _context7.p = 6;
+              _iterator9.s();
+            case 7:
+              if ((_step9 = _iterator9.n()).done) {
+                _context7.n = 9;
+                break;
+              }
+              item = _step9.value;
+              _context7.n = 8;
+              return this.mem.db.d1WriteTx(item, block.id, block.height);
+            case 8:
+              _context7.n = 7;
+              break;
+            case 9:
+              _context7.n = 11;
+              break;
+            case 10:
+              _context7.p = 10;
+              _t29 = _context7.v;
+              _iterator9.e(_t29);
+            case 11:
+              _context7.p = 11;
+              _iterator9.f();
+              return _context7.f(11);
+            case 12:
+              _context7.n = 3;
+              break;
+            case 13:
+              _context7.n = 15;
+              break;
+            case 14:
+              _context7.p = 14;
+              _t30 = _context7.v;
+              _iterator8.e(_t30);
+            case 15:
+              _context7.p = 15;
+              _iterator8.f();
+              return _context7.f(15);
+            case 16:
+              _context7.n = 17;
+              return this.mem.set(this.mem.height, "height");
+            case 17:
+              return _context7.a(2);
+          }
+        }, _callee7, this, [[6, 10, 11, 12], [2, 14, 15, 16]]);
+      }));
+      function _flushBatch() {
+        return _flushBatch2.apply(this, arguments);
+      }
+      return _flushBatch;
+    }()
+  }, {
+    key: "tx",
+    value: function () {
+      var _tx2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(id) {
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.n) {
             case 0:
-              _context7.n = 1;
+              _context8.n = 1;
               return this.mem.getTx(id);
             case 1:
-              return _context7.a(2, _context7.v);
+              return _context8.a(2, _context8.v);
           }
-        }, _callee7, this);
+        }, _callee8, this);
       }));
       function tx(_x9) {
-        return _tx.apply(this, arguments);
+        return _tx2.apply(this, arguments);
       }
       return tx;
     }()
   }, {
     key: "data",
     value: function () {
-      var _data2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(id, _string, log) {
+      var _data2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(id, _string, log) {
         var _tx$data;
         var decode, string, tx, _data, isBuf, isStr;
-        return _regenerator().w(function (_context8) {
-          while (1) switch (_context8.n) {
+        return _regenerator().w(function (_context9) {
+          while (1) switch (_context9.n) {
             case 0:
               decode = true;
               string = _string;
@@ -701,45 +1046,38 @@ var AR = /*#__PURE__*/function (_MAR) {
                 if (!(0, _ramda.isNil)(_string.decode)) decode = _string.decode;
                 if (!(0, _ramda.isNil)(_string.string)) string = _string.string;
               }
-              _context8.n = 1;
+              _context9.n = 1;
               return this.mem.getTx(id);
             case 1:
-              tx = _context8.v;
+              tx = _context9.v;
               _data = (_tx$data = tx === null || tx === void 0 ? void 0 : tx.data) !== null && _tx$data !== void 0 ? _tx$data : null;
-              if ((tx === null || tx === void 0 ? void 0 : tx.format) === 2 && _data) {
-                _data = Buffer.from(_data, "base64");
-              } else if (_data) {
-                // need to check production
-                if (tx._data.type === "") {
-                  _data = tobuff(_data);
-                } else {
-                  _data = Buffer.from(_base64url["default"].decode(_data));
-                }
+              if (_data && (0, _ramda.is)(String, _data)) {
+                _data = tobuff(_data);
               }
               isBuf = (0, _ramda.is)(Uint8Array, _data) || (0, _ramda.is)(ArrayBuffer, _data);
               isStr = (0, _ramda.is)(String, _data);
               if (!(decode === false)) {
-                _context8.n = 2;
+                _context9.n = 2;
                 break;
               }
               if (isStr) _data = new TextEncoder().encode(_data);
-              return _context8.a(2, _base64url["default"].encode(_data));
+              return _context9.a(2, _base64url["default"].encode(_data));
             case 2:
               if (!(isBuf && string)) {
-                _context8.n = 3;
+                _context9.n = 3;
                 break;
               }
-              return _context8.a(2, _data.toString());
+              return _context9.a(2, _data.toString());
             case 3:
               if (!(isStr && string !== true)) {
-                _context8.n = 4;
+                _context9.n = 4;
                 break;
               }
-              return _context8.a(2, new TextEncoder().encode(_data));
+              return _context9.a(2, new TextEncoder().encode(_data));
             case 4:
-              return _context8.a(2, _data);
+              return _context9.a(2, _data);
           }
-        }, _callee8, this);
+        }, _callee9, this);
       }));
       function data(_x0, _x1, _x10) {
         return _data2.apply(this, arguments);