wao 0.8.3 → 0.8.5

package/cjs/ao.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var WarpArBundles = _interopRequireWildcard(require("warp-arbundles"));
-var _ar3 = _interopRequireDefault(require("./ar.js"));
+var _ar4 = _interopRequireDefault(require("./ar.js"));
 var _aoconnect = require("@permaweb/aoconnect");
 var _ramda = require("ramda");
 var _utils = require("./utils.js");
@@ -81,7 +81,7 @@ function createDataItemSigner2(wallet) {
 }
 var AO = /*#__PURE__*/function () {
   function AO() {
-    var _ar2;
+    var _ar2, _ar3;
     var opt = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, AO);
     var _port = null;
@@ -107,6 +107,8 @@ var AO = /*#__PURE__*/function () {
     if (!ar && _port) ar = {
       port: _port
     };
+    this.wao = opt.wao;
+    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) {
         case "sqlite":
@@ -120,9 +122,9 @@ var AO = /*#__PURE__*/function () {
       }
     }
     this.__type__ = "ao";
-    if (((_ar2 = ar) === null || _ar2 === void 0 ? void 0 : _ar2.__type__) === "ar") this.ar = ar;else {
+    if (((_ar3 = ar) === null || _ar3 === void 0 ? void 0 : _ar3.__type__) === "ar") this.ar = ar;else {
       var _ar = _typeof(ar) === "object" ? ar : {};
-      this.ar = new _ar3["default"](_ar);
+      this.ar = new _ar4["default"](_ar);
     }
     if (!in_memory && aoconnect) {
       var _connect = (0, _aoconnect.connect)(aoconnect),
@@ -152,9 +154,15 @@ var AO = /*#__PURE__*/function () {
       this.monitor = _aoconnect.monitor;
       this.unmonitor = _aoconnect.unmonitor;
     }
-    this.module = module;
-    this.scheduler = scheduler;
-    this.authority = authority;
+    if (this.wao) {
+      this.module = _utils.srcs.module_wao;
+      this.scheduler = _utils.srcs.scheduler_wao;
+      this.authority = _utils.srcs.authority_wao;
+    } else {
+      this.module = module;
+      this.scheduler = scheduler;
+      this.authority = authority;
+    }
   }
   return _createClass(AO, [{
     key: "init",
@@ -605,11 +613,11 @@ var AO = /*#__PURE__*/function () {
     value: function () {
       var _msg = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee11(_ref12) {
         var _this3 = this;
-        var pid, jwk, data, _ref12$act, act, _ref12$tags, tags, _ref12$check, check, get, _ref12$timeout, timeout, err, _yield$this$ar$checkW2, res, out, mid, results, _tags, start, exRef, _getRef, cache, checks, isOK, _getResult, _yield$_getResult2;
+        var pid, jwk, data, _ref12$act, act, _ref12$tags, tags, _ref12$check, check, get, _ref12$timeout, timeout, err, _yield$this$ar$checkW2, getNewTxs, checkOut, res, out, mid, results, _tags, start, _txs, _txmap, t, checked, _iterator4, _step4, v, _res;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
-              pid = _ref12.pid, jwk = _ref12.jwk, data = _ref12.data, _ref12$act = _ref12.act, act = _ref12$act === void 0 ? "Eval" : _ref12$act, _ref12$tags = _ref12.tags, tags = _ref12$tags === void 0 ? {} : _ref12$tags, _ref12$check = _ref12.check, check = _ref12$check === void 0 ? [] : _ref12$check, get = _ref12.get, _ref12$timeout = _ref12.timeout, timeout = _ref12$timeout === void 0 ? 10000 : _ref12$timeout;
+              pid = _ref12.pid, jwk = _ref12.jwk, data = _ref12.data, _ref12$act = _ref12.act, act = _ref12$act === void 0 ? "Eval" : _ref12$act, _ref12$tags = _ref12.tags, tags = _ref12$tags === void 0 ? {} : _ref12$tags, _ref12$check = _ref12.check, check = _ref12$check === void 0 ? [] : _ref12$check, get = _ref12.get, _ref12$timeout = _ref12.timeout, timeout = _ref12$timeout === void 0 ? 0 : _ref12$timeout;
               err = null;
               _context11.next = 4;
               return this.ar.checkWallet({
@@ -627,289 +635,273 @@ var AO = /*#__PURE__*/function () {
                 err: err
               });
             case 9:
-              res = null, out = null, mid = null, results = [];
-              _tags = (0, _utils.buildTags)(act, tags);
-              start = Date.now();
-              _context11.prev = 12;
-              _context11.next = 15;
-              return this.message({
-                process: pid,
-                signer: this.toSigner(jwk),
-                tags: _tags,
-                data: (0, _utils.jsonToStr)(data)
-              });
-            case 15:
-              mid = _context11.sent;
-              exRef = function exRef(ref, txs) {
-                var _iterator2 = _createForOfIteratorHelper(txs !== null && txs !== void 0 ? txs : []),
-                  _step2;
-                try {
-                  for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-                    var v2 = _step2.value;
-                    var t = (0, _utils.ltags)(v2.tags);
-                    if (t.type === "Message" && t["x-reference"] === ref) return true;
-                  }
-                } catch (err) {
-                  _iterator2.e(err);
-                } finally {
-                  _iterator2.f();
-                }
-                return false;
-              };
-              _getRef = /*#__PURE__*/function () {
-                var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(ref) {
-                  var txs,
-                    ex,
-                    _args9 = arguments;
+              getNewTxs = /*#__PURE__*/function () {
+                var _ref13 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee9(pid, _txs, _txmap) {
+                  var txs, _iterator2, _step2, v, t, _t$fromProcess, _v$owner;
                   return _regeneratorRuntime().wrap(function _callee9$(_context9) {
                     while (1) switch (_context9.prev = _context9.next) {
                       case 0:
-                        txs = _args9.length > 1 && _args9[1] !== undefined ? _args9[1] : [];
-                        ex = exRef(ref, txs);
-                        if (ex) {
-                          _context9.next = 10;
-                          break;
-                        }
-                        if (_this3.in_memory) {
-                          _context9.next = 6;
-                          break;
-                        }
-                        _context9.next = 6;
-                        return (0, _utils.wait)(1000);
-                      case 6:
-                        _context9.next = 8;
+                        _context9.next = 2;
                         return _this3.ar.gql.txs({
                           recipient: pid,
                           fields: ["id", "recipient", "tags", {
                             owner: ["address"]
                           }]
                         });
-                      case 8:
+                      case 2:
                         txs = _context9.sent;
-                        ex = exRef(ref, txs);
-                      case 10:
-                        if (!ex) {
-                          _context9.next = 12;
-                          break;
-                        }
-                        return _context9.abrupt("return", txs);
-                      case 12:
-                        if (!_this3.in_memory) {
-                          _context9.next = 15;
-                          break;
-                        }
-                        _context9.next = 15;
-                        return (0, _utils.wait)(1);
-                      case 15:
-                        if (!(Date.now() - start < timeout)) {
-                          _context9.next = 21;
-                          break;
+                        _iterator2 = _createForOfIteratorHelper(txs);
+                        try {
+                          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+                            v = _step2.value;
+                            if ((0, _ramda.isNil)(_txmap[v.id])) {
+                              t = (0, _utils.ltags)(v.tags);
+                              if (t.type === "Message") {
+                                v.from = (_t$fromProcess = t["from-process"]) !== null && _t$fromProcess !== void 0 ? _t$fromProcess : (_v$owner = v.owner) === null || _v$owner === void 0 ? void 0 : _v$owner.address;
+                                _txs.unshift(v);
+                                _txmap[v.id] = {
+                                  checked: false,
+                                  ref: t["x-reference"]
+                                };
+                              }
+                            }
+                          }
+                        } catch (err) {
+                          _iterator2.e(err);
+                        } finally {
+                          _iterator2.f();
                         }
-                        _context9.next = 18;
-                        return _getRef(ref);
-                      case 18:
-                        _context9.t0 = _context9.sent;
-                        _context9.next = 22;
-                        break;
-                      case 21:
-                        _context9.t0 = [];
-                      case 22:
-                        return _context9.abrupt("return", _context9.t0);
-                      case 23:
+                      case 5:
                       case "end":
                         return _context9.stop();
                     }
                   }, _callee9);
                 }));
-                return function getRef(_x8) {
+                return function getNewTxs(_x8, _x9, _x10) {
                   return _ref13.apply(this, arguments);
                 };
               }();
-              cache = [], checks = [], isOK = false;
-              _getResult = /*#__PURE__*/function () {
-                var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(mid) {
-                  var res, err, i, _iterator3, _step3, _checks$i, v, _checks, checks2, k, refs, _iterator4, _step4, _v, _ltags, _iterator5, _step5, _v2, _ltags3, txs, _iterator6, _step6, v2, _ltags2, _yield$_getResult, _res, _out, _err, _ok;
+              checkOut = /*#__PURE__*/function () {
+                var _ref14 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(get, _txs, _txmap) {
+                  var out, _iterator3, _step3, v, _res2;
                   return _regeneratorRuntime().wrap(function _callee10$(_context10) {
                     while (1) switch (_context10.prev = _context10.next) {
                       case 0:
-                        _context10.next = 2;
-                        return _this3.result({
-                          process: pid,
-                          message: mid
-                        });
-                      case 2:
-                        res = _context10.sent;
-                        results.push({
-                          mid: mid,
-                          res: res
-                        });
-                        err = null;
-                        if (res.Error) err = res.Error;else {
-                          if (!(0, _ramda.is)(Array, check)) check = [check];
-                          i = 0;
-                          _iterator3 = _createForOfIteratorHelper(check);
-                          try {
-                            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-                              v = _step3.value;
-                              _checks = (_checks$i = checks[i]) !== null && _checks$i !== void 0 ? _checks$i : null;
-                              if ((0, _utils.isRegExp)(v) || (0, _ramda.includes)(_typeof(v))(["string", "boolean"])) {
-                                _checks = (0, _utils.mergeChecks)(_checks, (0, _utils.isData)(v, res), v);
-                              } else {
-                                checks2 = {};
-                                for (k in v !== null && v !== void 0 ? v : {}) {
-                                  checks2[k] = (0, _utils.checkTag)(res, k, v[k]);
-                                }
-                                _checks = (0, _utils.mergeChecks)(_checks, checks2, v);
-                              }
-                              checks[i] = _checks;
-                              i++;
-                            }
-                          } catch (err) {
-                            _iterator3.e(err);
-                          } finally {
-                            _iterator3.f();
-                          }
-                          if ((0, _utils.isCheckComplete)(checks, check)) isOK = true;
-                          if (!(0, _ramda.isNil)(get) && !(0, _utils.isOutComplete)(out, get)) {
-                            out = (0, _utils.mergeOut)(out, (0, _utils.getTagVal)(get, res), get);
-                          }
-                        }
-                        if (!((!(0, _utils.isOutComplete)(out, get) || !isOK) && !err)) {
-                          _context10.next = 63;
-                          break;
-                        }
-                        refs = [];
-                        _iterator4 = _createForOfIteratorHelper(res.Messages);
-                        try {
-                          for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
-                            _v = _step4.value;
-                            _ltags = (0, _utils.ltags)(_v.Tags);
-                            if (_ltags.type === "Message" && _ltags.reference) {
-                              refs.push(_ltags.reference);
-                            }
-                          }
-                        } catch (err) {
-                          _iterator4.e(err);
-                        } finally {
-                          _iterator4.f();
-                        }
-                        _iterator5 = _createForOfIteratorHelper(res.Messages);
-                        _context10.prev = 11;
-                        _iterator5.s();
-                      case 13:
-                        if ((_step5 = _iterator5.n()).done) {
-                          _context10.next = 55;
+                        out = null;
+                        _iterator3 = _createForOfIteratorHelper(_txs);
+                        _context10.prev = 2;
+                        _iterator3.s();
+                      case 4:
+                        if ((_step3 = _iterator3.n()).done) {
+                          _context10.next = 18;
                           break;
                         }
-                        _v2 = _step5.value;
-                        _ltags3 = (0, _utils.ltags)(_v2.Tags);
-                        if (!(_ltags3.type === "Message" && _ltags3.reference)) {
-                          _context10.next = 53;
+                        v = _step3.value;
+                        if (!(0, _ramda.isNil)(_txmap[v.id].res)) {
+                          _context10.next = 11;
                           break;
                         }
-                        _context10.next = 19;
-                        return _getRef(_ltags3.reference, cache);
-                      case 19:
-                        txs = _context10.sent;
-                        cache = (0, _ramda.o)((0, _ramda.uniqBy)((0, _ramda.prop)("id")), (0, _ramda.concat)(cache))(txs);
-                        _iterator6 = _createForOfIteratorHelper(txs);
-                        _context10.prev = 22;
-                        _iterator6.s();
-                      case 24:
-                        if ((_step6 = _iterator6.n()).done) {
-                          _context10.next = 43;
-                          break;
-                        }
-                        v2 = _step6.value;
-                        _ltags2 = (0, _utils.ltags)(v2.tags);
-                        if (!(_ltags2.type === "Message" && _ltags2["x-reference"] === _ltags3.reference)) {
-                          _context10.next = 41;
-                          break;
-                        }
-                        _context10.next = 30;
-                        return _getResult(v2.id);
-                      case 30:
-                        _yield$_getResult = _context10.sent;
-                        _res = _yield$_getResult.res;
-                        _out = _yield$_getResult.out;
-                        _err = _yield$_getResult.err;
-                        _ok = _yield$_getResult.ok;
-                        if (!_err) {
-                          _context10.next = 38;
-                          break;
-                        }
-                        err = _err;
-                        return _context10.abrupt("break", 43);
-                      case 38:
-                        if (!(0, _utils.isOutComplete)(out, get) && _out) out = (0, _utils.mergeOut)(out, _out, get);
-                        if (!((0, _utils.isOutComplete)(out, get) && isOK)) {
-                          _context10.next = 41;
+                        _context10.next = 9;
+                        return _this3.result({
+                          process: pid,
+                          message: v.id
+                        });
+                      case 9:
+                        _res2 = _context10.sent;
+                        _txmap[v.id].res = _res2;
+                      case 11:
+                        if (!(!(0, _ramda.isNil)(_txmap[v.id].res) && _txmap[v.id].out !== true)) {
+                          _context10.next = 16;
                           break;
                         }
-                        return _context10.abrupt("break", 43);
-                      case 41:
-                        _context10.next = 24;
-                        break;
-                      case 43:
-                        _context10.next = 48;
-                        break;
-                      case 45:
-                        _context10.prev = 45;
-                        _context10.t0 = _context10["catch"](22);
-                        _iterator6.e(_context10.t0);
-                      case 48:
-                        _context10.prev = 48;
-                        _iterator6.f();
-                        return _context10.finish(48);
-                      case 51:
-                        if (!((0, _utils.isOutComplete)(out, get) && isOK)) {
-                          _context10.next = 53;
+                        _txmap[v.id].out = true;
+                        out = (0, _utils.getTagVal)(get, _txmap[v.id].res, v.from);
+                        if (!out) {
+                          _context10.next = 16;
                           break;
                         }
-                        return _context10.abrupt("break", 55);
-                      case 53:
-                        _context10.next = 13;
+                        return _context10.abrupt("break", 18);
+                      case 16:
+                        _context10.next = 4;
                         break;
-                      case 55:
-                        _context10.next = 60;
+                      case 18:
+                        _context10.next = 23;
                         break;
-                      case 57:
-                        _context10.prev = 57;
-                        _context10.t1 = _context10["catch"](11);
-                        _iterator5.e(_context10.t1);
-                      case 60:
-                        _context10.prev = 60;
-                        _iterator5.f();
-                        return _context10.finish(60);
-                      case 63:
-                        return _context10.abrupt("return", {
-                          res: res,
-                          err: err
-                        });
-                      case 64:
+                      case 20:
+                        _context10.prev = 20;
+                        _context10.t0 = _context10["catch"](2);
+                        _iterator3.e(_context10.t0);
+                      case 23:
+                        _context10.prev = 23;
+                        _iterator3.f();
+                        return _context10.finish(23);
+                      case 26:
+                        return _context10.abrupt("return", out);
+                      case 27:
                       case "end":
                         return _context10.stop();
                     }
-                  }, _callee10, null, [[11, 57, 60, 63], [22, 45, 48, 51]]);
+                  }, _callee10, null, [[2, 20, 23, 26]]);
                 }));
-                return function getResult(_x9) {
+                return function checkOut(_x11, _x12, _x13) {
                   return _ref14.apply(this, arguments);
                 };
               }();
+              res = null, out = null, mid = null, results = [];
+              _tags = (0, _utils.buildTags)(act, tags);
+              start = Date.now();
+              _context11.prev = 14;
+              _context11.next = 17;
+              return this.message({
+                process: pid,
+                signer: this.toSigner(jwk),
+                tags: _tags,
+                data: (0, _utils.jsonToStr)(data)
+              });
+            case 17:
+              mid = _context11.sent;
+              if (!(0, _ramda.is)(Array, check)) check = [check];
+              _context11.t0 = mid;
               _context11.next = 22;
-              return _getResult(mid);
+              return this.ar.toAddr(jwk);
             case 22:
-              _yield$_getResult2 = _context11.sent;
-              res = _yield$_getResult2.res;
-              err = _yield$_getResult2.err;
-              if (!isOK && !err) err = "something went wrong!";
-              _context11.next = 31;
+              _context11.t1 = _context11.sent;
+              _context11.t2 = {
+                id: _context11.t0,
+                from: _context11.t1
+              };
+              _txs = [_context11.t2];
+              _txmap = {};
+              t = (0, _utils.ltags)(_tags);
+              checked = false;
+              _txmap[mid] = {
+                checked: false,
+                ref: t["x-reference"]
+              };
+            case 29:
+              _iterator4 = _createForOfIteratorHelper(_txs);
+              _context11.prev = 30;
+              _iterator4.s();
+            case 32:
+              if ((_step4 = _iterator4.n()).done) {
+                _context11.next = 46;
+                break;
+              }
+              v = _step4.value;
+              if (_txmap[v.id].checked) {
+                _context11.next = 44;
+                break;
+              }
+              _txmap[v.id].checked = true;
+              _context11.next = 38;
+              return this.result({
+                process: pid,
+                message: v.id
+              });
+            case 38:
+              _res = _context11.sent;
+              if ((0, _ramda.isNil)(res)) {
+                res = _res;
+                mid = v.id;
+                results.push({
+                  mid: mid,
+                  res: res
+                });
+              }
+              _txmap[v.id].res = _res;
+              checked = (0, _utils.allChecked)(check, _res, v.from);
+              if (!checked) {
+                _context11.next = 44;
+                break;
+              }
+              return _context11.abrupt("break", 46);
+            case 44:
+              _context11.next = 32;
               break;
-            case 28:
-              _context11.prev = 28;
-              _context11.t0 = _context11["catch"](12);
-              err = _context11.t0;
-            case 31:
+            case 46:
+              _context11.next = 51;
+              break;
+            case 48:
+              _context11.prev = 48;
+              _context11.t3 = _context11["catch"](30);
+              _iterator4.e(_context11.t3);
+            case 51:
+              _context11.prev = 51;
+              _iterator4.f();
+              return _context11.finish(51);
+            case 54:
+              if (!checked) {
+                _context11.next = 56;
+                break;
+              }
+              return _context11.abrupt("break", 61);
+            case 56:
+              _context11.next = 58;
+              return (0, _utils.wait)(1000);
+            case 58:
+              _context11.next = 60;
+              return getNewTxs(pid, _txs, _txmap);
+            case 60:
+              if (Date.now() - start < timeout) {
+                _context11.next = 29;
+                break;
+              }
+            case 61:
+              if (checked) {
+                _context11.next = 65;
+                break;
+              }
+              err = "something went wrong!";
+              _context11.next = 89;
+              break;
+            case 65:
+              _context11.t4 = _utils.mergeOut;
+              _context11.t5 = out;
+              _context11.next = 69;
+              return checkOut(get, _txs, _txmap);
+            case 69:
+              _context11.t6 = _context11.sent;
+              _context11.t7 = get;
+              out = (0, _context11.t4)(_context11.t5, _context11.t6, _context11.t7);
+              if (!(!(0, _utils.isOutComplete)(out, get) && !(0, _ramda.isNil)(get))) {
+                _context11.next = 89;
+                break;
+              }
+            case 73:
+              if (!(Date.now() - start < timeout)) {
+                _context11.next = 89;
+                break;
+              }
+              _context11.next = 76;
+              return getNewTxs(pid, _txs, _txmap);
+            case 76:
+              _context11.t8 = _utils.mergeOut;
+              _context11.t9 = out;
+              _context11.next = 80;
+              return checkOut(get, _txs, _txmap);
+            case 80:
+              _context11.t10 = _context11.sent;
+              _context11.t11 = get;
+              out = (0, _context11.t8)(_context11.t9, _context11.t10, _context11.t11);
+              if (!(0, _utils.isOutComplete)(out, get)) {
+                _context11.next = 85;
+                break;
+              }
+              return _context11.abrupt("break", 89);
+            case 85:
+              _context11.next = 87;
+              return (0, _utils.wait)(1000);
+            case 87:
+              _context11.next = 73;
+              break;
+            case 89:
+              _context11.next = 94;
+              break;
+            case 91:
+              _context11.prev = 91;
+              _context11.t12 = _context11["catch"](14);
+              err = _context11.t12;
+            case 94:
               return _context11.abrupt("return", {
                 mid: mid,
                 res: res,
@@ -917,11 +909,11 @@ var AO = /*#__PURE__*/function () {
                 out: out,
                 results: results
               });
-            case 32:
+            case 95:
             case "end":
               return _context11.stop();
           }
-        }, _callee11, this, [[12, 28]]);
+        }, _callee11, this, [[14, 91], [30, 48, 51, 54]]);
       }));
       function msg(_x7) {
         return _msg.apply(this, arguments);
@@ -932,11 +924,11 @@ var AO = /*#__PURE__*/function () {
     key: "asgn",
     value: function () {
       var _asgn = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee12(_ref15) {
-        var pid, mid, jwk, check, get, err, _yield$this$ar$checkW3, res, out, checks, i, _iterator7, _step7, _checks$i2, v, _checks, checks2, k;
+        var pid, mid, jwk, _ref15$check, check, get, err, _yield$this$ar$checkW3, res, out;
         return _regeneratorRuntime().wrap(function _callee12$(_context12) {
           while (1) switch (_context12.prev = _context12.next) {
             case 0:
-              pid = _ref15.pid, mid = _ref15.mid, jwk = _ref15.jwk, check = _ref15.check, get = _ref15.get;
+              pid = _ref15.pid, mid = _ref15.mid, jwk = _ref15.jwk, _ref15$check = _ref15.check, check = _ref15$check === void 0 ? [] : _ref15$check, get = _ref15.get;
               err = null;
               _context12.next = 4;
               return this.ar.checkWallet({
@@ -973,33 +965,9 @@ var AO = /*#__PURE__*/function () {
               res = _context12.sent;
               if (!res) err = "something went wrong";
               if (res.Error) err = res.Error;else {
-                checks = [];
                 if (!(0, _ramda.is)(Array, check)) check = [check];
-                i = 0;
-                _iterator7 = _createForOfIteratorHelper(check);
-                try {
-                  for (_iterator7.s(); !(_step7 = _iterator7.n()).done;) {
-                    v = _step7.value;
-                    _checks = (_checks$i2 = checks[i]) !== null && _checks$i2 !== void 0 ? _checks$i2 : null;
-                    if ((0, _utils.isRegExp)(v) || (0, _ramda.includes)(_typeof(v))(["string", "boolean"])) {
-                      _checks = (0, _utils.mergeChecks)(_checks, (0, _utils.isData)(v, res), v);
-                    } else {
-                      checks2 = {};
-                      for (k in v !== null && v !== void 0 ? v : {}) {
-                        checks2[k] = (0, _utils.checkTag)(res, k, v[k]);
-                      }
-                      _checks = (0, _utils.mergeChecks)(_checks, checks2, v);
-                    }
-                    checks[i] = _checks;
-                    i++;
-                  }
-                } catch (err) {
-                  _iterator7.e(err);
-                } finally {
-                  _iterator7.f();
-                }
-                if (!(0, _utils.isCheckComplete)(checks, check)) err = "something went wrong";
-                if (!err && !(0, _ramda.isNil)(get)) out = (0, _utils.getTagVal)(get, res);
+                if (!(0, _utils.allChecked)(check, res)) err = "something went wrong";
+                if (!err && !(0, _ramda.isNil)(get)) out = (0, _utils.getTagVal)(get, res); // todo: from
               }
               _context12.next = 24;
               break;
@@ -1020,7 +988,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee12, this, [[10, 21]]);
       }));
-      function asgn(_x10) {
+      function asgn(_x14) {
         return _asgn.apply(this, arguments);
       }
       return asgn;
@@ -1029,11 +997,11 @@ var AO = /*#__PURE__*/function () {
     key: "dry",
     value: function () {
       var _dry = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee13(_ref16) {
-        var pid, jwk, data, _ref16$act, act, _ref16$tags, tags, check, get, _ref16$timeout, timeout, err, _yield$this$ar$checkW4, res, out, _tags, _res, checks, i, _iterator8, _step8, _checks$i3, v, _checks, checks2, k;
+        var pid, jwk, data, _ref16$act, act, _ref16$tags, tags, _ref16$check, check, get, err, _yield$this$ar$checkW4, res, out, _tags, _res, checks;
         return _regeneratorRuntime().wrap(function _callee13$(_context13) {
           while (1) switch (_context13.prev = _context13.next) {
             case 0:
-              pid = _ref16.pid, jwk = _ref16.jwk, data = _ref16.data, _ref16$act = _ref16.act, act = _ref16$act === void 0 ? "Eval" : _ref16$act, _ref16$tags = _ref16.tags, tags = _ref16$tags === void 0 ? {} : _ref16$tags, check = _ref16.check, get = _ref16.get, _ref16$timeout = _ref16.timeout, timeout = _ref16$timeout === void 0 ? 10000 : _ref16$timeout;
+              pid = _ref16.pid, jwk = _ref16.jwk, data = _ref16.data, _ref16$act = _ref16.act, act = _ref16$act === void 0 ? "Eval" : _ref16$act, _ref16$tags = _ref16.tags, tags = _ref16$tags === void 0 ? {} : _ref16$tags, _ref16$check = _ref16.check, check = _ref16$check === void 0 ? [] : _ref16$check, get = _ref16.get;
               err = null;
               _context13.next = 4;
               return this.ar.checkWallet({
@@ -1066,50 +1034,27 @@ var AO = /*#__PURE__*/function () {
               res = _res;
               checks = [];
               if (!(0, _ramda.is)(Array, check)) check = [check];
-              i = 0;
-              _iterator8 = _createForOfIteratorHelper(check);
-              try {
-                for (_iterator8.s(); !(_step8 = _iterator8.n()).done;) {
-                  v = _step8.value;
-                  _checks = (_checks$i3 = checks[i]) !== null && _checks$i3 !== void 0 ? _checks$i3 : null;
-                  if ((0, _utils.isRegExp)(v) || (0, _ramda.includes)(_typeof(v))(["string", "boolean"])) {
-                    _checks = (0, _utils.mergeChecks)(_checks, (0, _utils.isData)(v, res), v);
-                  } else {
-                    checks2 = {};
-                    for (k in v !== null && v !== void 0 ? v : {}) {
-                      checks2[k] = (0, _utils.checkTag)(res, k, v[k]);
-                    }
-                    _checks = (0, _utils.mergeChecks)(_checks, checks2, v);
-                  }
-                  checks[i] = _checks;
-                  i++;
-                }
-              } catch (err) {
-                _iterator8.e(err);
-              } finally {
-                _iterator8.f();
-              }
-              if (!(0, _utils.isCheckComplete)(checks, check)) err = "something went wrong";
+              if (!(0, _utils.allChecked)(check, res)) err = "something went wrong";
               if (!err && !(0, _ramda.isNil)(get)) out = (0, _utils.getTagVal)(get, res);
-              _context13.next = 28;
+              _context13.next = 25;
               break;
-            case 25:
-              _context13.prev = 25;
+            case 22:
+              _context13.prev = 22;
               _context13.t0 = _context13["catch"](11);
               err = _context13.t0;
-            case 28:
+            case 25:
               return _context13.abrupt("return", {
                 res: res,
                 err: err,
                 out: out
               });
-            case 29:
+            case 26:
             case "end":
               return _context13.stop();
           }
-        }, _callee13, this, [[11, 25]]);
+        }, _callee13, this, [[11, 22]]);
       }));
-      function dry(_x11) {
+      function dry(_x15) {
         return _dry.apply(this, arguments);
       }
       return dry;
@@ -1148,7 +1093,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee14, this);
       }));
-      function _eval(_x12) {
+      function _eval(_x16) {
         return _eval2.apply(this, arguments);
       }
       return _eval;
@@ -1195,7 +1140,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee15, this);
       }));
-      function transform(_x13) {
+      function transform(_x17) {
         return _transform.apply(this, arguments);
       }
       return transform;
@@ -1238,7 +1183,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee16, this);
       }));
-      function load(_x14) {
+      function load(_x18) {
         return _load.apply(this, arguments);
       }
       return load;
@@ -1305,7 +1250,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee17, this);
       }));
