@thesingularitynetwork/darkswap-sdk 0.1.35 → 0.1.37

package/dist/darkswap-sdk.esm.js

@@ -2578,6 +2578,26 @@ function _getNullifierBySignature() {
   }));
   return _getNullifierBySignature.apply(this, arguments);
 }
+function isNoteCreated(_x19, _x20) {
+  return _isNoteCreated.apply(this, arguments);
+}
+function _isNoteCreated() {
+  _isNoteCreated = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(darkSwap, note) {
+    var contract, isNotCreated;
+    return _regenerator().w(function (_context8) {
+      while (1) switch (_context8.n) {
+        case 0:
+          contract = getContract(darkSwap.contracts.merkleTreeOperator, darkSwap);
+          _context8.n = 1;
+          return contract.noteIsNotCreated(hexlify32(note));
+        case 1:
+          isNotCreated = _context8.v;
+          return _context8.a(2, !isNotCreated);
+      }
+    }, _callee8);
+  }));
+  return _isNoteCreated.apply(this, arguments);
+}
 
 var _format$1 = "hh-sol-artifact-1";
 var contractName$1 = "DarkSwapAssetManager";
@@ -5271,6 +5291,104 @@ function _generateWithdrawProof() {
   return _generateWithdrawProof.apply(this, arguments);
 }
 
