wao 0.40.2 → 0.41.1

package/cjs/armem-base.js

@@ -11,12 +11,20 @@ var _compress = require("./compress.js");
 var _ramda = require("ramda");
 var _utils = require("./utils.js");
 var _base64url = _interopRequireDefault(require("base64url"));
+var _arRemote = _interopRequireDefault(require("./ar-remote.js"));
 var _Arweave$default;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": 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 _regeneratorKeys(e) { var n = Object(e), r = []; for (var t in n) r.unshift(t); return function e() { for (; r.length;) if ((t = r.pop()) in n) return e.value = t, e.done = !1, e; return e.done = !0, 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 _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 _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 _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 _regeneratorKeys(e) { var n = Object(e), r = []; for (var t in n) r.unshift(t); return function e() { for (; r.length;) if ((t = r.pop()) in n) return e.value = t, e.done = !1, e; return e.done = !0, 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; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 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); }
 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); }
@@ -60,7 +68,8 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
       cache = _ref.cache,
       init = _ref.init,
       Waosm = _ref.Waosm,
-      variant = _ref.variant;
+      variant = _ref.variant,
+      ar_url = _ref.ar_url;
     _classCallCheck(this, ArMemBase);
     this.variant = variant;
     this.__type__ = "mem";
@@ -78,6 +87,10 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
     };
     this.scheduler = scheduler;
     this.SU_URL = SU_URL;
