@thesingularitynetwork/darkswap-sdk 0.1.24 → 0.1.26

package/dist/config/config.d.ts

@@ -2,3 +2,5 @@ export declare const legacyTokenConfig: {
     [chainId: number]: string[];
 };
 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

@@ -4184,6 +4184,8 @@ var ERC20_USDT = {
 var _legacyTokenConfig;
 var legacyTokenConfig = (_legacyTokenConfig = {}, _legacyTokenConfig[exports.ChainId.MAINNET] = ['0xdac17f958d2ee523a2206206994597c13d831ec7'], _legacyTokenConfig[exports.ChainId.HARDHAT] = ['0xdac17f958d2ee523a2206206994597c13d831ec7'], _legacyTokenConfig);
 var DEFAULT_FEE_RATIO = 300n;
+var GAS_LIMIT_MULTIPLIER = 120n;
+var GAS_LIMIT_PRECISION = 100n;
 
 var noir_version = "1.0.0-beta.6+e796dfd67726cbc28eb9991782533b211025928d";
 var hash = "7682678699971186506";
@@ -4680,6 +4682,61 @@ function _multiGetMerklePathAndRoot() {
   return _multiGetMerklePathAndRoot.apply(this, arguments);
 }
 
+var _contractConfig;
+var contractConfig = (_contractConfig = {}, _contractConfig[exports.ChainId.MAINNET] = {
+  priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+  merkleTreeOperator: '0x0',
+  darkSwapAssetManager: '0x0',
+  darkSwapFeeAssetManager: '0x0',
+  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-subgraph/version/v0.0.1/api'
+}, _contractConfig[exports.ChainId.ARBITRUM_ONE] = {
+  priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
+  merkleTreeOperator: '0x0',
+  darkSwapAssetManager: '0x0',
+  darkSwapFeeAssetManager: '0x0',
+  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-arb-subgraph/api'
+}, _contractConfig[exports.ChainId.BASE] = {
+  priceOracle: '0xf224a25453D76A41c4427DD1C05369BC9f498444',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0x4200000000000000000000000000000000000006',
+  merkleTreeOperator: '0x0',
+  darkSwapAssetManager: '0x0',
+  darkSwapFeeAssetManager: '0x0',
+  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-base-subgraph/api'
+}, _contractConfig[exports.ChainId.SEPOLIA] = {
+  priceOracle: '0x4Fe44a9aC8Ef059Be2dB97f9e3bcA32Ab698C2f2',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
+  merkleTreeOperator: '0x0',
+  darkSwapAssetManager: '0x0',
+  darkSwapFeeAssetManager: '0x0',
+  drakSwapSubgraphUrl: ''
+}, _contractConfig[exports.ChainId.HORIZEN_TESTNET] = {
+  priceOracle: '0x54c375f28ce4B0c2B986D6256E4Bc75d242A8793',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
+  merkleTreeOperator: '0x8Cd4061C8b3743810B811E1F4A0B597D79225f4E',
+  darkSwapAssetManager: '0xEBeD6c7C2189bf8ad6687D3A4cf4b83fB4D1a3D2',
+  darkSwapFeeAssetManager: '0x8CF86856Bd7dE95b4ba33DCae4cd5Ec02542Bf5b',
+  drakSwapSubgraphUrl: ''
+}, _contractConfig[exports.ChainId.HARDHAT] = {
+  priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
+  merkleTreeOperator: '0xEd8D7d3A98CB4ea6C91a80dcd2220719c264531f',
+  darkSwapAssetManager: '0x6D39d71fF4ab56a4873febd34e1a3BDefc01b41e',
+  darkSwapFeeAssetManager: '0xb9b0c96e4E7181926D2A7ed331C9C346dfa59b4D',
+  drakSwapSubgraphUrl: 'https://34.142.142.240:8080/subgraphs/name/singularity/'
+}, _contractConfig);
+
+function refineGasLimit(estimatedGas) {
+  return estimatedGas * GAS_LIMIT_MULTIPLIER / GAS_LIMIT_PRECISION;
+}
+
 var DepositContext = /*#__PURE__*/function (_BaseContext) {
   function DepositContext(signature) {
     return _BaseContext.call(this, signature) || this;
@@ -4807,7 +4864,7 @@ var DepositService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var signer, contract, tx, _tx;
+      var signer, contract, _contract$deposit, depositArgs, estimatedGas, gasLimit, tx, _contract$deposit2, _depositArgs, _estimatedGas, _tx;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -4823,32 +4880,49 @@ var DepositService = /*#__PURE__*/function (_BaseContractService) {
             signer = this._darkSwap.signer;
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, signer);
             if (isNativeAsset(context.newBalance.asset)) {
-              _context3.n = 6;
+              _context3.n = 7;
               break;
             }
             _context3.n = 3;
             return this.allowance(context);
           case 3:
+            depositArgs = [context.merkleRoot, context.newBalance.asset, hexlify32(context.depositAmount), context.proof.oldBalanceNullifier, hexlify32(context.newBalance.note), context.proof.newBalanceFooter, context.proof.proof];
             _context3.n = 4;
-            return contract.deposit(context.merkleRoot, context.newBalance.asset, hexlify32(context.depositAmount), context.proof.oldBalanceNullifier, hexlify32(context.newBalance.note), context.proof.newBalanceFooter, context.proof.proof, {
+            return (_contract$deposit = contract.deposit).estimateGas.apply(_contract$deposit, depositArgs.concat([{
               value: 0n
-            });
+            }]));
           case 4:
-            tx = _context3.v;
+            estimatedGas = _context3.v;
+            gasLimit = refineGasLimit(estimatedGas);
             _context3.n = 5;
-            return tx.wait();
+            return contract.deposit.apply(contract, depositArgs.concat([{
+              value: 0n,
+              gasLimit: gasLimit
+            }]));
           case 5:
-            return _context3.a(2, tx.hash);
+            tx = _context3.v;
+            _context3.n = 6;
+            return tx.wait();
           case 6:
-            _context3.n = 7;
-            return contract.deposit(context.merkleRoot, context.newBalance.asset, hexlify32(context.depositAmount), context.proof.oldBalanceNullifier, hexlify32(context.newBalance.note), context.proof.newBalanceFooter, context.proof.proof, {
-              value: context.depositAmount
-            });
+            return _context3.a(2, tx.hash);
           case 7:
-            _tx = _context3.v;
+            _depositArgs = [context.merkleRoot, context.newBalance.asset, hexlify32(context.depositAmount), context.proof.oldBalanceNullifier, hexlify32(context.newBalance.note), context.proof.newBalanceFooter, context.proof.proof];
             _context3.n = 8;
-            return _tx.wait();
+            return (_contract$deposit2 = contract.deposit).estimateGas.apply(_contract$deposit2, _depositArgs.concat([{
+              value: context.depositAmount
+            }]));
           case 8:
+            _estimatedGas = _context3.v;
+            _context3.n = 9;
+            return contract.deposit.apply(contract, _depositArgs.concat([{
+              value: context.depositAmount,
+              gasLimit: refineGasLimit(_estimatedGas)
+            }]));
+          case 9:
+            _tx = _context3.v;
+            _context3.n = 10;
+            return _tx.wait();
+          case 10:
             return _context3.a(2, _tx.hash);
         }
       }, _callee3, this);