+function safeWait(_x, _x2, _x3) {
+  return _safeWait.apply(this, arguments);
+}
+function _safeWait() {
+  _safeWait = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(tx, provider, conf) {
+    var _err$message, err, msg, _t;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.n) {
+        case 0:
+          if (conf === void 0) {
+            conf = 1;
+          }
+          _context.p = 1;
+          _context.n = 2;
+          return tx.wait(conf);
+        case 2:
+          return _context.a(2, _context.v);
+        case 3:
+          _context.p = 3;
+          _t = _context.v;
+          console.log("tx.wait error", _t);
+          err = _t;
+          msg = (_err$message = err == null ? void 0 : err.message) != null ? _err$message : "";
+          if (!(msg.includes("value.nonce") || msg.includes("Cannot convert undefined to a BigInt"))) {
+            _context.n = 5;
+            break;
+          }
+          console.log("try getTransactionReceipt");
+          _context.n = 4;
+          return waitForReceipt(provider, tx.hash, conf);
+        case 4:
+          return _context.a(2, _context.v);
+        case 5:
+          throw _t;
+        case 6:
+          return _context.a(2);
+      }
+    }, _callee, null, [[1, 3]]);
+  }));
+  return _safeWait.apply(this, arguments);
+}
+function waitForReceipt(_x4, _x5, _x6, _x7, _x8) {
+  return _waitForReceipt.apply(this, arguments);
+}
+function _waitForReceipt() {
+  _waitForReceipt = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(provider, hash, confirmations, pollMs, timeoutMs) {
+    var start, receipt, tip;
+    return _regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
+        case 0:
+          if (confirmations === void 0) {
+            confirmations = 1;
+          }
+          if (pollMs === void 0) {
+            pollMs = 600;
+          }
+          if (timeoutMs === void 0) {
+            timeoutMs = 60000;
+          }
+          start = Date.now();
+        case 1:
+          if (!(Date.now() - start < timeoutMs)) {
+            _context2.n = 6;
+            break;
+          }
+          _context2.n = 2;
+          return provider.getTransactionReceipt(hash);
+        case 2:
+          receipt = _context2.v;
+          if (!(receipt && receipt.blockNumber)) {
+            _context2.n = 4;
+            break;
+          }
+          _context2.n = 3;
+          return provider.getBlockNumber();
+        case 3:
+          tip = _context2.v;
+          if (!(tip - receipt.blockNumber + 1 >= confirmations)) {
+            _context2.n = 4;
+            break;
+          }
+          return _context2.a(2, receipt);
+        case 4:
+          _context2.n = 5;
+          return new Promise(function (r) {
+            return setTimeout(r, pollMs);
+          });
+        case 5:
+          _context2.n = 1;
+          break;
+        case 6:
+          return _context2.a(2, null);
+      }
+    }, _callee2);
+  }));
+  return _waitForReceipt.apply(this, arguments);
+}
+
 var WithdrawContext = /*#__PURE__*/function (_BaseContext) {
   function WithdrawContext(signature) {
     return _BaseContext.call(this, signature) || this;
@@ -5387,7 +5505,7 @@ var WithdrawService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx, txReceipt;
+      var contract, tx, reciept;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -5406,10 +5524,10 @@ var WithdrawService = /*#__PURE__*/function (_BaseContractService) {
           case 3:
             tx = _context3.v;
             _context3.n = 4;
-            return this._darkSwap.provider.waitForTransaction(tx.hash, 1);
+            return safeWait(tx, this._darkSwap.provider);
           case 4:
-            txReceipt = _context3.v;
-            if (!(!txReceipt || txReceipt.status !== 1)) {
+            reciept = _context3.v;
+            if (!(!reciept || reciept.status !== 1)) {
               _context3.n = 5;
               break;
             }
@@ -9242,7 +9360,7 @@ var RetailCancelOrderService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx, txReceipt;
+      var contract, tx, reciept;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -9261,10 +9379,10 @@ var RetailCancelOrderService = /*#__PURE__*/function (_BaseContractService) {
           case 3:
             tx = _context3.v;
             _context3.n = 4;
-            return this._darkSwap.provider.waitForTransaction(tx.hash, 1);
+            return safeWait(tx, this._darkSwap.provider);
           case 4:
-            txReceipt = _context3.v;
-            if (!(!txReceipt || txReceipt.status !== 1)) {
+            reciept = _context3.v;
+            if (!(!reciept || reciept.status !== 1)) {
               _context3.n = 5;
               break;
             }
@@ -9448,7 +9566,7 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.allowance = /*#__PURE__*/function () {
     var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
-      var signer, asset, amount, allowanceContract, allowance, isLegacy, contract, tx, txReceipt;
+      var signer, asset, amount, allowanceContract, allowance, isLegacy, contract, tx, reciept;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.n) {
           case 0:
@@ -9477,10 +9595,10 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
           case 3:
             tx = _context4.v;
             _context4.n = 4;
-            return this._darkSwap.provider.waitForTransaction(tx.hash, 1);
+            return safeWait(tx, this._darkSwap.provider);
           case 4:
-            txReceipt = _context4.v;
-            if (!(!txReceipt || txReceipt.status !== 1)) {
+            reciept = _context4.v;
+            if (!(!reciept || reciept.status !== 1)) {
               _context4.n = 5;
               break;
             }
@@ -9497,7 +9615,7 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(context) {
-      var contract, ethAmount, tx, txReceipt;
+      var contract, ethAmount, tx, reciept, tmpIsNoteCreated;
       return _regenerator().w(function (_context5) {
         while (1) switch (_context5.n) {
           case 0:
@@ -9529,16 +9647,34 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             });
           case 5:
             tx = _context5.v;
+            console.log("=== before safeWait");
             _context5.n = 6;
-            return this._darkSwap.provider.waitForTransaction(tx.hash, 1);
+            return safeWait(tx, this._darkSwap.provider);
           case 6:
-            txReceipt = _context5.v;
-            if (!(!txReceipt || txReceipt.status !== 1)) {
-              _context5.n = 7;
+            reciept = _context5.v;
+            if (reciept) {
+              _context5.n = 9;
               break;
             }
-            throw new DarkSwapError('Failed to create order');
+            _context5.n = 7;
+            return isNoteCreated(this._darkSwap, context.orderNote.note);
           case 7:
+            tmpIsNoteCreated = _context5.v;
+            if (tmpIsNoteCreated) {
+              _context5.n = 8;
+              break;
+            }
+            throw new DarkSwapError('Failed to create order');
+          case 8:
+            _context5.n = 10;
+            break;
+          case 9:
+            if (!(reciept.status !== 1)) {
+              _context5.n = 10;
+              break;
+            }
+            throw new DarkSwapError('Failed to create order');
+          case 10:
             return _context5.a(2, tx.hash);
         }
       }, _callee5, this);
@@ -10176,5 +10312,5 @@ function deserializeDarkSwapMessage(serializedMessage) {
   };
 }
 
-export { ChainId, DEFAULT_FEE_RATIO, DOMAIN_NOTE, DOMAIN_ORDER_NOTE, DarkSwap, DarkSwapError, DarkSwapProofError, DepositContext, DepositService, EMPTY_FOOTER, EMPTY_NOTE, EMPTY_NULLIFIER, EMPTY_PATH, FEE_RATIO_PRECISION, GAS_LIMIT_MULTIPLIER, GAS_LIMIT_PRECISION, JoinService, NoteOnChainStatus, PROOF_DOMAIN, ProCancelOrderService, ProCreateOrderService, ProSwapService, RetailCancelOrderService, RetailCreateOrderService, RetailSwapService, TripleJoinService, WithdrawService, calcFeeAmount, calcNullifier, contractConfig, createNote, createOrderNoteExt, deserializeDarkSwapMessage, generateKeyPair, getFeeRatio, getMerklePathAndRoot, getNoteFooter, getNoteOnChainStatusByPublicKey, getNoteOnChainStatusBySignature, getNullifierBySignature, hexlify32, isAddressEquals, isHexEquals, isNativeAsset, isNoteActive, isNoteSpent, isNoteValid, legacyTokenConfig, multiGetMerklePathAndRoot, serializeDarkSwapMessage, validateNoteWithPubKey, validateOrderNoteWithPubKey };
+export { ChainId, DEFAULT_FEE_RATIO, DOMAIN_NOTE, DOMAIN_ORDER_NOTE, DarkSwap, DarkSwapError, DarkSwapProofError, DepositContext, DepositService, EMPTY_FOOTER, EMPTY_NOTE, EMPTY_NULLIFIER, EMPTY_PATH, FEE_RATIO_PRECISION, GAS_LIMIT_MULTIPLIER, GAS_LIMIT_PRECISION, JoinService, NoteOnChainStatus, PROOF_DOMAIN, ProCancelOrderService, ProCreateOrderService, ProSwapService, RetailCancelOrderService, RetailCreateOrderService, RetailSwapService, TripleJoinService, WithdrawService, calcFeeAmount, calcNullifier, contractConfig, createNote, createOrderNoteExt, deserializeDarkSwapMessage, generateKeyPair, getFeeRatio, getMerklePathAndRoot, getNoteFooter, getNoteOnChainStatusByPublicKey, getNoteOnChainStatusBySignature, getNullifierBySignature, hexlify32, isAddressEquals, isHexEquals, isNativeAsset, isNoteActive, isNoteCreated, isNoteSpent, isNoteValid, legacyTokenConfig, multiGetMerklePathAndRoot, serializeDarkSwapMessage, validateNoteWithPubKey, validateOrderNoteWithPubKey };
 //# sourceMappingURL=darkswap-sdk.esm.js.map