+    this._txCache = new Map();
+    this._TX_CACHE_MAX = 200;
+    this.ar_url = ar_url || null;
+    this._remote = ar_url ? new _arRemote["default"](ar_url) : null;
   }
   return _createClass(ArMemBase, [{
     key: "compress",
@@ -116,28 +129,117 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getAnchor",
     value: function getAnchor() {
-      return this.blocks.length === 0 ? "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM" : (0, _ramda.last)(this.blockmap[(0, _ramda.last)(this.blocks)].txs);
+      if (this._remote) {
+        var _this$_remoteAnchor;
+        return (_this$_remoteAnchor = this._remoteAnchor) !== null && _this$_remoteAnchor !== void 0 ? _this$_remoteAnchor : "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM";
+      }
+      // D1 ready: use lastBlockId scalar (block.id === last tx.id)
+      if (this._d1Ready) {
+        return this.lastBlockId || "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM";
+      }
+      // Fallback: use blocks array
+      if (this.blocks.length === 0) {
+        return "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM";
+      }
+      var lastBlock = this.blockmap[(0, _ramda.last)(this.blocks)];
+      if (!lastBlock) return "Do_Uc2Sju_ffp6Ev0AnLVdPtot15rvMjP-a9VVaA5fM";
+      return (0, _ramda.last)(lastBlock.txs);
     }
   }, {
     key: "get",
     value: function () {
       var _get = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(key, field) {
-        var _this$key;
+        var _this$key, _this$key3;
+        var val, _this$key2, r2mem, meta, _t3, _t4;
         return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+          while (1) switch (_context2.p = _context2.n) {
             case 0:
               _context2.n = 1;
               return this.init();
             case 1:
               if (field) {
-                _context2.n = 2;
+                _context2.n = 4;
                 break;
               }
-              return _context2.a(2, this[key]);
+              if (!(key === "height" && this._remote && !this[key])) {
+                _context2.n = 3;
+                break;
+              }
+              _context2.n = 2;
+              return this._remote.getHeight();
             case 2:
-              return _context2.a(2, (_this$key = this[key]) === null || _this$key === void 0 ? void 0 : _this$key[field]);
+              this[key] = _context2.v;
+            case 3:
+              return _context2.a(2, this[key]);
+            case 4:
+              if (!(((_this$key = this[key]) === null || _this$key === void 0 ? void 0 : _this$key[field]) === undefined && this.db)) {
+                _context2.n = 15;
+                break;
+              }
+              _context2.n = 5;
+              return this.db.get("".concat(key, ".").concat(field));
+            case 5:
+              val = _context2.v;
+              if (!(val !== null)) {
+                _context2.n = 15;
+                break;
+              }
+              (_this$key2 = this[key]) !== null && _this$key2 !== void 0 ? _this$key2 : this[key] = {};
+              if (!(key === "env" && val)) {
+                _context2.n = 14;
+                break;
+              }
+              if (!(this.db.r2GetMemory && !val.memory)) {
+                _context2.n = 9;
+                break;
+              }
+              _context2.p = 6;
+              _context2.n = 7;
+              return this.db.r2GetMemory(field);
+            case 7:
+              r2mem = _context2.v;
+              if (r2mem) {
+                val.memory = r2mem;
+                val.compressed = true;
+              }
+              _context2.n = 9;
+              break;
+            case 8:
+              _context2.p = 8;
+              _t3 = _context2.v;
+            case 9:
+              if (!(val.memory && (0, _ramda.is)(Uint8Array, val.memory))) {
+                _context2.n = 14;
+                break;
+              }
+              val.compressed = true;
+              // Lazy migrate: move inline memory to R2
+              if (!this.db.r2PutMemory) {
+                _context2.n = 14;
+                break;
+              }
+              _context2.p = 10;
+              _context2.n = 11;
+              return this.db.r2PutMemory(field, val.memory);
+            case 11:
+              // Remove memory from DO entry to save space
+              meta = _objectSpread({}, val);
+              delete meta.memory;
+              meta._r2_memory = true;
+              _context2.n = 12;
+              return this.db.put("".concat(key, ".").concat(field), meta);
+            case 12:
+              _context2.n = 14;
+              break;
+            case 13:
+              _context2.p = 13;
+              _t4 = _context2.v;
+            case 14:
+              this[key][field] = val;
+            case 15:
+              return _context2.a(2, (_this$key3 = this[key]) === null || _this$key3 === void 0 ? void 0 : _this$key3[field]);
           }
-        }, _callee2, this);
+        }, _callee2, this, [[10, 13], [6, 8]]);
       }));
       function get(_x2, _x3) {
         return _get.apply(this, arguments);
@@ -148,9 +250,9 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
     key: "set",
     value: function () {
       var _set = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(val, key, field) {
-        var _this$key2, memory;
+        var _this$key4, memory, meta, _t5;
         return _regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
+          while (1) switch (_context3.p = _context3.n) {
             case 0:
               _context3.n = 1;
               return this.init();
@@ -167,17 +269,21 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
               _context3.n = 2;
               return this.db.put("".concat(key), this[key]);
             case 2:
-              _context3.n = 6;
+              _context3.n = 15;
               break;
             case 3:
-              (_this$key2 = this[key]) !== null && _this$key2 !== void 0 ? _this$key2 : this[key] = {};
+              (_this$key4 = this[key]) !== null && _this$key4 !== void 0 ? _this$key4 : this[key] = {};
               this[key][field] = val;
               if (!this.db) {
-                _context3.n = 6;
+                _context3.n = 15;
                 break;
               }
               if (!(key === "env")) {
-                _context3.n = 5;
+                _context3.n = 13;
+                break;
+              }
+              if (!val.memory) {
+                _context3.n = 11;
                 break;
               }
               memory = val.memory;
@@ -187,23 +293,104 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
                 console.log(e);
               }
               this[key][field].original_size = val.memory.length;
-              _context3.n = 4;
-              return this.db.put("".concat(key, ".").concat(field), (0, _ramda.assoc)("memory", memory, this[key][field]));
-            case 4:
-              _context3.n = 6;
-              break;
+
+              // R2 path: store compressed memory in R2, metadata in DO
+              if (!this.db.r2PutMemory) {
+                _context3.n = 9;
+                break;
+              }
+              _context3.p = 4;
+              _context3.n = 5;
+              return this.db.r2PutMemory(field, memory);
             case 5:
+              // Store metadata without memory in DO
+              meta = _objectSpread({}, this[key][field]);
+              delete meta.memory;
+              meta._r2_memory = true;
               _context3.n = 6;
-              return this.db.put("".concat(key, ".").concat(field), this[key][field]);
+              return this.db.put("".concat(key, ".").concat(field), meta);
             case 6:
+              _context3.n = 8;
+              break;
+            case 7:
+              _context3.p = 7;
+              _t5 = _context3.v;
+              _context3.n = 8;
+              return this.db.put("".concat(key, ".").concat(field), (0, _ramda.assoc)("memory", memory, this[key][field]));
+            case 8:
+              _context3.n = 10;
+              break;
+            case 9:
+              _context3.n = 10;
+              return this.db.put("".concat(key, ".").concat(field), (0, _ramda.assoc)("memory", memory, this[key][field]));
+            case 10:
+              _context3.n = 12;
+              break;
+            case 11:
+              _context3.n = 12;
+              return this.db.put("".concat(key, ".").concat(field), this[key][field]);
+            case 12:
+              _context3.n = 15;
+              break;
+            case 13:
+              if (!(key === "txs" && this._d1Ready)) {
+                _context3.n = 14;
+                break;
+              }
+              // D1 + R2 are authoritative for tx metadata, skip DO storage
+              this._txCache.set(field, val);
+              _context3.n = 15;
+              break;
+            case 14:
+              _context3.n = 15;
+              return this.db.put("".concat(key, ".").concat(field), this[key][field]);
+            case 15:
               return _context3.a(2);
           }
-        }, _callee3, this);
+        }, _callee3, this, [[4, 7]]);
       }));
       function set(_x4, _x5, _x6) {
         return _set.apply(this, arguments);
       }
       return set;