@@ -5786,7 +5860,8 @@ var JoinService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx;
+      var _contract$join;
+      var contract, joinArgs, estimatedGas, gasLimit, tx;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -5800,13 +5875,21 @@ var JoinService = /*#__PURE__*/function (_BaseContractService) {
             throw new DarkSwapError('Invalid context');
           case 2:
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
+            joinArgs = [context.merkleRoot, [context.proof.inNullifier1, context.proof.inNullifier2, hexlify32(EMPTY_NULLIFIER)], hexlify32(context.outNote.note), context.proof.outNoteFooter, context.proof.proof];
             _context3.n = 3;
-            return contract.join(context.merkleRoot, [context.proof.inNullifier1, context.proof.inNullifier2, hexlify32(EMPTY_NULLIFIER)], hexlify32(context.outNote.note), context.proof.outNoteFooter, context.proof.proof);
+            return (_contract$join = contract.join).estimateGas.apply(_contract$join, joinArgs);
           case 3:
-            tx = _context3.v;
+            estimatedGas = _context3.v;
+            gasLimit = refineGasLimit(estimatedGas);
             _context3.n = 4;
-            return tx.wait();
+            return contract.join.apply(contract, joinArgs.concat([{
+              gasLimit: gasLimit
+            }]));
           case 4:
+            tx = _context3.v;
+            _context3.n = 5;
+            return tx.wait();
+          case 5:
             return _context3.a(2, tx.hash);
         }
       }, _callee3, this);
