wao 0.16.7 → 0.17.0

package/cjs/ao.js

@@ -7,7 +7,7 @@ exports["default"] = void 0;
 var WarpArBundles = _interopRequireWildcard(require("warp-arbundles"));
 var _ar4 = _interopRequireDefault(require("./ar.js"));
 var _md = _interopRequireDefault(require("md5"));
-var _aoconnect = require("@permaweb/aoconnect");
+var _aoconnectWao = require("aoconnect-wao");
 var _ramda = require("ramda");
 var _utils = require("./utils.js");
 var _WarpArBundles$defaul;
@@ -122,6 +122,7 @@ var AO = /*#__PURE__*/function () {
       port: _port
     };
     this.wao = opt.wao;
+    this.variant = opt.variant;
     if ((0, _ramda.isNil)(this.wao)) this.wao = in_memory || !(0, _ramda.isNil)((_ar2 = ar) === null || _ar2 === void 0 ? void 0 : _ar2.port);
     if (!module) {
       switch (module_type) {
@@ -141,7 +142,7 @@ var AO = /*#__PURE__*/function () {
       this.ar = new _ar4["default"](_ar);
     }
     if (!in_memory && aoconnect) {
-      var _connect = (0, _aoconnect.connect)(aoconnect),
+      var _connect = (0, _aoconnectWao.connect)(aoconnect),
         _results = _connect.results,
         _assign = _connect.assign,
         _result = _connect.result,
@@ -159,14 +160,14 @@ var AO = /*#__PURE__*/function () {
       this.monitor = _monitor;
       this.unmonitor = _unmonitor;
     } else {
-      this.assign = _aoconnect.assign;
-      this.result = _aoconnect.result;
-      this.results = _aoconnect.results;
-      this.message = _aoconnect.message;
-      this.spawn = _aoconnect.spawn;
-      this.dryrun = _aoconnect.dryrun;
-      this.monitor = _aoconnect.monitor;
-      this.unmonitor = _aoconnect.unmonitor;
+      this.assign = _aoconnectWao.assign;
+      this.result = _aoconnectWao.result;
+      this.results = _aoconnectWao.results;
+      this.message = _aoconnectWao.message;
+      this.spawn = _aoconnectWao.spawn;
+      this.dryrun = _aoconnectWao.dryrun;
+      this.monitor = _aoconnectWao.monitor;
+      this.unmonitor = _aoconnectWao.unmonitor;
     }
     if (this.wao) {
       this.module = _utils.srcs.module_wao;
@@ -206,9 +207,9 @@ var AO = /*#__PURE__*/function () {
       if (wallet !== null && wallet !== void 0 && wallet.n && typeof window !== "undefined") {
         return createDataItemSigner2(wallet);
       } else if (wallet.test) {
-        return (0, _aoconnect.createDataItemSigner)(wallet.jwk);
+        return (0, _aoconnectWao.createDataItemSigner)(wallet.jwk);
       } else {
-        return (0, _aoconnect.createDataItemSigner)(wallet);
+        return (0, _aoconnectWao.createDataItemSigner)(wallet);
       }
     }
   }, {
@@ -427,15 +428,17 @@ var AO = /*#__PURE__*/function () {
     key: "postModule",
     value: function () {
       var _postModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref6) {
-        var _this = this;
+        var _this$protocol,
+          _this$variant,
+          _this = this;
         var data, jwk, _ref6$tags, tags, _ref6$overwrite, overwrite, _tags, fns;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               data = _ref6.data, jwk = _ref6.jwk, _ref6$tags = _ref6.tags, tags = _ref6$tags === void 0 ? {} : _ref6$tags, _ref6$overwrite = _ref6.overwrite, overwrite = _ref6$overwrite === void 0 ? false : _ref6$overwrite;
               _tags = (0, _ramda.mergeLeft)(tags, {
-                "Data-Protocol": "ao",
-                Variant: "ao.TN.1",
+                "Data-Protocol": (_this$protocol = this.protocol) !== null && _this$protocol !== void 0 ? _this$protocol : "ao",
+                Variant: (_this$variant = this.variant) !== null && _this$variant !== void 0 ? _this$variant : "ao.TN.1",
                 Type: "Module",
                 "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
                 "Input-Encoding": "JSON-V1",
@@ -477,15 +480,17 @@ var AO = /*#__PURE__*/function () {
     key: "postScheduler",
     value: function () {
       var _postScheduler = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee7(_ref8) {
-        var _this2 = this;
+        var _this$protocol2,
+          _this$variant2,
+          _this2 = this;
         var jwk, url, _ref8$tags, tags, _ref8$overwrite, overwrite, _tags, then, fns;
         return _regeneratorRuntime().wrap(function _callee7$(_context7) {
           while (1) switch (_context7.prev = _context7.next) {
             case 0:
               jwk = _ref8.jwk, url = _ref8.url, _ref8$tags = _ref8.tags, tags = _ref8$tags === void 0 ? {} : _ref8$tags, _ref8$overwrite = _ref8.overwrite, overwrite = _ref8$overwrite === void 0 ? false : _ref8$overwrite;
               _tags = (0, _ramda.mergeLeft)(tags, {
-                "Data-Protocol": "ao",
-                Variant: "ao.TN.1",
+                "Data-Protocol": (_this$protocol2 = this.protocol) !== null && _this$protocol2 !== void 0 ? _this$protocol2 : "ao",
+                Variant: (_this$variant2 = this.variant) !== null && _this$variant2 !== void 0 ? _this$variant2 : "ao.TN.1",
                 Type: "Scheduler-Location",
                 Url: url,
                 "Time-To-Live": "3600000"
@@ -588,6 +593,7 @@ var AO = /*#__PURE__*/function () {
               _tags = (0, _utils.buildTags)(null, tags);
               _context8.next = 17;
               return this.spawn({
+                variant: this.variant,
                 memory: memory,
                 module: module,
                 scheduler: scheduler,
@@ -991,6 +997,7 @@ var AO = /*#__PURE__*/function () {
               _tags = (0, _utils.buildTags)(act, tags);
               _context12.next = 11;
               return this.message({
+                variant: this.variant,
                 process: pid,
                 signer: this.toSigner(jwk),
                 tags: _tags,

package/cjs/aoconnect-base.js

@@ -55,7 +55,8 @@ var _default = exports["default"] = function _default() {
       log = _ref2$log === void 0 ? false : _ref2$log,
       _ref2$extensions = _ref2.extensions,
       extensions = _ref2$extensions === void 0 ? {} : _ref2$extensions,
-      hb = _ref2.hb;
+      hb = _ref2.hb,
+      variant = _ref2.variant;
     var isMem = ((_mem = mem) === null || _mem === void 0 ? void 0 : _mem.__type__) === "mem";
     if (!isMem) {
       var _mem2;
@@ -63,8 +64,9 @@ var _default = exports["default"] = function _default() {
         cache: cache
       };
       if ((_mem2 = mem) !== null && _mem2 !== void 0 && _mem2.SU_URL) {
-        args = (0, _ramda.mergeLeft)(mem, args);
         args.scheduler = scheduler;
+        args.variant = variant;
+        args = (0, _ramda.mergeLeft)(mem, args);
       }
       mem = new ArMem(args);
     }
@@ -401,9 +403,8 @@ var _default = exports["default"] = function _default() {
             case 37:
               opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags = opt.tags) !== null && _opt$tags !== void 0 ? _opt$tags : []), {
                 "Data-Protocol": "ao",
-                Variant: "ao.TN.1",
+                Variant: variant !== null && variant !== void 0 ? variant : "ao.TN.1",
                 Type: "Process",
-                SDK: "aoconnect",
                 Module: mod,
                 Scheduler: opt.scheduler,
                 "Content-Type": "text/plain",
@@ -697,181 +698,181 @@ var _default = exports["default"] = function _default() {
               _context4.t2 = (0, _utils.tags)((_opt$tags2 = opt.tags) !== null && _opt$tags2 !== void 0 ? _opt$tags2 : []);
               _context4.t3 = Date.now();
               _context4.t4 = p.epochs.length;
-              _context4.next = 18;
+              _context4.t5 = variant !== null && variant !== void 0 ? variant : "ao.TN.1";
+              _context4.next = 19;
               return mem.get("height");
-            case 18:
-              _context4.t5 = _context4.sent;
-              _context4.t6 = opt.process;
-              _context4.t7 = opt.message;
-              _context4.t8 = hash;
-              _context4.t9 = {
+            case 19:
+              _context4.t6 = _context4.sent;
+              _context4.t7 = opt.process;
+              _context4.t8 = opt.message;
+              _context4.t9 = hash;
+              _context4.t10 = {
                 Timestamp: _context4.t3,
                 Epoch: _context4.t4,
                 Nonce: "0",
                 "Data-Protocol": "ao",
-                Variant: "ao.TN.1",
-                SDK: "aoconnect",
+                Variant: _context4.t5,
                 Type: "Assignment",
-                "Block-Height": _context4.t5,
-                Process: _context4.t6,
-                Message: _context4.t7,
-                "Hash-Chain": _context4.t8
+                "Block-Height": _context4.t6,
+                Process: _context4.t7,
+                Message: _context4.t8,
+                "Hash-Chain": _context4.t9
               };
-              _context4.t10 = (0, _context4.t1)(_context4.t2, _context4.t9);
-              opt.tags = (0, _context4.t0)(null, _context4.t10);
+              _context4.t11 = (0, _context4.t1)(_context4.t2, _context4.t10);
+              opt.tags = (0, _context4.t0)(null, _context4.t11);
               p.epochs.push([opt.message]);
-              _context4.next = 28;
+              _context4.next = 29;
               return ar.dataitem({
                 data: opt.data,
                 signer: opt.signer,
                 tags: (0, _utils.tags)(opt.tags),
                 target: opt.process
               });
-            case 28:
+            case 29:
               _yield$ar$dataitem2 = _context4.sent;
               id = _yield$ar$dataitem2.id;
               owner = _yield$ar$dataitem2.owner;
               item = _yield$ar$dataitem2.item;
               if (!opt.message_item) {
-                _context4.next = 37;
+                _context4.next = 38;
                 break;
               }
-              _context4.next = 35;
+              _context4.next = 36;
               return ar.postItems([opt.message_item, item], su.jwk);
-            case 35:
-              _context4.next = 39;
+            case 36:
+              _context4.next = 40;
               break;
-            case 37:
-              _context4.next = 39;
+            case 38:
+              _context4.next = 40;
               return ar.postItems(item, su.jwk);
-            case 39:
-              _context4.prev = 39;
+            case 40:
+              _context4.prev = 40;
               data = (_opt$data2 = _opt.data) !== null && _opt$data2 !== void 0 ? _opt$data2 : "";
               _tags = _opt.tags;
               from = (_ref10 = (_opt$from = _opt.from) !== null && _opt$from !== void 0 ? _opt$from : opt.from) !== null && _ref10 !== void 0 ? _ref10 : owner;
               if (!_opt.item) {
-                _context4.next = 50;
+                _context4.next = 51;
                 break;
               }
               data = _base64url["default"].decode(_opt.item.data);
               _tags = _opt.item.tags;
               if (from) {
-                _context4.next = 50;
+                _context4.next = 51;
                 break;
               }
-              _context4.next = 49;
+              _context4.next = 50;
               return arweave.wallets.jwkToAddress({
                 kty: "RSA",
                 n: _opt.item.owner,
                 e: "AQAB"
               });
-            case 49:
-              from = _context4.sent;
             case 50:
-              _context4.next = 52;
+              from = _context4.sent;
+            case 51:
+              _context4.next = 53;
               return genMsg(opt.message, p, data, _tags, from, mu.addr);
-            case 52:
+            case 53:
               msg = _context4.sent;
-              _context4.next = 55;
+              _context4.next = 56;
               return genEnv({
                 pid: p.id,
                 owner: p.owner,
                 module: p.module
               });
-            case 55:
+            case 56:
               _env = _context4.sent;
               if (p.handle) {
-                _context4.next = 88;
+                _context4.next = 89;
                 break;
               }
-              _context4.next = 59;
+              _context4.next = 60;
               return mem.getWasm(p.modulea);
-            case 59:
+            case 60:
               _yield$mem$getWasm2 = _context4.sent;
               format = _yield$mem$getWasm2.format;
               mod = _yield$mem$getWasm2.mod;
               wasm = _yield$mem$getWasm2.wasm;
               wdrive = extensions[p.extention];
-              _context4.t11 = AoLoader;
-              _context4.t12 = wasm;
-              _context4.t13 = format;
-              _context4.t14 = wdrive;
-              _context4.next = 70;
+              _context4.t12 = AoLoader;
+              _context4.t13 = wasm;
+              _context4.t14 = format;
+              _context4.t15 = wdrive;
+              _context4.next = 71;
               return mem.getTx(p.id);
-            case 70:
-              _context4.t16 = _yield$mem$getTx3 = _context4.sent;
-              _context4.t15 = _context4.t16 === null;
-              if (_context4.t15) {
-                _context4.next = 74;
+            case 71:
+              _context4.t17 = _yield$mem$getTx3 = _context4.sent;
+              _context4.t16 = _context4.t17 === null;
+              if (_context4.t16) {
+                _context4.next = 75;
                 break;
               }
-              _context4.t15 = _yield$mem$getTx3 === void 0;
-            case 74:
-              if (!_context4.t15) {
-                _context4.next = 78;
+              _context4.t16 = _yield$mem$getTx3 === void 0;
+            case 75:
+              if (!_context4.t16) {
+                _context4.next = 79;
                 break;
               }
-              _context4.t17 = void 0;
-              _context4.next = 79;
+              _context4.t18 = void 0;
+              _context4.next = 80;
               break;
-            case 78:
-              _context4.t17 = _yield$mem$getTx3.item;
             case 79:
-              _context4.t18 = _context4.t17;
-              _context4.next = 82;
+              _context4.t18 = _yield$mem$getTx3.item;
+            case 80:
+              _context4.t19 = _context4.t18;
+              _context4.next = 83;
               return mem.getTx(mod);
-            case 82:
-              _context4.t19 = _context4.sent;
-              _context4.t20 = {
-                format: _context4.t13,
-                WeaveDrive: _context4.t14,
-                spawn: _context4.t18,
-                module: _context4.t19
+            case 83:
+              _context4.t20 = _context4.sent;
+              _context4.t21 = {
+                format: _context4.t14,
+                WeaveDrive: _context4.t15,
+                spawn: _context4.t19,
+                module: _context4.t20
               };
-              _context4.next = 86;
-              return (0, _context4.t11)(_context4.t12, _context4.t20);
-            case 86:
+              _context4.next = 87;
+              return (0, _context4.t12)(_context4.t13, _context4.t21);
+            case 87:
               p.handle = _context4.sent;
               mem.env[opt.process].handle = p.handle;
-            case 88:
+            case 89:
               if (p.compressed) {
                 start = Date.now();
                 p.memory = mem.decompress(p.memory, p.original_size);
                 p.compressed = false;
               }
-              _context4.next = 91;
+              _context4.next = 92;
               return p.handle(p.memory, msg, _env);
-            case 91:
+            case 92:
               res = _context4.sent;
               p.memory = res.Memory;
               delete res.Memory;
               p.results.push(opt.message);
-              _context4.next = 97;
+              _context4.next = 98;
               return mem.set(p, "env", opt.process);
-            case 97:
+            case 98:
               _msg = _objectSpread(_objectSpread({}, (0, _ramda.dissoc)("signer", _opt)), {}, {
                 res: res
               });
-              _context4.next = 100;
+              _context4.next = 101;
               return mem.set(_msg, "msgs", opt.message);
-            case 100:
+            case 101:
               _iterator3 = _createForOfIteratorHelper((_res$Messages = res.Messages) !== null && _res$Messages !== void 0 ? _res$Messages : []);
-              _context4.prev = 101;
+              _context4.prev = 102;
               _iterator3.s();
-            case 103:
+            case 104:
               if ((_step3 = _iterator3.n()).done) {
-                _context4.next = 112;
+                _context4.next = 113;
                 break;
               }
               v = _step3.value;
-              _context4.next = 107;
+              _context4.next = 108;
               return mem.get("env", v.Target);
-            case 107:
+            case 108:
               if (!_context4.sent) {
-                _context4.next = 110;
+                _context4.next = 111;
                 break;
               }
-              _context4.next = 110;
+              _context4.next = 111;
               return message({
                 "for": opt.message,
                 process: v.Target,
@@ -880,32 +881,32 @@ var _default = exports["default"] = function _default() {
                 signer: mu.signer,
                 from: opt.process
               });
-            case 110:
-              _context4.next = 103;
+            case 111:
+              _context4.next = 104;
               break;
-            case 112:
-              _context4.next = 117;
+            case 113:
+              _context4.next = 118;
               break;
-            case 114:
-              _context4.prev = 114;
-              _context4.t21 = _context4["catch"](101);
-              _iterator3.e(_context4.t21);
-            case 117:
-              _context4.prev = 117;
+            case 115:
+              _context4.prev = 115;
+              _context4.t22 = _context4["catch"](102);
+              _iterator3.e(_context4.t22);
+            case 118:
+              _context4.prev = 118;
               _iterator3.f();
-              return _context4.finish(117);
-            case 120:
+              return _context4.finish(118);
+            case 121:
               _iterator4 = _createForOfIteratorHelper((_res$Spawns = res.Spawns) !== null && _res$Spawns !== void 0 ? _res$Spawns : []);
-              _context4.prev = 121;
+              _context4.prev = 122;
               _iterator4.s();
-            case 123:
+            case 124:
               if ((_step4 = _iterator4.n()).done) {
-                _context4.next = 130;
+                _context4.next = 131;
                 break;
               }
               _v = _step4.value;
               __tags = (0, _utils.tags)(_v.Tags);
-              _context4.next = 128;
+              _context4.next = 129;
               return spawn({
                 "for": opt.message,
                 module: __tags.Module,
@@ -915,87 +916,87 @@ var _default = exports["default"] = function _default() {
                 from: __tags["From-Process"],
                 signer: mu.signer
               });
-            case 128:
-              _context4.next = 123;
+            case 129:
+              _context4.next = 124;
               break;
-            case 130:
-              _context4.next = 135;
+            case 131:
+              _context4.next = 136;
               break;
-            case 132:
-              _context4.prev = 132;
-              _context4.t22 = _context4["catch"](121);
-              _iterator4.e(_context4.t22);
-            case 135:
-              _context4.prev = 135;
+            case 133:
+              _context4.prev = 133;
+              _context4.t23 = _context4["catch"](122);
+              _iterator4.e(_context4.t23);
+            case 136:
+              _context4.prev = 136;
               _iterator4.f();
-              return _context4.finish(135);
-            case 138:
+              return _context4.finish(136);
+            case 139:
               _iterator5 = _createForOfIteratorHelper((_res$Assignments = res.Assignments) !== null && _res$Assignments !== void 0 ? _res$Assignments : []);
-              _context4.prev = 139;
+              _context4.prev = 140;
               _iterator5.s();
-            case 141:
+            case 142:
               if ((_step5 = _iterator5.n()).done) {
-                _context4.next = 162;
+                _context4.next = 163;
                 break;
               }
               _v2 = _step5.value;
               _iterator6 = _createForOfIteratorHelper(_v2.Processes);
-              _context4.prev = 144;
+              _context4.prev = 145;
               _iterator6.s();
-            case 146:
+            case 147:
               if ((_step6 = _iterator6.n()).done) {
-                _context4.next = 152;
+                _context4.next = 153;
                 break;
               }
               v2 = _step6.value;
-              _context4.next = 150;
+              _context4.next = 151;
               return _assign({
                 message: _v2.Message,
                 process: v2,
                 from: opt.process,
                 signer: mu.signer
               });
-            case 150:
-              _context4.next = 146;
+            case 151:
+              _context4.next = 147;
               break;
-            case 152:
-              _context4.next = 157;
+            case 153:
+              _context4.next = 158;
               break;
-            case 154:
-              _context4.prev = 154;
-              _context4.t23 = _context4["catch"](144);
-              _iterator6.e(_context4.t23);
-            case 157:
-              _context4.prev = 157;
+            case 155:
+              _context4.prev = 155;
+              _context4.t24 = _context4["catch"](145);
+              _iterator6.e(_context4.t24);
+            case 158:
+              _context4.prev = 158;
               _iterator6.f();
-              return _context4.finish(157);
-            case 160:
-              _context4.next = 141;
+              return _context4.finish(158);
+            case 161:
+              _context4.next = 142;
               break;
-            case 162:
-              _context4.next = 167;
+            case 163:
+              _context4.next = 168;
               break;
-            case 164:
-              _context4.prev = 164;
-              _context4.t24 = _context4["catch"](139);
-              _iterator5.e(_context4.t24);
-            case 167:
-              _context4.prev = 167;
+            case 165:
+              _context4.prev = 165;
+              _context4.t25 = _context4["catch"](140);
+              _iterator5.e(_context4.t25);
+            case 168:
+              _context4.prev = 168;
               _iterator5.f();
-              return _context4.finish(167);
-            case 170:
+              return _context4.finish(168);
+            case 171:
               return _context4.abrupt("return", id);
-            case 173:
-              _context4.prev = 173;
-              _context4.t25 = _context4["catch"](39);
-              console.log(_context4.t25);
-            case 176:
-              return _context4.abrupt("return", null);
+            case 174:
+              _context4.prev = 174;
+              _context4.t26 = _context4["catch"](40);
+              console.log(_context4.t26);
             case 177:
+              return _context4.abrupt("return", null);
+            case 178:
             case "end":
               return _context4.stop();
           }
-        }, _callee4, null, [[39, 173], [101, 114, 117, 120], [121, 132, 135, 138], [139, 164, 167, 170], [144, 154, 157, 160]]);
+        }, _callee4, null, [[40, 174], [102, 115, 118, 121], [122, 133, 136, 139], [140, 165, 168, 171], [145, 155, 158, 161]]);
       }));
       return function assign(_x8) {
         return _ref9.apply(this, arguments);
@@ -1084,9 +1085,8 @@ var _default = exports["default"] = function _default() {
               }
               opt.tags = (0, _utils.buildTags)(null, (0, _ramda.mergeLeft)((0, _utils.tags)((_opt$tags3 = opt.tags) !== null && _opt$tags3 !== void 0 ? _opt$tags3 : []), {
                 "Data-Protocol": "ao",
-                Variant: "ao.TN.1",
-                Type: "Message",
-                SDK: "aoconnect"
+                Variant: variant !== null && variant !== void 0 ? variant : "ao.TN.1",
+                Type: "Message"
               }));
               if (!opt["for"]) {
                 _context5.next = 71;

package/cjs/armem-base.js

@@ -57,8 +57,10 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
       scheduler = _ref.scheduler,
       cache = _ref.cache,
       init = _ref.init,
-      Waosm = _ref.Waosm;
+      Waosm = _ref.Waosm,
+      variant = _ref.variant;
     _classCallCheck(this, ArMemBase);
+    this.variant = variant;
     this.__type__ = "mem";
     this._init = init;
     this.Waosm = Waosm;
@@ -239,6 +241,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
       }
       var txs = [];
       for (var _k in this.modules) {
+        var _this$variant;
         var key = this.modules[_k];
         txs.push(key);
         this.txs[key] = {
@@ -246,7 +249,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
           block: 0,
           tags: (0, _utils.buildTags)(null, {
             "Data-Protocol": "ao",
-            Variant: "ao.TN.1",
+            Variant: (_this$variant = this.variant) !== null && _this$variant !== void 0 ? _this$variant : "ao.TN.1",
             Type: "Module",
             "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
             "Input-Encoding": "JSON-V1",
@@ -258,6 +261,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
         };
       }
       if (this.scheduler && this.SU_URL) {
+        var _this$variant2;
         var _key = this.scheduler;
         txs.push(_key);
         this.addrmap[this.scheduler] = {
@@ -269,7 +273,7 @@ var ArMemBase = exports["default"] = /*#__PURE__*/function () {
           owner: this.scheduler,
           tags: (0, _utils.buildTags)(null, {
             "Data-Protocol": "ao",
-            Variant: "ao.TN.1",
+            Variant: (_this$variant2 = this.variant) !== null && _this$variant2 !== void 0 ? _this$variant2 : "ao.TN.1",
             Type: "Scheduler-Location",
             Url: this.SU_URL,
             "Time-To-Live": 1000 * 60 * 60 * 24 * 365 * 10

package/cjs/armem-web.js

@@ -46,7 +46,7 @@ var ArMem = exports["default"] = /*#__PURE__*/function (_Base) {
       init: _waosm["default"],
       Waosm: _waosm.Waosm
     })]);
-    _this.db = (0, _lfdb["default"])(_this);
+    _this.db = (0, _lfdb["default"])(_this, args.cache);
     _this.initSync();
     return _this;
   }

package/cjs/bao.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _ao = _interopRequireDefault(require("./ao.js"));
-var _aoconnect = require("@permaweb/aoconnect");
+var _aoconnectWao = require("aoconnect-wao");
 var _utils = require("./utils.js");
 var _ramda = require("ramda");
 var _hb = _interopRequireDefault(require("./hb.js"));
@@ -81,9 +81,10 @@ var AO = /*#__PURE__*/function (_MAO) {
       in_memory: true
     })]);
     _this.in_memory = true;
-    _this.createDataItemSigner = (_opt$createDataItemSi = opt.createDataItemSigner) !== null && _opt$createDataItemSi !== void 0 ? _opt$createDataItemSi : _aoconnect.createDataItemSigner;
+    _this.createDataItemSigner = (_opt$createDataItemSi = opt.createDataItemSigner) !== null && _opt$createDataItemSi !== void 0 ? _opt$createDataItemSi : _aoconnectWao.createDataItemSigner;
     _this.hb = opt.hb;
     var _opt$connect = opt.connect(opt.mem, {
+        variant: opt.variant,
         extensions: opt.extensions,
         cache: opt.cache,
         reset: opt.reset,
@@ -224,6 +225,7 @@ var AO = /*#__PURE__*/function (_MAO) {
     key: "postModule",
     value: function () {
       var _postModule = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5(_ref4) {
+        var _this$variant;
         var data, _ref4$tags, tags, jwk, err, _yield$this$ar$checkW, t, signer, _yield$this$ar$datait, id, owner, item;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
@@ -248,7 +250,7 @@ var AO = /*#__PURE__*/function (_MAO) {
             case 9:
               t = (0, _ramda.mergeLeft)(tags, {
                 "Data-Protocol": "ao",
-                Variant: "ao.TN.1",
+                Variant: (_this$variant = this.variant) !== null && _this$variant !== void 0 ? _this$variant : "ao.TN.1",
                 Type: "Module",
                 "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
                 "Input-Encoding": "JSON-V1",

package/cjs/helpers.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.setup = exports.ok = exports.fail = exports.Testnet = exports.Src = void 0;
 var _index = require("./index.js");
 var _assert = _interopRequireDefault(require("assert"));
-var _aoconnect3 = require("@permaweb/aoconnect");
+var _aoconnectWao = require("aoconnect-wao");
 var _path = require("path");
 var _fs = require("fs");
 var _utils = require("./utils.js");

package/cjs/lfdb.js

@@ -14,22 +14,25 @@ function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length)
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
 function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-var _default = exports["default"] = function _default(_this) {
+var _default = exports["default"] = function _default(_this, prefix) {
+  var k = function k(key) {
+    return prefix ? "".concat(prefix, "-").concat(key) : key;
+  };
   return {
     put: function () {
       var _put = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(key, val) {
-        var _val, k, _arr, _iterator, _step, v, __val, k2, _val2, _k;
+        var _val, _k, _arr, _iterator, _step, v, __val, k2, _val2, _k2;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
               _val = null;
               if (_typeof(val) === "object" && !(0, _ramda.is)(Array, val)) {
                 _val = {};
-                for (k in val) {
-                  if (typeof val[k] !== "function") {
-                    if ((0, _ramda.is)(Array, val[k])) {
+                for (_k in val) {
+                  if (typeof val[_k] !== "function") {
+                    if ((0, _ramda.is)(Array, val[_k])) {
                       _arr = [];
-                      _iterator = _createForOfIteratorHelper(val[k]);
+                      _iterator = _createForOfIteratorHelper(val[_k]);
                       try {
                         for (_iterator.s(); !(_step = _iterator.n()).done;) {
                           v = _step.value;
@@ -48,25 +51,25 @@ var _default = exports["default"] = function _default(_this) {
                       } finally {
                         _iterator.f();
                       }
-                      _val[k] = _arr;
-                    } else if (_typeof(val[k]) === "object" && !(val[k] instanceof Uint8Array) && !(val[k] instanceof ArrayBuffer)) {
+                      _val[_k] = _arr;
+                    } else if (_typeof(val[_k]) === "object" && !(val[_k] instanceof Uint8Array) && !(val[_k] instanceof ArrayBuffer)) {
                       _val2 = {};
-                      for (_k in val[k]) {
-                        if (typeof val[k][_k] !== "function") _val2[_k] = val[k][_k];
+                      for (_k2 in val[_k]) {
+                        if (typeof val[_k][_k2] !== "function") _val2[_k2] = val[_k][_k2];
                       }
-                      _val[k] = _val2;
+                      _val[_k] = _val2;
                     } else {
-                      _val[k] = val[k];
+                      _val[_k] = val[_k];
                     }
                   }
                 }
               } else _val = val;
               _context.next = 4;
-              return _localforage["default"].setItem(key, _val);
+              return _localforage["default"].setItem(k(key), _val);
             case 4:
               _this.keys[key] = true;
               _context.next = 7;
-              return _localforage["default"].setItem("keys", (0, _ramda.keys)(_this.keys));
+              return _localforage["default"].setItem(k("keys"), (0, _ramda.keys)(_this.keys));
             case 7:
             case "end":
               return _context.stop();
@@ -84,7 +87,7 @@ var _default = exports["default"] = function _default(_this) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return _localforage["default"].getItem(key);
+              return _localforage["default"].getItem(k(key));
             case 2:
               return _context2.abrupt("return", _context2.sent);
             case 3:
@@ -100,7 +103,7 @@ var _default = exports["default"] = function _default(_this) {
     }(),
     getKeys: function () {
       var _getKeys = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3(_ref) {
-        var start, end, _yield$lf$getItem, _keys, _iterator2, _step2, v, __keys, k, sp;
+        var start, end, _yield$lf$getItem, _keys, _iterator2, _step2, v, __keys, _k3, sp;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
@@ -110,7 +113,7 @@ var _default = exports["default"] = function _default(_this) {
                 break;
               }
               _context3.next = 4;
-              return _localforage["default"].getItem("keys");
+              return _localforage["default"].getItem(k("keys"));
             case 4:
               _context3.t1 = _yield$lf$getItem = _context3.sent;
               _context3.t0 = _context3.t1 !== null;
@@ -145,9 +148,9 @@ var _default = exports["default"] = function _default(_this) {
               }
             case 17:
               __keys = [];
-              for (k in _this.keys) {
-                sp = k.split(".");
-                if (sp[0] === start) __keys.push(k);
+              for (_k3 in _this.keys) {
+                sp = _k3.split(".");
+                if (sp[0] === start) __keys.push(_k3);
               }
               return _context3.abrupt("return", __keys);
             case 20:

package/esm/ao.js

@@ -14,7 +14,7 @@ import {
   dryrun,
   monitor,
   unmonitor,
-} from "@permaweb/aoconnect"
+} from "aoconnect-wao"
 
 import {
   dissoc,
@@ -96,6 +96,7 @@ class AO {
     if (!aoconnect && _port) aoconnect = optAO(_port)
     if (!ar && _port) ar = { port: _port }
     this.wao = opt.wao
+    this.variant = opt.variant
     if (isNil(this.wao)) this.wao = in_memory || !isNil(ar?.port)
     if (!module) {
       switch (module_type) {
@@ -311,8 +312,8 @@ class AO {
 
   async postModule({ data, jwk, tags = {}, overwrite = false }) {
     const _tags = mergeLeft(tags, {
-      "Data-Protocol": "ao",
-      Variant: "ao.TN.1",
+      "Data-Protocol": this.protocol ?? "ao",
+      Variant: this.variant ?? "ao.TN.1",
       Type: "Module",
       "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
       "Input-Encoding": "JSON-V1",
@@ -336,8 +337,8 @@ class AO {
 
   async postScheduler({ jwk, url, tags = {}, overwrite = false }) {
     const _tags = mergeLeft(tags, {
-      "Data-Protocol": "ao",
-      Variant: "ao.TN.1",
+      "Data-Protocol": this.protocol ?? "ao",
+      Variant: this.variant ?? "ao.TN.1",
       Type: "Scheduler-Location",
       Url: url,
       "Time-To-Live": "3600000",
@@ -370,6 +371,7 @@ class AO {
       if (!tags.Authority && this.authority) tags.Authority = this.authority
       let _tags = buildTags(null, tags)
       pid = await this.spawn({
+        variant: this.variant,
         memory,
         module,
         scheduler,
@@ -515,6 +517,7 @@ class AO {
     if (err) return { err }
     let _tags = buildTags(act, tags)
     const mid = await this.message({
+      variant: this.variant,
       process: pid,
       signer: this.toSigner(jwk),
       tags: _tags,

package/esm/aoconnect-base.js

@@ -33,13 +33,14 @@ let onRecovery = {}
 let ongoing = {}
 
 export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
-  return (mem, { cache, log = false, extensions = {}, hb } = {}) => {
+  return (mem, { cache, log = false, extensions = {}, hb, variant } = {}) => {
     const isMem = mem?.__type__ === "mem"
     if (!isMem) {
       let args = { cache }
       if (mem?.SU_URL) {
-        args = mergeLeft(mem, args)
         args.scheduler = scheduler
+        args.variant = variant
+        args = mergeLeft(mem, args)
       }
       mem = new ArMem(args)
     }
@@ -135,9 +136,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           null,
           mergeLeft(tags(opt.tags ?? []), {
             "Data-Protocol": "ao",
-            Variant: "ao.TN.1",
+            Variant: variant ?? "ao.TN.1",
             Type: "Process",
-            SDK: "aoconnect",
             Module: mod,
             Scheduler: opt.scheduler,
             "Content-Type": "text/plain",
@@ -286,8 +286,7 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           Epoch: p.epochs.length,
           Nonce: "0",
           "Data-Protocol": "ao",
-          Variant: "ao.TN.1",
-          SDK: "aoconnect",
+          Variant: variant ?? "ao.TN.1",
           Type: "Assignment",
           "Block-Height": await mem.get("height"),
           Process: opt.process,
@@ -431,9 +430,8 @@ export default ({ AR, scheduler, mu, su, cu, acc, AoLoader, ArMem } = {}) => {
           null,
           mergeLeft(tags(opt.tags ?? []), {
             "Data-Protocol": "ao",
-            Variant: "ao.TN.1",
+            Variant: variant ?? "ao.TN.1",
             Type: "Message",
-            SDK: "aoconnect",
           })
         )
         if (opt.for) {

package/esm/armem-base.js

@@ -32,7 +32,9 @@ export default class ArMemBase {
     cache,
     init,
     Waosm,
+    variant,
   } = {}) {
+    this.variant = variant
     this.__type__ = "mem"
     this._init = init
     this.Waosm = Waosm
@@ -125,7 +127,7 @@ export default class ArMemBase {
         block: 0,
         tags: buildTags(null, {
           "Data-Protocol": "ao",
-          Variant: "ao.TN.1",
+          Variant: this.variant ?? "ao.TN.1",
           Type: "Module",
           "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
           "Input-Encoding": "JSON-V1",
@@ -146,7 +148,7 @@ export default class ArMemBase {
         owner: this.scheduler,
         tags: buildTags(null, {
           "Data-Protocol": "ao",
-          Variant: "ao.TN.1",
+          Variant: this.variant ?? "ao.TN.1",
           Type: "Scheduler-Location",
           Url: this.SU_URL,
           "Time-To-Live": 1000 * 60 * 60 * 24 * 365 * 10,

package/esm/armem-web.js

@@ -8,7 +8,7 @@ const wasm = { sqlite, aos2_0_3, aos2_0_1 }
 export default class ArMem extends Base {
   constructor(args = {}) {
     super({ ...args, init, Waosm })
-    this.db = db(this)
+    this.db = db(this, args.cache)
     this.initSync()
   }
   async _getWasm(file) {

package/esm/bao.js

@@ -1,5 +1,5 @@
 import MAO from "./ao.js"
-import { createDataItemSigner } from "@permaweb/aoconnect"
+import { createDataItemSigner } from "aoconnect-wao"
 import { srcs, buildTags } from "./utils.js"
 import { mergeLeft, is, map } from "ramda"
 import HB from "./hb.js"
@@ -68,6 +68,7 @@ class AO extends MAO {
       recover,
       mem,
     } = opt.connect(opt.mem, {
+      variant: opt.variant,
       extensions: opt.extensions,
       cache: opt.cache,
       reset: opt.reset,
@@ -114,7 +115,7 @@ class AO extends MAO {
     if (err) return { err }
     const t = mergeLeft(tags, {
       "Data-Protocol": "ao",
-      Variant: "ao.TN.1",
+      Variant: this.variant ?? "ao.TN.1",
       Type: "Module",
       "Module-Format": "wasm64-unknown-emscripten-draft_2024_02_15",
       "Input-Encoding": "JSON-V1",

package/esm/helpers.js

@@ -1,6 +1,7 @@
 import { AR, AO } from "./index.js"
 import assert from "assert"
-import { createDataItemSigner, connect } from "@permaweb/aoconnect"
+
+import { createDataItemSigner, connect } from "aoconnect-wao"
 import { dirname as _dirname, resolve } from "path"
 import { mkdirSync, existsSync, writeFileSync, readFileSync } from "fs"
 import { optAO } from "./utils.js"
@@ -33,7 +34,7 @@ export class Src {
   data(file, ext = "lua") {
     return readFileSync(
       `${this.dir}/${file}.${ext}`,
-      ext === "wasm" ? null : "utf8",
+      ext === "wasm" ? null : "utf8"
     )
   }
   async upload(file, ext = "lua") {

package/esm/lfdb.js

@@ -1,7 +1,8 @@
 import lf from "localforage"
 import { is, keys } from "ramda"
 
-export default _this => {
+export default (_this, prefix) => {
+  const k = key => (prefix ? `${prefix}-${key}` : key)
   return {
     put: async (key, val) => {
       let _val = null
@@ -44,14 +45,14 @@ export default _this => {
           }
         }
       } else _val = val
-      await lf.setItem(key, _val)
+      await lf.setItem(k(key), _val)
       _this.keys[key] = true
-      await lf.setItem("keys", keys(_this.keys))
+      await lf.setItem(k("keys"), keys(_this.keys))
     },
-    get: async key => await lf.getItem(key),
+    get: async key => await lf.getItem(k(key)),
     getKeys: async ({ start, end }) => {
       if (!_this.keyInit) {
-        const _keys = (await lf.getItem("keys")) ?? []
+        const _keys = (await lf.getItem(k("keys"))) ?? []
         _this.keys = {}
         for (const v of _keys) _this.keys[v] = true
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wao",
-  "version": "0.16.7",
+  "version": "0.17.0",
   "bin": {
     "wao": "./cjs/cli.js",
     "wao-esm": "./esm/cli.js"
@@ -31,7 +31,7 @@
     "@dha-team/arbundles": "^1.0.1",
     "@permaweb/ao-loader": "^0.0.44",
     "@permaweb/aoconnect": "^0.0.62",
-    "aoconnect-wao": "https://gitpkg.vercel.app/weavedb/ao/connect?abd2992689dc5983d5cd48b38fb997b0532f192a&scripts.postinstall=npm%20install%20--ignore-scripts%20%26%26%20npm%20run%20build",
+    "aoconnect-wao": "https://gitpkg.vercel.app/weavedb/ao/connect?5cef9f0c1a4e8872308bbe0a7d004e44a7e008b6&scripts.postinstall=npm%20install%20--ignore-scripts%20%26%26%20npm%20run%20build",
     "arbundles": "^0.11.1",
     "arjson": "^0.0.2",
     "arweave": "^1.15.1",