+    }() // Get all field keys for a given prefix (e.g. all process IDs under "env")
+  }, {
+    key: "getFieldKeys",
+    value: function () {
+      var _getFieldKeys = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(key) {
+        var _this$key5, _this$key6;
+        var stored, dbKeys, memKeys;
+        return _regenerator().w(function (_context4) {
+          while (1) switch (_context4.n) {
+            case 0:
+              _context4.n = 1;
+              return this.init();
+            case 1:
+              if (this.db) {
+                _context4.n = 2;
+                break;
+              }
+              return _context4.a(2, Object.keys((_this$key5 = this[key]) !== null && _this$key5 !== void 0 ? _this$key5 : {}));
+            case 2:
+              _context4.n = 3;
+              return this.db.getKeys({
+                start: key + ".",
+                end: key + "0"
+              });
+            case 3:
+              stored = _context4.v;
+              dbKeys = (stored || []).map(function (k) {
+                return k.split(".")[1];
+              }).filter(Boolean);
+              memKeys = Object.keys((_this$key6 = this[key]) !== null && _this$key6 !== void 0 ? _this$key6 : {});
+              return _context4.a(2, _toConsumableArray(new Set([].concat(memKeys, _toConsumableArray(dbKeys)))));
+          }
+        }, _callee4, this);
+      }));
+      function getFieldKeys(_x7) {
+        return _getFieldKeys.apply(this, arguments);
+      }
+      return getFieldKeys;
     }()
   }, {
     key: "initSync",
@@ -249,6 +436,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
         this.txs[key] = {
           id: key,
           block: 0,
+          owner: this.scheduler || "",
           tags: (0, _utils.buildTags)(null, {
             "Data-Protocol": "ao",
             Variant: (_ref2 = (_w$variant = w.variant) !== null && _w$variant !== void 0 ? _w$variant : this.variant) !== null && _ref2 !== void 0 ? _ref2 : "ao.TN.1",
@@ -290,34 +478,35 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
         id: "0"
       };
       this.blocks.push("0");
+      this.lastBlockId = "0";
       this.height = 1;
     }
   }, {
     key: "putAll",
     value: function () {
-      var _putAll = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(key) {
-        var k, _t3, _t4;
-        return _regenerator().w(function (_context4) {
-          while (1) switch (_context4.n) {
+      var _putAll = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(key) {
+        var k, _t6, _t7;
+        return _regenerator().w(function (_context5) {
+          while (1) switch (_context5.n) {
             case 0:
-              _t3 = _regeneratorKeys(this[key]);
+              _t6 = _regeneratorKeys(this[key]);
             case 1:
-              if ((_t4 = _t3()).done) {
-                _context4.n = 3;
+              if ((_t7 = _t6()).done) {
+                _context5.n = 3;
                 break;
               }
-              k = _t4.value;
-              _context4.n = 2;
+              k = _t7.value;
+              _context5.n = 2;
               return this.set(this[key][k], key, k);
             case 2:
-              _context4.n = 1;
+              _context5.n = 1;
               break;
             case 3:
-              return _context4.a(2);
+              return _context5.a(2);
           }
-        }, _callee4, this);
+        }, _callee5, this);
       }));
-      function putAll(_x7) {
+      function putAll(_x8) {
         return _putAll.apply(this, arguments);
       }
       return putAll;
@@ -325,148 +514,405 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "init",
     value: function () {
-      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5() {
-        var _i, _arr, v, val, _i2, _arr2, _this$_v, _v, items, _iterator, _step, v2, key, field, v3, _i3, _arr3, _v2, _i4, _arr4, _v3, _t5;
-        return _regenerator().w(function (_context5) {
-          while (1) switch (_context5.p = _context5.n) {
+      var _init = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6() {
+        var _this$db, fresh, _i, _arr, v, val, lbid, collections, _i2, _collections, _this$_v, _v, items, _iterator, _step, v2, key, field, v3, r2mem, scalarKeys, _i3, _scalarKeys, _v2, _i4, _arr2, _v3, probe, _iterator2, _step2, bId, block, txId, _tx$block_id, _tx$block, tx, addr, name, id, txKeys, _i5, _txKeys, _txId, existing, _tx$block_id2, _tx$block2, _tx, _addr, _existing, _i6, _arr3, _v4, _i7, _arr4, _v5, _t8, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14, _t15, _t16, _t17, _t18, _t19, _t20;
+        return _regenerator().w(function (_context6) {
+          while (1) switch (_context6.p = _context6.n) {
             case 0:
               if (!this.isInit) {
-                _context5.n = 1;
+                _context6.n = 1;
                 break;
               }
-              return _context5.a(2);
+              return _context6.a(2);
             case 1:
               this.isInit = true;
               if (!(typeof this._init === "function")) {
-                _context5.n = 2;
+                _context6.n = 2;
                 break;
               }
-              _context5.n = 2;
+              _context6.n = 2;
               return this._init();
             case 2:
               if (!this.db) {
-                _context5.n = 20;
+                _context6.n = 68;
                 break;
               }
+              fresh = true; // Probe D1 readiness: binding exists AND schema is applied
+              this._d1Ready = false;
+              if (!this.db.d1) {
+                _context6.n = 6;
+                break;
+              }
+              _context6.p = 3;
+              _context6.n = 4;
+              return this.db.d1.prepare("SELECT 1 FROM blocks LIMIT 0").all();
+            case 4:
+              this._d1Ready = true;
+              _context6.n = 6;
+              break;
+            case 5:
+              _context6.p = 5;
+              _t8 = _context6.v;
+            case 6:
               _i = 0, _arr = ["height", "blocks"];
-            case 3:
+            case 7:
               if (!(_i < _arr.length)) {
-                _context5.n = 6;
+                _context6.n = 10;
                 break;
               }
               v = _arr[_i];
-              _context5.n = 4;
+              _context6.n = 8;
               return this.db.get(v);
-            case 4:
-              val = _context5.v;
-              if (val) this[v] = val;
-            case 5:
+            case 8:
+              val = _context6.v;
+              if (val !== null) {
+                this[v] = val;
+                fresh = false;
+              }
+            case 9:
               _i++;
-              _context5.n = 3;
+              _context6.n = 7;
               break;
-            case 6:
-              _i2 = 0, _arr2 = ["items", "txs", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"];
-            case 7:
-              if (!(_i2 < _arr2.length)) {
-                _context5.n = 19;
+            case 10:
+              if (!this._d1Ready) {
+                _context6.n = 12;
                 break;
               }
-              _v = _arr2[_i2];
+              _context6.n = 11;
+              return this.db.get("lastBlockId");
+            case 11:
+              lbid = _context6.v;
+              if (lbid !== null) {
+                this.lastBlockId = lbid;
+                fresh = false;
+              }
+              // Migration: derive lastBlockId from blocks if not yet stored
+              if (this.lastBlockId === "0" && this.blocks.length > 0) {
+                this.lastBlockId = this.blocks[this.blocks.length - 1];
+              }
+            case 12:
+              // Always load blocks + blockmap so the O(n) scan fallback in tgql.js works.
+              // Skip eagerly loading txs when D1 is ready (D1 is authoritative for tx queries).
+              collections = this._d1Ready ? ["items", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"] : ["items", "txs", "env", "modules", "wasms", "addrmap", "blockmap", "modmap", "msgs"];
+              _i2 = 0, _collections = collections;
+            case 13:
+              if (!(_i2 < _collections.length)) {
+                _context6.n = 29;
+                break;
+              }
+              _v = _collections[_i2];
               (_this$_v = this[_v]) !== null && _this$_v !== void 0 ? _this$_v : this[_v] = {};
-              _context5.n = 8;
+              _context6.n = 14;
               return this.db.getKeys({
                 start: _v,
                 end: _v + "a"
               });
-            case 8:
-              items = _context5.v;
+            case 14:
+              items = _context6.v;
+              if (items !== null && items !== void 0 && items.length) fresh = false;
               _iterator = _createForOfIteratorHelper(items || []);
-              _context5.p = 9;
+              _context6.p = 15;
               _iterator.s();
-            case 10:
+            case 16:
               if ((_step = _iterator.n()).done) {
-                _context5.n = 15;
+                _context6.n = 25;
                 break;
               }
               v2 = _step.value;
               key = v2.split(".")[0];
               field = v2.split(".")[1];
-              if (!(key === _v)) {
-                _context5.n = 14;
+              if (!(key === _v && field)) {
+                _context6.n = 24;
                 break;
               }
-              if (!key.match(/^env/)) {
-                _context5.n = 12;
+              if (!(key === "env")) {
+                _context6.n = 22;
                 break;
               }
-              _context5.n = 11;
+              _context6.n = 17;
               return this.db.get(v2);
-            case 11:
-              v3 = _context5.v;
-              if ((0, _ramda.is)(Uint8Array, v3.memory)) {
+            case 17:
+              v3 = _context6.v;
+              if (v3 && (0, _ramda.is)(Uint8Array, v3.memory)) {
                 v3.compressed = true;
               }
+              // If memory was offloaded to R2, fetch it
+              if (!(v3 && !v3.memory && v3._r2_memory && this.db.r2GetMemory)) {
+                _context6.n = 21;
+                break;
+              }
+              _context6.p = 18;
+              _context6.n = 19;
+              return this.db.r2GetMemory(field);
+            case 19:
+              r2mem = _context6.v;
+              if (r2mem) {
+                v3.memory = r2mem;
+                v3.compressed = true;
+              }
+              _context6.n = 21;
+              break;
+            case 20:
+              _context6.p = 20;
+              _t9 = _context6.v;
+            case 21:
               this[_v][field] = v3;
-              _context5.n = 14;
+              _context6.n = 24;
               break;
-            case 12:
-              _context5.n = 13;
+            case 22:
+              _context6.n = 23;
               return this.db.get(v2);
-            case 13:
-              this[_v][field] = _context5.v;
-            case 14:
-              _context5.n = 10;
+            case 23:
+              this[_v][field] = _context6.v;
+            case 24:
+              _context6.n = 16;
               break;
-            case 15:
-              _context5.n = 17;
+            case 25:
+              _context6.n = 27;
               break;
-            case 16:
-              _context5.p = 16;
-              _t5 = _context5.v;
-              _iterator.e(_t5);
-            case 17:
-              _context5.p = 17;
+            case 26:
+              _context6.p = 26;
+              _t0 = _context6.v;
+              _iterator.e(_t0);
+            case 27:
+              _context6.p = 27;
               _iterator.f();
-              return _context5.f(17);
-            case 18:
+              return _context6.f(27);
+            case 28:
               _i2++;
-              _context5.n = 7;
-              break;
-            case 19:
-              _context5.n = 26;
+              _context6.n = 13;
               break;
-            case 20:
-              _i3 = 0, _arr3 = ["height", "blocks"];
-            case 21:
-              if (!(_i3 < _arr3.length)) {
-                _context5.n = 23;
+            case 29:
+              if (!fresh) {
+                _context6.n = 35;
+                break;
+              }
+              // First boot: persist initial state from initSync()
+              scalarKeys = this._d1Ready ? ["height", "blocks", "lastBlockId"] : ["height", "blocks"];
+              _i3 = 0, _scalarKeys = scalarKeys;
+            case 30:
+              if (!(_i3 < _scalarKeys.length)) {
+                _context6.n = 32;
                 break;
               }
-              _v2 = _arr3[_i3];
-              _context5.n = 22;
+              _v2 = _scalarKeys[_i3];
+              _context6.n = 31;
               return this.set(this[_v2], _v2);
-            case 22:
+            case 31:
               _i3++;
-              _context5.n = 21;
+              _context6.n = 30;
               break;
-            case 23:
-              _i4 = 0, _arr4 = ["modules", "wasms", "addrmap", "blockmap"];
-            case 24:
-              if (!(_i4 < _arr4.length)) {
-                _context5.n = 26;
+            case 32:
+              _i4 = 0, _arr2 = ["modules", "wasms", "addrmap", "blockmap", "txs"];
+            case 33:
+              if (!(_i4 < _arr2.length)) {
+                _context6.n = 35;
                 break;
               }
-              _v3 = _arr4[_i4];
-              _context5.n = 25;
+              _v3 = _arr2[_i4];
+              _context6.n = 34;
               return this.putAll(_v3);
-            case 25:
+            case 34:
               _i4++;
-              _context5.n = 24;
+              _context6.n = 33;
               break;
-            case 26:
-              return _context5.a(2);
+            case 35:
+              if (!(this._d1Ready && (_this$db = this.db) !== null && _this$db !== void 0 && _this$db.d1WriteBlock)) {
+                _context6.n = 67;
+                break;
+              }
+              _context6.p = 36;
+              _context6.n = 37;
+              return this.db.d1.prepare("SELECT COUNT(*) as cnt FROM blocks").first();
+            case 37:
+              probe = _context6.v;
+              if (!(!probe || probe.cnt === 0)) {
+                _context6.n = 57;
+                break;
+              }
+              _iterator2 = _createForOfIteratorHelper(this.blocks);
+              _context6.p = 38;
+              _iterator2.s();
+            case 39:
+              if ((_step2 = _iterator2.n()).done) {
+                _context6.n = 41;
+                break;
+              }
+              bId = _step2.value;
+              block = this.blockmap[bId];
+              if (!block) {
+                _context6.n = 40;
+                break;
+              }
+              _context6.n = 40;
+              return this.db.d1WriteBlock(block);
+            case 40:
+              _context6.n = 39;
+              break;
+            case 41:
+              _context6.n = 43;
+              break;
+            case 42:
+              _context6.p = 42;
+              _t1 = _context6.v;
+              _iterator2.e(_t1);
+            case 43:
+              _context6.p = 43;
+              _iterator2.f();
+              return _context6.f(43);
+            case 44:
+              _t10 = _regeneratorKeys(this.txs);
+            case 45:
+              if ((_t11 = _t10()).done) {
+                _context6.n = 47;
+                break;
+              }
+              txId = _t11.value;
+              tx = this.txs[txId];
+              if (!tx) {
+                _context6.n = 46;
+                break;
+              }
+              _context6.n = 46;
+              return this.db.d1WriteTx(tx, (_tx$block_id = tx.block_id) !== null && _tx$block_id !== void 0 ? _tx$block_id : "0", (_tx$block = tx.block) !== null && _tx$block !== void 0 ? _tx$block : 1);
+            case 46:
+              _context6.n = 45;
+              break;
+            case 47:
+              _t12 = _regeneratorKeys(this.addrmap);
+            case 48:
+              if ((_t13 = _t12()).done) {
+                _context6.n = 50;
+                break;
+              }
+              addr = _t13.value;
+              _context6.n = 49;
+              return this.db.d1WriteAddrmap(addr, this.addrmap[addr]);
+            case 49:
+              _context6.n = 48;
+              break;
+            case 50:
+              _t14 = _regeneratorKeys(this.modules);
+            case 51:
+              if ((_t15 = _t14()).done) {
+                _context6.n = 53;
+                break;
+              }
+              name = _t15.value;
+              _context6.n = 52;
+              return this.db.d1WriteModule(name, this.modules[name]);
+            case 52:
+              _context6.n = 51;
+              break;
+            case 53:
+              _t16 = _regeneratorKeys(this.wasms);
+            case 54:
+              if ((_t17 = _t16()).done) {
+                _context6.n = 56;
+                break;
+              }
+              id = _t17.value;
+              _context6.n = 55;
+              return this.db.d1WriteWasm(id, this.wasms[id]);
+            case 55:
+              _context6.n = 54;
+              break;
+            case 56:
+              _context6.n = 65;
+              break;
+            case 57:
+              // D1 has data but seed txs from initSync() might be missing
+              // (e.g. Scheduler-Location added after initial boot)
+              txKeys = Object.keys(this.txs);
+              _i5 = 0, _txKeys = txKeys;
+            case 58:
+              if (!(_i5 < _txKeys.length)) {
+                _context6.n = 61;
+                break;
+              }
+              _txId = _txKeys[_i5];
+              _context6.n = 59;
+              return this.db.d1.prepare("SELECT 1 FROM txs WHERE id = ?").bind(_txId).first();
+            case 59:
+              existing = _context6.v;
+              if (existing) {
+                _context6.n = 60;
+                break;
+              }
+              _tx = this.txs[_txId];
+              if (!_tx) {
+                _context6.n = 60;
+                break;
+              }
+              _context6.n = 60;
+              return this.db.d1WriteTx(_tx, (_tx$block_id2 = _tx.block_id) !== null && _tx$block_id2 !== void 0 ? _tx$block_id2 : "0", (_tx$block2 = _tx.block) !== null && _tx$block2 !== void 0 ? _tx$block2 : 1);
+            case 60:
+              _i5++;
+              _context6.n = 58;
+              break;
+            case 61:
+              _t18 = _regeneratorKeys(this.addrmap);
+            case 62:
+              if ((_t19 = _t18()).done) {
+                _context6.n = 65;
+                break;
+              }
+              _addr = _t19.value;
+              _context6.n = 63;
+              return this.db.d1.prepare("SELECT 1 FROM addrmap WHERE address = ?").bind(_addr).first();
+            case 63:
+              _existing = _context6.v;
+              if (_existing) {
+                _context6.n = 64;
+                break;
+              }
+              _context6.n = 64;
+              return this.db.d1WriteAddrmap(_addr, this.addrmap[_addr]);
+            case 64:
+              _context6.n = 62;
+              break;
+            case 65:
+              _context6.n = 67;
+              break;
+            case 66:
+              _context6.p = 66;
+              _t20 = _context6.v;
+              console.error("[ArMem] D1 seed/backfill error:", (_t20 === null || _t20 === void 0 ? void 0 : _t20.message) || _t20);
+            case 67:
+              _context6.n = 74;
+              break;
+            case 68:
+              _i6 = 0, _arr3 = ["height", "blocks"];
+            case 69:
+              if (!(_i6 < _arr3.length)) {
+                _context6.n = 71;
+                break;
+              }
+              _v4 = _arr3[_i6];
+              _context6.n = 70;
+              return this.set(this[_v4], _v4);
+            case 70:
+              _i6++;
+              _context6.n = 69;
+              break;
+            case 71:
+              _i7 = 0, _arr4 = ["modules", "wasms", "addrmap", "blockmap"];
+            case 72:
+              if (!(_i7 < _arr4.length)) {
+                _context6.n = 74;
+                break;
+              }
+              _v5 = _arr4[_i7];
+              _context6.n = 73;
+              return this.putAll(_v5);
+            case 73:
+              _i7++;
+              _context6.n = 72;
+              break;
+            case 74:
+              return _context6.a(2);
           }
-        }, _callee5, this, [[9, 16, 17, 18]]);
+        }, _callee6, this, [[38, 42, 43, 44], [36, 66], [18, 20], [15, 26, 27, 28], [3, 5]]);
       }));
       function init() {
         return _init.apply(this, arguments);
@@ -476,107 +922,209 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getTx",
     value: function () {
-      var _getTx = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(id) {
-        var tx, bundle, _iterator2, _step2, di, data, data_size, data_type, _iterator3, _step3, t, owner, _t6, _t7, _t8, _t9, _t0, _t1, _t10, _t11, _t12, _t13, _t14;
-        return _regenerator().w(function (_context6) {
-          while (1) switch (_context6.p = _context6.n) {
+      var _getTx = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(id) {
+        var _this$txs$id, _this$db3;
+        var tx, _e$message, val, _this$txs$tx$bundle, bundleTx, _this$db2, bdata, b64, bundle, _iterator3, _step3, di, data, data_size, data_type, _iterator4, _step4, t, owner, _tx$id, _t21, _t22, _t23, _t24, _t25, _t26, _t27, _t28, _t29, _t30, _t31, _t32;
+        return _regenerator().w(function (_context7) {
+          while (1) switch (_context7.p = _context7.n) {
             case 0:
-              tx = this.txs[id];
-              if (!(0, _ramda.isNil)(tx)) {
-                _context6.n = 1;
+              if (!this._txCache.has(id)) {
+                _context7.n = 1;
                 break;
               }
-              return _context6.a(2, null);
+              return _context7.a(2, this._txCache.get(id));
             case 1:
-              if (!tx.bundle) {
-                _context6.n = 13;
+              // Check in-memory txs (always available for non-DB path, seed data for DB path)
+              tx = (_this$txs$id = this.txs[id]) !== null && _this$txs$id !== void 0 ? _this$txs$id : null; // Try D1 first (indexed lookup), then DO storage fallback
+              if (!(!tx && this.db)) {
+                _context7.n = 8;
                 break;
               }
-              _context6.p = 2;
-              bundle = new _arbundles.Bundle(this.txs[tx.bundle].data);
-              _iterator2 = _createForOfIteratorHelper(bundle.items);
-              _context6.p = 3;
-              _iterator2.s();
+              _context7.n = 2;
+              return this.init();
+            case 2:
+              if (!this.db.d1GetTxById) {
+                _context7.n = 6;
+                break;
+              }
+              _context7.p = 3;
+              _context7.n = 4;
+              return this.db.d1GetTxById(id);
             case 4:
-              if ((_step2 = _iterator2.n()).done) {
-                _context6.n = 8;
+              tx = _context7.v;
+              _context7.n = 6;
+              break;
+            case 5:
+              _context7.p = 5;
+              _t21 = _context7.v;
+              if (_t21 !== null && _t21 !== void 0 && (_e$message = _t21.message) !== null && _e$message !== void 0 && _e$message.includes("no such table")) {
+                _context7.n = 6;
                 break;
               }
-              di = _step2.value;
+              throw _t21;
+            case 6:
+              if (tx) {
+                _context7.n = 8;
+                break;
+              }
+              _context7.n = 7;
+              return this.db.get("txs.".concat(id));
+            case 7:
+              val = _context7.v;
+              if (val !== null) tx = val;
+            case 8:
+              if (!(!tx && this._remote)) {
+                _context7.n = 10;
+                break;
+              }
+              _context7.n = 9;
+              return this._remote.getTx(id);
+            case 9:
+              tx = _context7.v;
+            case 10:
+              if (!(0, _ramda.isNil)(tx)) {
+                _context7.n = 11;
+                break;
+              }
+              return _context7.a(2, null);
+            case 11:
+              if (!tx.bundle) {
+                _context7.n = 27;
+                break;
+              }
+              _context7.p = 12;
+              bundleTx = (_this$txs$tx$bundle = this.txs[tx.bundle]) !== null && _this$txs$tx$bundle !== void 0 ? _this$txs$tx$bundle : null;
+              if (!(!bundleTx && this.db)) {
+                _context7.n = 14;
+                break;
+              }
+              _context7.n = 13;
+              return this.db.get("txs.".concat(tx.bundle));
+            case 13:
+              bundleTx = _context7.v;
+            case 14:
+              if (!bundleTx) {
+                _context7.n = 25;
+                break;
+              }
+              if (!(!bundleTx.data && (_this$db2 = this.db) !== null && _this$db2 !== void 0 && _this$db2.r2GetTxData)) {
+                _context7.n = 16;
+                break;
+              }
+              _context7.n = 15;
+              return this.db.r2GetTxData(tx.bundle);
+            case 15:
+              bundleTx.data = _context7.v;
+            case 16:
+              if (!bundleTx.data) {
+                _context7.n = 25;
+                break;
+              }
+              bdata = bundleTx.data;
+              if (typeof bdata === "string") {
+                b64 = bdata.replace(/-/g, "+").replace(/_/g, "/");
+                bdata = Buffer.from(b64, "base64");
+              }
+              bundle = new _arbundles.Bundle(bdata);
+              _iterator3 = _createForOfIteratorHelper(bundle.items);
+              _context7.p = 17;
+              _iterator3.s();
+            case 18:
+              if ((_step3 = _iterator3.n()).done) {
+                _context7.n = 22;
+                break;
+              }
+              di = _step3.value;
               if (!(id === di.id)) {
-                _context6.n = 7;
+                _context7.n = 21;
                 break;
               }
               data = di.data;
               data_size = Buffer.byteLength(di.rawData).toString();
               data_type = "";
-              _iterator3 = _createForOfIteratorHelper(di.tags);
+              _iterator4 = _createForOfIteratorHelper(di.tags);
               try {
-                for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                  t = _step3.value;
+                for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+                  t = _step4.value;
                   if (t.name === "Content-Type") data_type = t.value;
                 }
               } catch (err) {
-                _iterator3.e(err);
+                _iterator4.e(err);
               } finally {
-                _iterator3.f();
+                _iterator4.f();
               }
-              _context6.n = 5;
+              _context7.n = 19;
               return this.owner(di);
-            case 5:
-              owner = _context6.v;
-              _t6 = {
+            case 19:
+              owner = _context7.v;
+              _t22 = {
                 size: data_size,
                 type: data_type
               };
-              _t7 = di.anchor;
-              _t8 = di.signature;
-              _t9 = di.target;
-              _context6.n = 6;
+              _t23 = di.anchor;
+              _t24 = di.signature;
+              _t25 = di.target;
+              _context7.n = 20;
               return di.id;
-            case 6:
-              _t0 = _context6.v;
-              _t1 = di;
-              _t10 = owner;
-              _t11 = di.tags;
-              _t12 = data;
+            case 20:
+              _t26 = _context7.v;
+              _t27 = di;
+              _t28 = owner;
+              _t29 = di.tags;
+              _t30 = data;
               tx = {
-                _data: _t6,
-                anchor: _t7,
-                signature: _t8,
-                recipient: _t9,
-                id: _t0,
-                item: _t1,
-                owner: _t10,
-                tags: _t11,
-                data: _t12
+                _data: _t22,
+                anchor: _t23,
+                signature: _t24,
+                recipient: _t25,
+                id: _t26,
+                item: _t27,
+                owner: _t28,
+                tags: _t29,
+                data: _t30
               };
-            case 7:
-              _context6.n = 4;
+            case 21:
+              _context7.n = 18;
               break;
-            case 8:
-              _context6.n = 10;
+            case 22:
+              _context7.n = 24;
               break;
-            case 9:
-              _context6.p = 9;
-              _t13 = _context6.v;
-              _iterator2.e(_t13);
-            case 10:
-              _context6.p = 10;
-              _iterator2.f();
-              return _context6.f(10);
-            case 11:
-              _context6.n = 13;
+            case 23:
+              _context7.p = 23;
+              _t31 = _context7.v;
+              _iterator3.e(_t31);
+            case 24:
+              _context7.p = 24;
+              _iterator3.f();
+              return _context7.f(24);
+            case 25:
+              _context7.n = 27;
               break;
-            case 12:
-              _context6.p = 12;
-              _t14 = _context6.v;
-            case 13:
-              return _context6.a(2, tx);
+            case 26:
+              _context7.p = 26;
+              _t32 = _context7.v;
+            case 27:
+              if (!(tx && !tx.data && (_this$db3 = this.db) !== null && _this$db3 !== void 0 && _this$db3.r2GetTxData)) {
+                _context7.n = 29;
+                break;
+              }
+              _context7.n = 28;
+              return this.db.r2GetTxData((_tx$id = tx.id) !== null && _tx$id !== void 0 ? _tx$id : id);
+            case 28:
+              tx.data = _context7.v;
+            case 29:
+              // Add to LRU cache
+              if (tx) {
+                if (this._txCache.size >= this._TX_CACHE_MAX) {
+                  this._txCache["delete"](this._txCache.keys().next().value);
+                }
+                this._txCache.set(id, tx);
+              }
+              return _context7.a(2, tx);
           }
-        }, _callee6, this, [[3, 9, 10, 11], [2, 12]]);
+        }, _callee7, this, [[17, 23, 24, 25], [12, 26], [3, 5]]);
       }));
-      function getTx(_x8) {
+      function getTx(_x9) {
         return _getTx.apply(this, arguments);
       }
       return getTx;
@@ -584,64 +1132,127 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
   }, {
     key: "getWasm",
     value: function () {
-      var _getWasm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(module) {
-        var mod, format, _wasm, wasm, tx;
-        return _regenerator().w(function (_context7) {
-          while (1) switch (_context7.n) {
+      var _getWasm = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(module) {
+        var mod, format, val, _wasm, wasm, _this$db4, remoteData, tx, _this$db5, _t33, _t34;
+        return _regenerator().w(function (_context8) {
+          while (1) switch (_context8.p = _context8.n) {
             case 0:
               mod = module !== null && module !== void 0 ? module : this.modules.aos2_0_1;
               if (mod) {
-                _context7.n = 1;
+                _context8.n = 1;
                 break;
               }
               throw Error("module not found");
             case 1:
-              format = null;
-              _context7.n = 2;
-              return this.wasms[mod];
+              format = null; // Lazy load wasm entry if needed
+              if (!(!this.wasms[mod] && this.db)) {
+                _context8.n = 3;
+                break;
+              }
+              _context8.n = 2;
+              return this.db.get("wasms.".concat(mod));
             case 2:
-              _wasm = _context7.v;
+              val = _context8.v;
+              if (val !== null) this.wasms[mod] = val;
+            case 3:
+              _context8.n = 4;
+              return this.wasms[mod];
+            case 4:
+              _wasm = _context8.v;
               wasm = _wasm === null || _wasm === void 0 ? void 0 : _wasm.data;
               if (wasm) {
-                _context7.n = 7;
+                _context8.n = 20;
                 break;
               }
               if (!(_wasm !== null && _wasm !== void 0 && _wasm.file)) {
-                _context7.n = 4;
+                _context8.n = 6;
                 break;
               }
-              _context7.n = 3;
+              _context8.n = 5;
               return this._getWasm(this.wasms[mod].file);
-            case 3:
-              wasm = _context7.v;
+            case 5:
+              wasm = _context8.v;
               format = _wasm.format;
-              _context7.n = 6;
+              _context8.n = 19;
               break;
-            case 4:
-              _context7.n = 5;
+            case 6:
+              if (!((_this$db4 = this.db) !== null && _this$db4 !== void 0 && _this$db4.r2GetWasm)) {
+                _context8.n = 10;
+                break;
+              }
+              _context8.p = 7;
+              _context8.n = 8;
+              return this.db.r2GetWasm(mod);
+            case 8:
+              wasm = _context8.v;
+              _context8.n = 10;
+              break;
+            case 9:
+              _context8.p = 9;
+              _t33 = _context8.v;
+            case 10:
+              if (!(!wasm && this._remote)) {
+                _context8.n = 12;
+                break;
+              }
+              _context8.n = 11;
+              return this._remote.data(mod);
+            case 11:
+              remoteData = _context8.v;
+              if (remoteData) {
+                wasm = remoteData instanceof Uint8Array ? remoteData : Buffer.from(remoteData, "base64");
+                format = _wasm === null || _wasm === void 0 ? void 0 : _wasm.format;
+              }
+            case 12:
+              if (wasm) {
+                _context8.n = 18;
+                break;
+              }
+              _context8.n = 13;
               return this.getTx(mod);
-            case 5:
-              tx = _context7.v;
-              if (tx) {
-                wasm = Buffer.from(tx.data, "base64");
-                format = (0, _utils.tags)(tx.tags)["Module-Format"];
+            case 13:
+              tx = _context8.v;
+              if (!tx) {
+                _context8.n = 17;
+                break;
               }
-            case 6:
-              _context7.n = 8;
+              wasm = Buffer.from(tx.data, "base64");
+              format = (0, _utils.tags)(tx.tags)["Module-Format"];
+              // Cache to R2 for future reads
+              if (!((_this$db5 = this.db) !== null && _this$db5 !== void 0 && _this$db5.r2PutWasm)) {
+                _context8.n = 17;
+                break;
+              }
+              _context8.p = 14;
+              _context8.n = 15;
+              return this.db.r2PutWasm(mod, wasm);
+            case 15:
+              _context8.n = 17;
               break;
-            case 7:
+            case 16:
+              _context8.p = 16;
+              _t34 = _context8.v;
+            case 17:
+              _context8.n = 19;
+              break;
+            case 18:
+              format = _wasm === null || _wasm === void 0 ? void 0 : _wasm.format;
+            case 19:
+              _context8.n = 21;
+              break;
+            case 20:
               format = _wasm.format;
-            case 8:
+            case 21:
               format !== null && format !== void 0 ? format : format = "wasm64-unknown-emscripten-draft_2024_02_15";
-              return _context7.a(2, {
+              return _context8.a(2, {
                 format: format,
                 mod: mod,
                 wasm: wasm
               });
           }
-        }, _callee7, this);
+        }, _callee8, this, [[14, 16], [7, 9]]);
       }));
-      function getWasm(_x9) {
+      function getWasm(_x0) {
         return _getWasm.apply(this, arguments);
       }
       return getWasm;