@@ -6356,7 +6439,8 @@ var TripleJoinService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx;
+      var _contract$join;
+      var contract, joinArgs, estimatedGas, gasLimit, tx;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -6370,9 +6454,17 @@ var TripleJoinService = /*#__PURE__*/function (_BaseContractService) {
             throw new DarkSwapError('Invalid context');
           case 2:
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
+            joinArgs = [context.merkleRoot, [context.proof.inNullifier1, context.proof.inNullifier2, context.proof.inNullifier3], hexlify32(context.outNote.note), context.proof.outNoteFooter, context.proof.proof];
             _context3.n = 3;
-            return contract.join(context.merkleRoot, [context.proof.inNullifier1, context.proof.inNullifier2, context.proof.inNullifier3], hexlify32(context.outNote.note), context.proof.outNoteFooter, context.proof.proof);
+            return (_contract$join = contract.join).estimateGas.apply(_contract$join, joinArgs);
           case 3:
+            estimatedGas = _context3.v;
+            gasLimit = refineGasLimit(estimatedGas);
+            _context3.n = 4;
+            return contract.join.apply(contract, joinArgs.concat([{
+              gasLimit: gasLimit
+            }]));
+          case 4:
             tx = _context3.v;
             return _context3.a(2, tx.hash);
         }
@@ -7231,7 +7323,7 @@ var ProCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
-      var contract, tx;
+      var contract, txData, estimatedGas, gasLimit, tx;
       return _regenerator().w(function (_context3) {
         while (1) switch (_context3.n) {
           case 0:
@@ -7245,13 +7337,21 @@ var ProCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             throw new DarkSwapError('Invalid context');
           case 2:
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
+            txData = [context.merkleRoot, context.proof.oldBalanceNullifier, hexlify32(context.newBalance.note), context.proof.newBalanceFooter, hexlify32(context.orderNote.note), context.proof.orderNoteFooter];
             _context3.n = 3;
-            return contract.proCreateOrder([context.merkleRoot, context.proof.oldBalanceNullifier, hexlify32(context.newBalance.note), context.proof.newBalanceFooter, hexlify32(context.orderNote.note), context.proof.orderNoteFooter], context.proof.proof);
+            return contract.proCreateOrder.estimateGas(txData, context.proof.proof);
           case 3:
-            tx = _context3.v;
+            estimatedGas = _context3.v;
+            gasLimit = refineGasLimit(estimatedGas);
             _context3.n = 4;
-            return tx.wait();
+            return contract.proCreateOrder(txData, context.proof.proof, {
+              gasLimit: gasLimit
+            });
           case 4:
+            tx = _context3.v;
+            _context3.n = 5;
+            return tx.wait();
+          case 5:
             return _context3.a(2, tx.hash);
         }
       }, _callee3, this);
