@thesingularitynetwork/darkswap-sdk 0.1.37 → 0.1.39

package/dist/config/config.d.ts

@@ -1,6 +1,7 @@
 export declare const legacyTokenConfig: {
     [chainId: number]: string[];
 };
+export declare const getConfirmations: (chainId: number) => number;
 export declare const DEFAULT_FEE_RATIO = 300n;
 export declare const GAS_LIMIT_MULTIPLIER = 120n;
 export declare const GAS_LIMIT_PRECISION = 100n;

package/dist/darkswap-sdk.cjs.development.js

@@ -4230,8 +4230,13 @@ var ERC20_USDT = {
   ChainId[ChainId["BASE"] = 8453] = "BASE";
 })(exports.ChainId || (exports.ChainId = {}));
 
-var _legacyTokenConfig;
+var _legacyTokenConfig, _confirmationsConfig;
 var legacyTokenConfig = (_legacyTokenConfig = {}, _legacyTokenConfig[exports.ChainId.MAINNET] = ['0xdac17f958d2ee523a2206206994597c13d831ec7'], _legacyTokenConfig[exports.ChainId.HARDHAT] = ['0xdac17f958d2ee523a2206206994597c13d831ec7'], _legacyTokenConfig);
+var confirmationsConfig = (_confirmationsConfig = {}, _confirmationsConfig[exports.ChainId.MAINNET] = 3, _confirmationsConfig[exports.ChainId.ARBITRUM_ONE] = 3, _confirmationsConfig[exports.ChainId.BASE] = 3, _confirmationsConfig[exports.ChainId.SEPOLIA] = 3, _confirmationsConfig[exports.ChainId.HARDHAT] = 3, _confirmationsConfig);
+var DEFAULT_CONFIRMATIONS = 3;
+var getConfirmations = function getConfirmations(chainId) {
+  return confirmationsConfig[chainId] || DEFAULT_CONFIRMATIONS;
+};
 var DEFAULT_FEE_RATIO = 300n;
 var GAS_LIMIT_MULTIPLIER = 120n;
 var GAS_LIMIT_PRECISION = 100n;
@@ -5004,7 +5009,7 @@ var DepositService = /*#__PURE__*/function (_BaseContractService) {
           case 3:
             tx = _context4.v;
             _context4.n = 4;
-            return tx.wait();
+            return tx.wait(getConfirmations(this._darkSwap.chainId));
           case 4:
             return _context4.a(2);
         }
@@ -5292,104 +5297,6 @@ 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;
@@ -5506,7 +5413,7 @@ var WithdrawService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx, reciept;
+      var contract, tx;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -5525,15 +5432,8 @@ var WithdrawService = /*#__PURE__*/function (_BaseContractService) {
           case 3:
             tx = _context3.v;
             _context3.n = 4;
-            return safeWait(tx, this._darkSwap.provider);
+            return tx.wait();
           case 4:
-            reciept = _context3.v;
-            if (!(!reciept || reciept.status !== 1)) {
-              _context3.n = 5;
-              break;
-            }
-            throw new DarkSwapError('Failed to withdraw');
-          case 5:
             return _context3.a(2, tx.hash);
         }
       }, _callee3, this);
@@ -9361,7 +9261,7 @@ var RetailCancelOrderService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx, reciept;
+      var contract, tx;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -9380,15 +9280,8 @@ var RetailCancelOrderService = /*#__PURE__*/function (_BaseContractService) {
           case 3:
             tx = _context3.v;
             _context3.n = 4;
-            return safeWait(tx, this._darkSwap.provider);
+            return tx.wait();
           case 4:
-            reciept = _context3.v;
-            if (!(!reciept || reciept.status !== 1)) {
-              _context3.n = 5;
-              break;
-            }
-            throw new DarkSwapError('Failed to cancel order');
-          case 5:
             return _context3.a(2, tx.hash);
         }
       }, _callee3, this);
@@ -9567,7 +9460,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, reciept;
+      var signer, asset, amount, allowanceContract, allowance, isLegacy, contract, tx;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.n) {
           case 0:
@@ -9577,13 +9470,19 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             }
             throw new DarkSwapError('Invalid context');
           case 1:
+            if (!isNativeAsset(context.orderNote.asset)) {
+              _context4.n = 2;
+              break;
+            }
+            return _context4.a(2);
+          case 2:
             signer = this._darkSwap.signer;
             asset = context.orderNote.asset;
             amount = context.orderNote.amount;
             allowanceContract = new ethers.ethers.Contract(asset, ERC20Abi.abi, this._darkSwap);
-            _context4.n = 2;
+            _context4.n = 3;
             return allowanceContract.allowance(signer.getAddress(), this._darkSwap.contracts.darkSwapAssetManager);
-          case 2:
+          case 3:
             allowance = _context4.v;
             if (!(BigInt(allowance) < amount)) {
               _context4.n = 5;
@@ -9591,19 +9490,12 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             }
             isLegacy = legacyTokenConfig.hasOwnProperty(this._darkSwap.chainId) && legacyTokenConfig[this._darkSwap.chainId].includes(asset.toLowerCase());
             contract = new ethers.ethers.Contract(asset, isLegacy ? ERC20_USDT.abi : ERC20Abi.abi, signer);
-            _context4.n = 3;
-            return contract.approve(this._darkSwap.contracts.darkSwapAssetManager, hexlify32(MAX_ALLOWANCE));
-          case 3:
-            tx = _context4.v;
             _context4.n = 4;
-            return safeWait(tx, this._darkSwap.provider);
+            return contract.approve(this._darkSwap.contracts.darkSwapAssetManager, hexlify32(MAX_ALLOWANCE));
           case 4:
-            reciept = _context4.v;
-            if (!(!reciept || reciept.status !== 1)) {
-              _context4.n = 5;
-              break;
-            }
-            throw new DarkSwapError('Failed to approve token');
+            tx = _context4.v;
+            _context4.n = 5;
+            return tx.wait();
           case 5:
             return _context4.a(2);
         }
@@ -9616,7 +9508,7 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(context) {
-      var contract, ethAmount, tx, reciept, tmpIsNoteCreated;
+      var contract, ethAmount, tx;
       return _regenerator().w(function (_context5) {
         while (1) switch (_context5.n) {
           case 0:
@@ -9648,34 +9540,9 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             });
           case 5:
             tx = _context5.v;
-            console.log("=== before safeWait");
             _context5.n = 6;
-            return safeWait(tx, this._darkSwap.provider);
+            return tx.wait();
           case 6:
-            reciept = _context5.v;
-            if (reciept) {
-              _context5.n = 9;
-              break;
-            }
-            _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);
@@ -10344,6 +10211,7 @@ exports.createNote = createNote;
 exports.createOrderNoteExt = createOrderNoteExt;
 exports.deserializeDarkSwapMessage = deserializeDarkSwapMessage;
 exports.generateKeyPair = generateKeyPair;
+exports.getConfirmations = getConfirmations;
 exports.getFeeRatio = getFeeRatio;
 exports.getMerklePathAndRoot = getMerklePathAndRoot;
 exports.getNoteFooter = getNoteFooter;