-      function wait(_x15) {
+      function wait(_x19) {
         return _wait2.apply(this, arguments);
       }
       return wait;
@@ -1336,7 +1281,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee18, this);
       }));
-      function attest(_x16) {
+      function attest(_x20) {
         return _attest.apply(this, arguments);
       }
       return attest;
@@ -1368,7 +1313,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee19, this);
       }));
-      function avail(_x17) {
+      function avail(_x21) {
         return _avail.apply(this, arguments);
       }
       return avail;
@@ -1377,7 +1322,7 @@ var AO = /*#__PURE__*/function () {
     key: "deploy",
     value: function () {
       var _deploy = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee20(_ref24) {
-        var boot, loads, src, src_data, _ref24$fills, fills, _ref24$module, module, _ref24$scheduler, scheduler, jwk, _ref24$tags, tags, data, fns, isBoot, i, _iterator9, _step9, v, args, result;
+        var boot, loads, src, src_data, _ref24$fills, fills, _ref24$module, module, _ref24$scheduler, scheduler, jwk, _ref24$tags, tags, data, fns, isBoot, i, _iterator5, _step5, v, args, result;
         return _regeneratorRuntime().wrap(function _callee20$(_context20) {
           while (1) switch (_context20.prev = _context20.next) {
             case 0:
@@ -1429,14 +1374,14 @@ var AO = /*#__PURE__*/function () {
                 }
               });
               i = 0;
-              _iterator9 = _createForOfIteratorHelper(!loads ? src_data ? [{
+              _iterator5 = _createForOfIteratorHelper(!loads ? src_data ? [{
                 data: src_data,
                 src: src,
                 fills: fills
               }] : [] : loads);
               try {
-                for (_iterator9.s(); !(_step9 = _iterator9.n()).done;) {
-                  v = _step9.value;
+                for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+                  v = _step5.value;
                   if (!isBoot || i !== 0) {
                     args = v;
                     if (typeof args === "string") args = {
@@ -1453,9 +1398,9 @@ var AO = /*#__PURE__*/function () {
                   i++;
                 }
               } catch (err) {
-                _iterator9.e(err);
+                _iterator5.e(err);
               } finally {
-                _iterator9.f();
+                _iterator5.f();
               }
               _context20.next = 9;
               return this.pipe({
@@ -1472,7 +1417,7 @@ var AO = /*#__PURE__*/function () {
           }
         }, _callee20, this);
       }));
-      function deploy(_x18) {
+      function deploy(_x22) {
         return _deploy.apply(this, arguments);
       }
       return deploy;
@@ -1557,7 +1502,7 @@ var Process = /*#__PURE__*/function () {
           }
         }, _callee22, this);
       }));
-      function msg(_x19, _x20, _x21) {
+      function msg(_x23, _x24, _x25) {
         return _msg2.apply(this, arguments);
       }
       return msg;
@@ -1585,7 +1530,7 @@ var Process = /*#__PURE__*/function () {
           }
         }, _callee23, this);
       }));
-      function dry(_x22, _x23, _x24) {
+      function dry(_x26, _x27, _x28) {
         return _dry2.apply(this, arguments);
       }
       return dry;