@@ -8732,7 +8832,7 @@ var ProSwapService = /*#__PURE__*/function (_BaseContractService) {
   }();
   _proto.execute = /*#__PURE__*/function () {
     var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
-      var contract, tx;
+      var contract, swapArgs, estimatedGas, tx;
       return _regenerator().w(function (_context4) {
         while (1) switch (_context4.n) {
           case 0:
@@ -8746,13 +8846,20 @@ var ProSwapService = /*#__PURE__*/function (_BaseContractService) {
             throw new DarkSwapError('Invalid context');
           case 2:
             contract = new ethers.ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
+            swapArgs = [context.merkleRoot, context.proof.aliceOutNullifier, hexlify32(context.orderNote.feeRatio), hexlify32(context.swapInNote.note), context.proof.aliceInNoteFooter, hexlify32(context.changeNote.note), context.proof.aliceChangeNoteFooter, context.proof.bobOutNullifier, hexlify32(context.bobSwapMessage.orderNote.feeRatio), hexlify32(context.bobSwapMessage.inNote.note), context.proof.bobInNoteFooter];
             _context4.n = 3;
-            return contract.proSwap([context.merkleRoot, context.proof.aliceOutNullifier, hexlify32(context.orderNote.feeRatio), hexlify32(context.swapInNote.note), context.proof.aliceInNoteFooter, hexlify32(context.changeNote.note), context.proof.aliceChangeNoteFooter, context.proof.bobOutNullifier, hexlify32(context.bobSwapMessage.orderNote.feeRatio), hexlify32(context.bobSwapMessage.inNote.note), context.proof.bobInNoteFooter], context.proof.proof);
+            return contract.proSwap.estimateGas(swapArgs, context.proof.proof);
           case 3:
-            tx = _context4.v;
+            estimatedGas = _context4.v;
             _context4.n = 4;
-            return tx.wait();
+            return contract.proSwap(swapArgs, context.proof.proof, {
+              gasLimit: estimatedGas
+            });
           case 4:
+            tx = _context4.v;
+            _context4.n = 5;
+            return tx.wait();
+          case 5:
             return _context4.a(2, tx.hash);
         }
       }, _callee4, this);
@@ -9139,57 +9246,6 @@ var RetailCancelOrderService = /*#__PURE__*/function (_BaseContractService) {
   return RetailCancelOrderService;
 }(BaseContractService);
 
-var _contractConfig;
-var contractConfig = (_contractConfig = {}, _contractConfig[exports.ChainId.MAINNET] = {
-  priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
-  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-  nativeWrapper: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-subgraph/version/v0.0.1/api'
-}, _contractConfig[exports.ChainId.ARBITRUM_ONE] = {
-  priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
-  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-  nativeWrapper: '0x82af49447d8a07e3bd95bd0d56f35241523fbab1',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-arb-subgraph/api'
-}, _contractConfig[exports.ChainId.BASE] = {
-  priceOracle: '0xf224a25453D76A41c4427DD1C05369BC9f498444',
-  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-  nativeWrapper: '0x4200000000000000000000000000000000000006',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-base-subgraph/api'
-}, _contractConfig[exports.ChainId.SEPOLIA] = {
-  priceOracle: '0x4Fe44a9aC8Ef059Be2dB97f9e3bcA32Ab698C2f2',
-  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-  nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  drakSwapSubgraphUrl: ''
-}, _contractConfig[exports.ChainId.HORIZEN_TESTNET] = {
-  priceOracle: '0x54c375f28ce4B0c2B986D6256E4Bc75d242A8793',
-  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-  nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
-  merkleTreeOperator: '0x8Cd4061C8b3743810B811E1F4A0B597D79225f4E',
-  darkSwapAssetManager: '0xEBeD6c7C2189bf8ad6687D3A4cf4b83fB4D1a3D2',
-  darkSwapFeeAssetManager: '0x8CF86856Bd7dE95b4ba33DCae4cd5Ec02542Bf5b',
-  drakSwapSubgraphUrl: ''
-}, _contractConfig[exports.ChainId.HARDHAT] = {
-  priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
-  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
-  nativeWrapper: '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
-  merkleTreeOperator: '0xEd8D7d3A98CB4ea6C91a80dcd2220719c264531f',
-  darkSwapAssetManager: '0x6D39d71fF4ab56a4873febd34e1a3BDefc01b41e',
-  darkSwapFeeAssetManager: '0xb9b0c96e4E7181926D2A7ed331C9C346dfa59b4D',
-  drakSwapSubgraphUrl: 'https://34.142.142.240:8080/subgraphs/name/singularity/'
-}, _contractConfig);
-
 var RetailCreateOrderContext = /*#__PURE__*/function (_BaseContext) {
   function RetailCreateOrderContext(signature) {
     return _BaseContext.call(this, signature) || this;
@@ -10051,6 +10107,8 @@ exports.EMPTY_NOTE = EMPTY_NOTE;
 exports.EMPTY_NULLIFIER = EMPTY_NULLIFIER;
 exports.EMPTY_PATH = EMPTY_PATH;
 exports.FEE_RATIO_PRECISION = FEE_RATIO_PRECISION;
+exports.GAS_LIMIT_MULTIPLIER = GAS_LIMIT_MULTIPLIER;
+exports.GAS_LIMIT_PRECISION = GAS_LIMIT_PRECISION;
 exports.JoinService = JoinService;
 exports.ProCancelOrderService = ProCancelOrderService;
 exports.ProCreateOrderService = ProCreateOrderService;