@thesingularitynetwork/darkswap-sdk 0.2.4 → 0.2.7-beta1

package/dist/darkswap-sdk.esm.js

@@ -2579,6 +2579,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";
@@ -4204,13 +4224,19 @@ var ChainId;
   ChainId[ChainId["HARDHAT_BASE"] = 31339] = "HARDHAT_BASE";
   ChainId[ChainId["MAINNET"] = 1] = "MAINNET";
   ChainId[ChainId["SEPOLIA"] = 11155111] = "SEPOLIA";
+  ChainId[ChainId["BASE_SEPOLIA"] = 84532] = "BASE_SEPOLIA";
   ChainId[ChainId["HORIZEN_TESTNET"] = 845320009] = "HORIZEN_TESTNET";
   ChainId[ChainId["ARBITRUM_ONE"] = 42161] = "ARBITRUM_ONE";
   ChainId[ChainId["BASE"] = 8453] = "BASE";
 })(ChainId || (ChainId = {}));
 
-var _legacyTokenConfig;
+var _legacyTokenConfig, _confirmationsConfig;
 var legacyTokenConfig = (_legacyTokenConfig = {}, _legacyTokenConfig[ChainId.MAINNET] = ['0xdac17f958d2ee523a2206206994597c13d831ec7'], _legacyTokenConfig[ChainId.HARDHAT] = ['0xdac17f958d2ee523a2206206994597c13d831ec7'], _legacyTokenConfig);
+var confirmationsConfig = (_confirmationsConfig = {}, _confirmationsConfig[ChainId.MAINNET] = 3, _confirmationsConfig[ChainId.ARBITRUM_ONE] = 3, _confirmationsConfig[ChainId.BASE] = 3, _confirmationsConfig[ChainId.SEPOLIA] = 3, _confirmationsConfig[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;
@@ -4722,8 +4748,8 @@ var contractConfig = (_contractConfig = {}, _contractConfig[ChainId.MAINNET] = {
   darkSwapFeeAssetManager: '0x0',
   synaraDarkSwapOnBridgeAssetManager: '0x0',
   synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-subgraph/version/v0.0.1/api'
+  synaraCanonicalTokenRegistry: '0x0',
+  zkverifyRelayerUrls: []
 }, _contractConfig[ChainId.ARBITRUM_ONE] = {
   priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
@@ -4733,30 +4759,41 @@ var contractConfig = (_contractConfig = {}, _contractConfig[ChainId.MAINNET] = {
   darkSwapFeeAssetManager: '0x0',
   synaraDarkSwapOnBridgeAssetManager: '0x0',
   synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-arb-subgraph/api'
+  synaraCanonicalTokenRegistry: '0x0',
+  zkverifyRelayerUrls: []
 }, _contractConfig[ChainId.BASE] = {
   priceOracle: '0xf224a25453D76A41c4427DD1C05369BC9f498444',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0x4200000000000000000000000000000000000006',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
+  merkleTreeOperator: '0x918B4F76CAE5F67A3818D8eD3d0e11D9888684E9',
+  darkSwapAssetManager: '0x6fbA1F1aAb8449b7ba576E41F4617d918391b7cF',
+  darkSwapFeeAssetManager: '0xfde341e63EB2f25A32D353d58C2DAd7f91c8Bd57',
   synaraDarkSwapOnBridgeAssetManager: '0x0',
   synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: 'https://subgraph.satsuma-prod.com/1c6a44a9ed6e/pgs-team--611591/singularity-base-subgraph/api'
+  synaraCanonicalTokenRegistry: '0x0',
+  zkverifyRelayerUrls: []
 }, _contractConfig[ChainId.SEPOLIA] = {
   priceOracle: '0x4Fe44a9aC8Ef059Be2dB97f9e3bcA32Ab698C2f2',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
   nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
-  merkleTreeOperator: '0x0',
-  darkSwapAssetManager: '0x0',
-  darkSwapFeeAssetManager: '0x0',
-  synaraDarkSwapOnBridgeAssetManager: '0x0',
-  synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: ''
+  merkleTreeOperator: '0xbeCd9FD715d131F8E897095Ef008BB4d9325B744',
+  darkSwapAssetManager: '0x6E56b48361aD94Cb67EB5aA9182b2813bC76E6C0',
+  darkSwapFeeAssetManager: '0x5C550CE1F4a02865F0f59d839D86807C75A6ddE0',
+  synaraDarkSwapOnBridgeAssetManager: '0xEAC8292c1ef7b112Ccd5B3CB16E587E1799358db',
+  synaraBridge: '0x2a9569b5df66B7E24B4FdC2B91d19E4C1C02F2D3',
+  synaraCanonicalTokenRegistry: '0xD35264a934b5b7b8b3507b1d073e29EeBa4Dc754',
+  zkverifyRelayerUrls: []
+}, _contractConfig[ChainId.BASE_SEPOLIA] = {
+  priceOracle: '0x4Fe44a9aC8Ef059Be2dB97f9e3bcA32Ab698C2f2',
+  ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
+  nativeWrapper: '0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14',
+  merkleTreeOperator: '0xC486e448e068A888AF09c386337E3C3C4812569b',
+  darkSwapAssetManager: '0xEd349302ff6C2527be9555Fa386061652EAC712D',
+  darkSwapFeeAssetManager: '0xa62C0693296f64eb9BA29ff2E41E96749c18de0F',
+  synaraDarkSwapOnBridgeAssetManager: '0x0aAd845E874F0007e328862A3C455CB2D6625660',
+  synaraBridge: '0xda348F7dEAeE972D8a5B4D4D182EF0273aDd3E2c',
+  synaraCanonicalTokenRegistry: '0x016C6334d644E0B21aD5c6e91083Dd2f22739eB6',
+  zkverifyRelayerUrls: []
 }, _contractConfig[ChainId.HORIZEN_TESTNET] = {
   priceOracle: '0x54c375f28ce4B0c2B986D6256E4Bc75d242A8793',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
@@ -4766,8 +4803,8 @@ var contractConfig = (_contractConfig = {}, _contractConfig[ChainId.MAINNET] = {
   darkSwapFeeAssetManager: '0x8CF86856Bd7dE95b4ba33DCae4cd5Ec02542Bf5b',
   synaraDarkSwapOnBridgeAssetManager: '0x0',
   synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: ''
+  synaraCanonicalTokenRegistry: '0x0',
+  zkverifyRelayerUrls: []
 }, _contractConfig[ChainId.HARDHAT] = {
   priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
@@ -4777,8 +4814,8 @@ var contractConfig = (_contractConfig = {}, _contractConfig[ChainId.MAINNET] = {
   darkSwapFeeAssetManager: '0xb9b0c96e4E7181926D2A7ed331C9C346dfa59b4D',
   synaraDarkSwapOnBridgeAssetManager: '0x0',
   synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: 'https://app.dev.portalgate.me:8080/subgraphs/name/singularity/'
+  synaraCanonicalTokenRegistry: '0x0',
+  zkverifyRelayerUrls: []
 }, _contractConfig[ChainId.HARDHAT_BASE] = {
   priceOracle: '0x0AdDd25a91563696D8567Df78D5A01C9a991F9B8',
   ethAddress: '0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE',
@@ -4788,8 +4825,8 @@ var contractConfig = (_contractConfig = {}, _contractConfig[ChainId.MAINNET] = {
   darkSwapFeeAssetManager: '0xb9b0c96e4E7181926D2A7ed331C9C346dfa59b4D',
   synaraDarkSwapOnBridgeAssetManager: '0x0',
   synaraBridge: '0x0',
-  zkverifyRelayerUrls: [],
-  darkSwapSubgraphUrl: 'https://app.dev.portalgate.me:8080/subgraphs/name/singularity/'
+  synaraCanonicalTokenRegistry: '0x0',
+  zkverifyRelayerUrls: []
 }, _contractConfig);
 
 function refineGasLimit(estimatedGas) {
@@ -5020,7 +5057,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);
         }
@@ -9358,9 +9395,9 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
   }
   _inheritsLoose(RetailCreateOrderService, _BaseContractService);
   var _proto = RetailCreateOrderService.prototype;
-  _proto.prepare = /*#__PURE__*/function () {
-    var _prepare = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(address, depositAsset, depositAmount, swapInAsset, swapInAmount, signature) {
-      var _yield$generateKeyPai, pubKey, privKey, feeRatio, orderNote, feeAmount, realSwapInAmount, swapInNote, context, swapMessage, _t, _t2;
+  _proto.rebuildContextFromSwapMessage = /*#__PURE__*/function () {
+    var _rebuildContextFromSwapMessage = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(swapMessage, signature) {
+      var _yield$generateKeyPai, pubKey, context;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
@@ -9369,12 +9406,46 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
           case 1:
             _yield$generateKeyPai = _context.v;
             pubKey = _yield$generateKeyPai[0];
-            privKey = _yield$generateKeyPai[1];
+            if (validateOrderNoteWithPubKey(swapMessage.orderNote, pubKey)) {
+              _context.n = 2;
+              break;
+            }
+            throw new DarkSwapError('SwapMessage does not belong to this wallet');
+          case 2:
+            context = new RetailCreateOrderContext(signature);
+            context.orderNote = swapMessage.orderNote;
+            context.swapInNote = swapMessage.inNote;
+            context.feeAmount = swapMessage.feeAmount;
+            context.address = swapMessage.address;
+            _context.n = 3;
+            return this.generateProof(context);
+          case 3:
+            return _context.a(2, context);
+        }
+      }, _callee, this);
+    }));
+    function rebuildContextFromSwapMessage(_x, _x2) {
+      return _rebuildContextFromSwapMessage.apply(this, arguments);
+    }
+    return rebuildContextFromSwapMessage;
+  }();
+  _proto.prepare = /*#__PURE__*/function () {
+    var _prepare = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(address, depositAsset, depositAmount, swapInAsset, swapInAmount, signature) {
+      var _yield$generateKeyPai2, pubKey, privKey, feeRatio, orderNote, feeAmount, realSwapInAmount, swapInNote, context, swapMessage, _t, _t2;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
+          case 0:
+            _context2.n = 1;
+            return generateKeyPair(signature);
+          case 1:
+            _yield$generateKeyPai2 = _context2.v;
+            pubKey = _yield$generateKeyPai2[0];
+            privKey = _yield$generateKeyPai2[1];
             _t = BigInt;
-            _context.n = 2;
+            _context2.n = 2;
             return getFeeRatio(address, this._darkSwap);
           case 2:
-            _t2 = _context.v;
+            _t2 = _context2.v;
             feeRatio = _t(_t2);
             orderNote = createOrderNoteExt(address, depositAsset, depositAmount, feeRatio, pubKey);
             feeAmount = calcFeeAmount(swapInAmount, feeRatio);
@@ -9385,36 +9456,36 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             context.swapInNote = swapInNote;
             context.feeAmount = feeAmount;
             context.address = address;
-            _context.n = 3;
+            _context2.n = 3;
             return generateRetailSwapMessage(address, orderNote, swapInNote, feeAmount, pubKey, privKey);
           case 3:
-            swapMessage = _context.v;
+            swapMessage = _context2.v;
             context.swapMessage = swapMessage;
-            return _context.a(2, {
+            return _context2.a(2, {
               context: context,
               swapMessage: swapMessage
             });
         }
-      }, _callee, this);
+      }, _callee2, this);
     }));
-    function prepare(_x, _x2, _x3, _x4, _x5, _x6) {
+    function prepare(_x3, _x4, _x5, _x6, _x7, _x8) {
       return _prepare.apply(this, arguments);
     }
     return prepare;
   }();
   _proto.generateProof = /*#__PURE__*/function () {
-    var _generateProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context) {
+    var _generateProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
       var proof;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.swapInNote || !context.address || !context.feeAmount || !context.signature)) {
-              _context2.n = 1;
+              _context3.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
           case 1:
-            _context2.n = 2;
+            _context3.n = 2;
             return generateRetailCreateOrderProof({
               depositNote: context.orderNote,
               swapInNote: context.swapInNote,
@@ -9423,71 +9494,77 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
               feeAmount: context.feeAmount
             });
           case 2:
-            proof = _context2.v;
+            proof = _context3.v;
             context.proof = proof;
           case 3:
-            return _context2.a(2);
+            return _context3.a(2);
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    function generateProof(_x7) {
+    function generateProof(_x9) {
       return _generateProof.apply(this, arguments);
     }
     return generateProof;
   }();
   _proto.allowance = /*#__PURE__*/function () {
-    var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
+    var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
       var signer, asset, amount, allowanceContract, allowance, isLegacy, contract, tx;
-      return _regenerator().w(function (_context3) {
-        while (1) switch (_context3.n) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.address || !context.signature || !context.proof)) {
-              _context3.n = 1;
+              _context4.n = 1;
               break;
             }
             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.Contract(asset, ERC20Abi.abi, this._darkSwap);
-            _context3.n = 2;
+            _context4.n = 3;
             return allowanceContract.allowance(signer.getAddress(), this._darkSwap.contracts.darkSwapAssetManager);
-          case 2:
-            allowance = _context3.v;
+          case 3:
+            allowance = _context4.v;
             if (!(BigInt(allowance) < amount)) {
-              _context3.n = 4;
+              _context4.n = 5;
               break;
             }
             isLegacy = legacyTokenConfig.hasOwnProperty(this._darkSwap.chainId) && legacyTokenConfig[this._darkSwap.chainId].includes(asset.toLowerCase());
             contract = new ethers.Contract(asset, isLegacy ? ERC20_USDT.abi : ERC20Abi.abi, signer);
-            _context3.n = 3;
+            _context4.n = 4;
             return contract.approve(this._darkSwap.contracts.darkSwapAssetManager, hexlify32(MAX_ALLOWANCE));
-          case 3:
-            tx = _context3.v;
-            _context3.n = 4;
-            return tx.wait();
           case 4:
-            return _context3.a(2);
+            tx = _context4.v;
+            _context4.n = 5;
+            return tx.wait(getConfirmations(this._darkSwap.chainId));
+          case 5:
+            return _context4.a(2);
         }
-      }, _callee3, this);
+      }, _callee4, this);
     }));
-    function allowance(_x8) {
+    function allowance(_x0) {
       return _allowance.apply(this, arguments);
     }
     return allowance;
   }();
   _proto.execute = /*#__PURE__*/function () {
-    var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
+    var _execute = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(context) {
       var contract, ethAmount, tx;
-      return _regenerator().w(function (_context4) {
-        while (1) switch (_context4.n) {
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
-            _context4.n = 1;
+            _context5.n = 1;
             return this.generateProof(context);
           case 1:
             if (!(!context || !context.orderNote || !context.swapInNote || !context.proof)) {
-              _context4.n = 2;
+              _context5.n = 2;
               break;
             }
             throw new DarkSwapError('Invalid context');
@@ -9495,30 +9572,30 @@ var RetailCreateOrderService = /*#__PURE__*/function (_BaseContractService) {
             contract = new ethers.Contract(this._darkSwap.contracts.darkSwapAssetManager, DarkSwapAssetManagerAbi.abi, this._darkSwap.signer);
             ethAmount = 0n;
             if (!isNativeAsset(context.orderNote.asset)) {
-              _context4.n = 3;
+              _context5.n = 3;
               break;
             }
             ethAmount = context.orderNote.amount;
-            _context4.n = 4;
+            _context5.n = 4;
             break;
           case 3:
-            _context4.n = 4;
+            _context5.n = 4;
             return this.allowance(context);
           case 4:
-            _context4.n = 5;
+            _context5.n = 5;
             return contract.retailDepositCreateOrder([hexlify32(context.orderNote.note), context.proof.depositFooter, context.orderNote.asset, bn_to_0xhex(context.orderNote.amount), hexlify32(context.swapInNote.note), context.proof.swapInNoteFooter], context.proof.proof, {
               value: bn_to_0xhex(ethAmount)
             });
           case 5:
-            tx = _context4.v;
-            _context4.n = 6;
+            tx = _context5.v;
+            _context5.n = 6;
             return tx.wait();
           case 6:
-            return _context4.a(2, tx.hash);
+            return _context5.a(2, tx.hash);
         }
-      }, _callee4, this);
+      }, _callee5, this);
     }));
-    function execute(_x9) {
+    function execute(_x1) {
       return _execute.apply(this, arguments);
     }
     return execute;
@@ -9868,7 +9945,7 @@ function generateRetailSwapProof(_x) {
 }
 function _generateRetailSwapProof() {
   _generateRetailSwapProof = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(param) {
-    var aliceFeeAmount, bobFeeAmount, aliceOrderNoteNullifier, aliceInNoteFooter, bobOrderNoteNullifier, bobInNoteFooter, aliceAddressMod, bobAddressMod, inputs, proof;
+    var aliceOrderNoteNullifier, aliceInNoteFooter, bobOrderNoteNullifier, bobInNoteFooter, aliceAddressMod, bobAddressMod, inputs, proof;
     return _regenerator().w(function (_context) {
       while (1) switch (_context.n) {
         case 0:
@@ -9884,14 +9961,12 @@ function _generateRetailSwapProof() {
           }
           throw new DarkSwapProofError("Invalid note amount");
         case 2:
-          if (!(param.aliceMessage.orderNote.amount != param.bobMessage.inNote.amount || param.bobMessage.orderNote.amount != param.aliceMessage.inNote.amount)) {
+          if (!(param.aliceMessage.orderNote.amount != param.bobMessage.inNote.amount + param.bobMessage.feeAmount || param.bobMessage.orderNote.amount != param.aliceMessage.inNote.amount + param.aliceMessage.feeAmount)) {
             _context.n = 3;
             break;
           }
           throw new DarkSwapProofError("Invalid order amount");
         case 3:
-          aliceFeeAmount = param.aliceMessage.inNote.amount * param.aliceMessage.orderNote.feeRatio / FEE_RATIO_PRECISION;
-          bobFeeAmount = param.bobMessage.inNote.amount * param.bobMessage.orderNote.feeRatio / FEE_RATIO_PRECISION;
           aliceOrderNoteNullifier = calcNullifier(param.aliceMessage.orderNote.rho, param.aliceMessage.publicKey);
           aliceInNoteFooter = getNoteFooter(param.aliceMessage.inNote.rho, param.aliceMessage.publicKey);
           bobOrderNoteNullifier = calcNullifier(param.bobMessage.orderNote.rho, param.bobMessage.publicKey);
@@ -9911,10 +9986,10 @@ function _generateRetailSwapProof() {
             alice_out_note: bn_to_0xhex(param.aliceMessage.orderNote.note),
             alice_out_nullifier: bn_to_0xhex(aliceOrderNoteNullifier),
             alice_fee_ratio: bn_to_0xhex(param.aliceMessage.orderNote.feeRatio),
-            alice_fee_amount: bn_to_0xhex(aliceFeeAmount),
+            alice_fee_amount: bn_to_0xhex(param.aliceMessage.feeAmount),
             alice_in_rho: bn_to_0xhex(param.aliceMessage.inNote.rho),
             alice_in_asset: bn_to_0xhex(encodeAddress(param.aliceMessage.inNote.asset)),
-            alice_in_amount: bn_to_0xhex(param.aliceMessage.inNote.amount),
+            alice_in_amount: bn_to_0xhex(param.aliceMessage.inNote.amount + param.aliceMessage.feeAmount),
             alice_in_note: bn_to_0xhex(param.aliceMessage.inNote.note),
             alice_in_note_footer: bn_to_0xhex(aliceInNoteFooter),
             alice_pub_key: [param.aliceMessage.publicKey[0].toString(), param.aliceMessage.publicKey[1].toString()],
@@ -9928,7 +10003,7 @@ function _generateRetailSwapProof() {
             bob_out_rho: bn_to_0xhex(param.bobMessage.orderNote.rho),
             bob_out_nullifier: bn_to_0xhex(bobOrderNoteNullifier),
             bob_fee_ratio: bn_to_0xhex(param.bobMessage.orderNote.feeRatio),
-            bob_fee_amount: bn_to_0xhex(bobFeeAmount),
+            bob_fee_amount: bn_to_0xhex(param.bobMessage.feeAmount),
             bob_in_note: bn_to_0xhex(param.bobMessage.inNote.note),
             bob_in_rho: bn_to_0xhex(param.bobMessage.inNote.rho),
             bob_in_note_footer: bn_to_0xhex(bobInNoteFooter),
@@ -11109,144 +11184,1614 @@ var SynaraDarkSwapOnBridgeAssetManagerAbi = {
 	deployedLinkReferences: deployedLinkReferences$5
 };
 
-var _DOMAIN_PREFIX = "0x191253796e6172614272696467654465706f7369740a";
-var BridgeCreateOrderContext = /*#__PURE__*/function (_BaseContext) {
-  function BridgeCreateOrderContext(signature) {
-    return _BaseContext.call(this, signature) || this;
-  }
-  _inheritsLoose(BridgeCreateOrderContext, _BaseContext);
-  return _createClass(BridgeCreateOrderContext, [{
-    key: "orderNote",
-    get: function get() {
-      return this._orderNote;
-    },
-    set: function set(orderNote) {
-      this._orderNote = orderNote;
-    }
-  }, {
-    key: "swapInNote",
-    get: function get() {
-      return this._swapInNote;
-    },
-    set: function set(swapInNote) {
-      this._swapInNote = swapInNote;
-    }
-  }, {
-    key: "feeAmount",
-    get: function get() {
-      return this._feeAmount;
-    },
-    set: function set(feeAmount) {
-      this._feeAmount = feeAmount;
-    }
-  }, {
-    key: "proof",
-    get: function get() {
-      return this._proof;
-    },
-    set: function set(proof) {
-      this._proof = proof;
-    }
-  }, {
-    key: "swapMessage",
-    get: function get() {
-      return this._swapMessage;
-    },
-    set: function set(swapMessage) {
-      this._swapMessage = swapMessage;
-    }
-  }, {
-    key: "sourceChainId",
-    get: function get() {
-      return this._sourceChainId;
-    },
-    set: function set(sourceChainId) {
-      this._sourceChainId = sourceChainId;
-    }
-  }, {
-    key: "destChainId",
-    get: function get() {
-      return this._destChainId;
-    },
-    set: function set(destChainId) {
-      this._destChainId = destChainId;
-    }
-  }, {
-    key: "sourceAsset",
-    get: function get() {
-      return this._sourceAsset;
-    },
-    set: function set(sourceAsset) {
-      this._sourceAsset = sourceAsset;
-    }
-  }, {
-    key: "sourceAmount",
-    get: function get() {
-      return this._sourceAmount;
-    },
-    set: function set(sourceAmount) {
-      this._sourceAmount = sourceAmount;
-    }
-  }, {
-    key: "bridgeFeeAmount",
-    get: function get() {
-      return this._bridgeFeeAmount;
-    },
-    set: function set(bridgeFeeAmount) {
-      this._bridgeFeeAmount = bridgeFeeAmount;
-    }
-  }, {
-    key: "depositId",
-    get: function get() {
-      return this._depositId;
-    },
-    set: function set(depositId) {
-      this._depositId = depositId;
-    }
-  }, {
-    key: "attestationDetails",
-    get: function get() {
-      return this._attestationDetails;
-    },
-    set: function set(attestationDetails) {
-      this._attestationDetails = attestationDetails;
-    }
-  }, {
-    key: "relayer",
-    get: function get() {
-      return this._relayer;
-    },
-    set: function set(relayer) {
-      this._relayer = relayer;
-    }
-  }, {
-    key: "jobId",
-    get: function get() {
-      return this._jobId;
-    },
-    set: function set(jobId) {
-      this._jobId = jobId;
-    }
-  }, {
-    key: "canonicalId",
-    get: function get() {
-      return this._canonicalId;
-    },
-    set: function set(canonicalId) {
-      this._canonicalId = canonicalId;
-    }
-  }, {
-    key: "callDataHash",
-    get: function get() {
-      return this._callDataHash;
-    },
-    set: function set(callDataHash) {
-      this._callDataHash = callDataHash;
-    }
-  }, {
-    key: "nonce",
-    get: function get() {
-      return this._nonce;
+var CanonicalTokenRegistryAbi = [
+	{
+		inputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "constructor"
+	},
+	{
+		inputs: [
+		],
+		name: "AccessControlBadConfirmation",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "account",
+				type: "address"
+			},
+			{
+				internalType: "bytes32",
+				name: "neededRole",
+				type: "bytes32"
+			}
+		],
+		name: "AccessControlUnauthorizedAccount",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "AlreadyRegistered",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "EnforcedPause",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "ExpectedPause",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "NotRegistered",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "TokenAlreadyMapped",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "ZeroAddress",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "ZeroCanonicalId",
+		type: "error"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: false,
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "Paused",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "previousAdminRole",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "newAdminRole",
+				type: "bytes32"
+			}
+		],
+		name: "RoleAdminChanged",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "account",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "sender",
+				type: "address"
+			}
+		],
+		name: "RoleGranted",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "account",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "sender",
+				type: "address"
+			}
+		],
+		name: "RoleRevoked",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "token",
+				type: "address"
+			}
+		],
+		name: "TokenMappingRemoved",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "token",
+				type: "address"
+			}
+		],
+		name: "TokenMappingSet",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: false,
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "Unpaused",
+		type: "event"
+	},
+	{
+		inputs: [
+		],
+		name: "DEFAULT_ADMIN_ROLE",
+		outputs: [
+			{
+				internalType: "bytes32",
+				name: "",
+				type: "bytes32"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "GUARDIAN_ROLE",
+		outputs: [
+			{
+				internalType: "bytes32",
+				name: "",
+				type: "bytes32"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "OPERATOR_ROLE",
+		outputs: [
+			{
+				internalType: "bytes32",
+				name: "",
+				type: "bytes32"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "token",
+				type: "address"
+			}
+		],
+		name: "getCanonicalId",
+		outputs: [
+			{
+				internalType: "bytes32",
+				name: "",
+				type: "bytes32"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			}
+		],
+		name: "getRoleAdmin",
+		outputs: [
+			{
+				internalType: "bytes32",
+				name: "",
+				type: "bytes32"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			}
+		],
+		name: "getToken",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "grantRole",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "hasRole",
+		outputs: [
+			{
+				internalType: "bool",
+				name: "",
+				type: "bool"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			}
+		],
+		name: "isRegistered",
+		outputs: [
+			{
+				internalType: "bool",
+				name: "",
+				type: "bool"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "pause",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "paused",
+		outputs: [
+			{
+				internalType: "bool",
+				name: "",
+				type: "bool"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			}
+		],
+		name: "removeTokenMapping",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				internalType: "address",
+				name: "callerConfirmation",
+				type: "address"
+			}
+		],
+		name: "renounceRole",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "role",
+				type: "bytes32"
+			},
+			{
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "revokeRole",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				internalType: "address",
+				name: "token",
+				type: "address"
+			}
+		],
+		name: "setTokenMapping",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes4",
+				name: "interfaceId",
+				type: "bytes4"
+			}
+		],
+		name: "supportsInterface",
+		outputs: [
+			{
+				internalType: "bool",
+				name: "",
+				type: "bool"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "unpause",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	}
+];
+
+var _format$6 = "hh-sol-artifact-1";
+var contractName$6 = "Bridge";
+var sourceName$6 = "src/Bridge.sol";
+var abi$h = [
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "_erc20Pool",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "_nativePool",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "feeManager",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "verifierHub",
+				type: "address"
+			},
+			{
+				internalType: "address",
+				name: "initialOwner",
+				type: "address"
+			}
+		],
+		stateMutability: "nonpayable",
+		type: "constructor"
+	},
+	{
+		inputs: [
+		],
+		name: "AmountZero",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "CallDataHashMismatch",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "CallerNotRegistered",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "DepositExists",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "DepositUsed",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "NonceTooLow",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "owner",
+				type: "address"
+			}
+		],
+		name: "OwnableInvalidOwner",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "account",
+				type: "address"
+			}
+		],
+		name: "OwnableUnauthorizedAccount",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "ReentrancyGuardReentrantCall",
+		type: "error"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "token",
+				type: "address"
+			}
+		],
+		name: "SafeERC20FailedOperation",
+		type: "error"
+	},
+	{
+		inputs: [
+		],
+		name: "ZeroAddress",
+		type: "error"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "depositCommitment",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "canonicalTokenId",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "from",
+				type: "address"
+			},
+			{
+				indexed: false,
+				internalType: "address",
+				name: "owner",
+				type: "address"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "destinationChain",
+				type: "uint256"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "nonce",
+				type: "uint256"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "sourceChain",
+				type: "uint256"
+			},
+			{
+				indexed: false,
+				internalType: "address",
+				name: "destContract",
+				type: "address"
+			},
+			{
+				indexed: false,
+				internalType: "bytes",
+				name: "callData",
+				type: "bytes"
+			}
+		],
+		name: "Deposited",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "address",
+				name: "previousOwner",
+				type: "address"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "newOwner",
+				type: "address"
+			}
+		],
+		name: "OwnershipTransferred",
+		type: "event"
+	},
+	{
+		anonymous: false,
+		inputs: [
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "depositCommitment",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "bytes32",
+				name: "canonicalTokenId",
+				type: "bytes32"
+			},
+			{
+				indexed: true,
+				internalType: "address",
+				name: "to",
+				type: "address"
+			},
+			{
+				indexed: false,
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			},
+			{
+				indexed: false,
+				internalType: "bytes",
+				name: "callData",
+				type: "bytes"
+			}
+		],
+		name: "Withdrawal",
+		type: "event"
+	},
+	{
+		inputs: [
+		],
+		name: "SYNARA_BRIDGE",
+		outputs: [
+			{
+				internalType: "uint256",
+				name: "",
+				type: "uint256"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			},
+			{
+				internalType: "uint256",
+				name: "destinationChainId",
+				type: "uint256"
+			},
+			{
+				internalType: "uint256",
+				name: "nonce",
+				type: "uint256"
+			}
+		],
+		name: "depositERC20",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			},
+			{
+				internalType: "uint256",
+				name: "destinationChainId",
+				type: "uint256"
+			},
+			{
+				internalType: "uint256",
+				name: "nonce",
+				type: "uint256"
+			},
+			{
+				components: [
+					{
+						internalType: "address",
+						name: "target",
+						type: "address"
+					},
+					{
+						internalType: "bytes",
+						name: "data",
+						type: "bytes"
+					}
+				],
+				internalType: "struct Bridge.CrossChainCall",
+				name: "call",
+				type: "tuple"
+			}
+		],
+		name: "depositERC20WithCallData",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				internalType: "uint256",
+				name: "destinationChainId",
+				type: "uint256"
+			},
+			{
+				internalType: "uint256",
+				name: "nonce",
+				type: "uint256"
+			}
+		],
+		name: "depositNative",
+		outputs: [
+		],
+		stateMutability: "payable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				internalType: "uint256",
+				name: "destinationChainId",
+				type: "uint256"
+			},
+			{
+				internalType: "uint256",
+				name: "nonce",
+				type: "uint256"
+			},
+			{
+				components: [
+					{
+						internalType: "address",
+						name: "target",
+						type: "address"
+					},
+					{
+						internalType: "bytes",
+						name: "data",
+						type: "bytes"
+					}
+				],
+				internalType: "struct Bridge.CrossChainCall",
+				name: "call",
+				type: "tuple"
+			}
+		],
+		name: "depositNativeWithCallData",
+		outputs: [
+		],
+		stateMutability: "payable",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "erc20Pool",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "bytes32",
+				name: "canonicalId",
+				type: "bytes32"
+			},
+			{
+				internalType: "address",
+				name: "wallet",
+				type: "address"
+			},
+			{
+				internalType: "uint256",
+				name: "amount",
+				type: "uint256"
+			}
+		],
+		name: "getBridgeFee",
+		outputs: [
+			{
+				internalType: "uint256",
+				name: "",
+				type: "uint256"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "nativePool",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "owner",
+		outputs: [
+			{
+				internalType: "address",
+				name: "",
+				type: "address"
+			}
+		],
+		stateMutability: "view",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "caller",
+				type: "address"
+			},
+			{
+				internalType: "bool",
+				name: "registered",
+				type: "bool"
+			}
+		],
+		name: "registerCaller",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "relayer",
+				type: "address"
+			},
+			{
+				internalType: "bool",
+				name: "registered",
+				type: "bool"
+			}
+		],
+		name: "registerRelayer",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+		],
+		name: "renounceOwnership",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				internalType: "address",
+				name: "newOwner",
+				type: "address"
+			}
+		],
+		name: "transferOwnership",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				components: [
+					{
+						internalType: "bytes32",
+						name: "canonicalId",
+						type: "bytes32"
+					},
+					{
+						internalType: "uint256",
+						name: "amount",
+						type: "uint256"
+					},
+					{
+						internalType: "address",
+						name: "to",
+						type: "address"
+					},
+					{
+						internalType: "bytes",
+						name: "callData",
+						type: "bytes"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "address",
+						name: "from",
+						type: "address"
+					},
+					{
+						internalType: "address",
+						name: "owner",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "destinationChainId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashLow16",
+						type: "bytes32"
+					}
+				],
+				internalType: "struct Bridge.WithdrawalArguments",
+				name: "_args",
+				type: "tuple"
+			},
+			{
+				components: [
+					{
+						internalType: "uint256",
+						name: "attestationId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32[]",
+						name: "merklePath",
+						type: "bytes32[]"
+					},
+					{
+						internalType: "uint256",
+						name: "leafCount",
+						type: "uint256"
+					},
+					{
+						internalType: "uint256",
+						name: "index",
+						type: "uint256"
+					}
+				],
+				internalType: "struct IZkvHub.AttestationDetails",
+				name: "_attDetails",
+				type: "tuple"
+			}
+		],
+		name: "withdrawERC20",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				components: [
+					{
+						internalType: "bytes32",
+						name: "canonicalId",
+						type: "bytes32"
+					},
+					{
+						internalType: "uint256",
+						name: "amount",
+						type: "uint256"
+					},
+					{
+						internalType: "address",
+						name: "to",
+						type: "address"
+					},
+					{
+						internalType: "bytes",
+						name: "callData",
+						type: "bytes"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "address",
+						name: "from",
+						type: "address"
+					},
+					{
+						internalType: "address",
+						name: "owner",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "destinationChainId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashLow16",
+						type: "bytes32"
+					}
+				],
+				internalType: "struct Bridge.WithdrawalArguments",
+				name: "_args",
+				type: "tuple"
+			},
+			{
+				components: [
+					{
+						internalType: "uint256",
+						name: "attestationId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32[]",
+						name: "merklePath",
+						type: "bytes32[]"
+					},
+					{
+						internalType: "uint256",
+						name: "leafCount",
+						type: "uint256"
+					},
+					{
+						internalType: "uint256",
+						name: "index",
+						type: "uint256"
+					}
+				],
+				internalType: "struct IZkvHub.AttestationDetails",
+				name: "_attDetails",
+				type: "tuple"
+			}
+		],
+		name: "withdrawERC20ToContract",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				components: [
+					{
+						internalType: "bytes32",
+						name: "canonicalId",
+						type: "bytes32"
+					},
+					{
+						internalType: "uint256",
+						name: "amount",
+						type: "uint256"
+					},
+					{
+						internalType: "address",
+						name: "to",
+						type: "address"
+					},
+					{
+						internalType: "bytes",
+						name: "callData",
+						type: "bytes"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "address",
+						name: "from",
+						type: "address"
+					},
+					{
+						internalType: "address",
+						name: "owner",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "destinationChainId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashLow16",
+						type: "bytes32"
+					}
+				],
+				internalType: "struct Bridge.WithdrawalArguments",
+				name: "_args",
+				type: "tuple"
+			},
+			{
+				components: [
+					{
+						internalType: "uint256",
+						name: "attestationId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32[]",
+						name: "merklePath",
+						type: "bytes32[]"
+					},
+					{
+						internalType: "uint256",
+						name: "leafCount",
+						type: "uint256"
+					},
+					{
+						internalType: "uint256",
+						name: "index",
+						type: "uint256"
+					}
+				],
+				internalType: "struct IZkvHub.AttestationDetails",
+				name: "_attDetails",
+				type: "tuple"
+			}
+		],
+		name: "withdrawNative",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	},
+	{
+		inputs: [
+			{
+				components: [
+					{
+						internalType: "bytes32",
+						name: "canonicalId",
+						type: "bytes32"
+					},
+					{
+						internalType: "uint256",
+						name: "amount",
+						type: "uint256"
+					},
+					{
+						internalType: "address",
+						name: "to",
+						type: "address"
+					},
+					{
+						internalType: "bytes",
+						name: "callData",
+						type: "bytes"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "stateRootLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "depositCommitmentLow16",
+						type: "bytes32"
+					},
+					{
+						internalType: "address",
+						name: "from",
+						type: "address"
+					},
+					{
+						internalType: "address",
+						name: "owner",
+						type: "address"
+					},
+					{
+						internalType: "uint256",
+						name: "destinationChainId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashHigh16",
+						type: "bytes32"
+					},
+					{
+						internalType: "bytes32",
+						name: "calldataHashLow16",
+						type: "bytes32"
+					}
+				],
+				internalType: "struct Bridge.WithdrawalArguments",
+				name: "_args",
+				type: "tuple"
+			},
+			{
+				components: [
+					{
+						internalType: "uint256",
+						name: "attestationId",
+						type: "uint256"
+					},
+					{
+						internalType: "bytes32[]",
+						name: "merklePath",
+						type: "bytes32[]"
+					},
+					{
+						internalType: "uint256",
+						name: "leafCount",
+						type: "uint256"
+					},
+					{
+						internalType: "uint256",
+						name: "index",
+						type: "uint256"
+					}
+				],
+				internalType: "struct IZkvHub.AttestationDetails",
+				name: "_attDetails",
+				type: "tuple"
+			}
+		],
+		name: "withdrawNativeToContract",
+		outputs: [
+		],
+		stateMutability: "nonpayable",
+		type: "function"
+	}
+];
+var bytecode$h = "";
+var deployedBytecode$6 = "";
+var linkReferences$6 = {
+};
+var deployedLinkReferences$6 = {
+};
+var BridgeAbi = {
+	_format: _format$6,
+	contractName: contractName$6,
+	sourceName: sourceName$6,
+	abi: abi$h,
+	bytecode: bytecode$h,
+	deployedBytecode: deployedBytecode$6,
+	linkReferences: linkReferences$6,
+	deployedLinkReferences: deployedLinkReferences$6
+};
+
+var _DOMAIN_PREFIX = "0x191253796e6172614272696467654465706f7369740a";
+var BridgeCreateOrderContext = /*#__PURE__*/function (_BaseContext) {
+  function BridgeCreateOrderContext(signature) {
+    return _BaseContext.call(this, signature) || this;
+  }
+  _inheritsLoose(BridgeCreateOrderContext, _BaseContext);
+  return _createClass(BridgeCreateOrderContext, [{
+    key: "orderNote",
+    get: function get() {
+      return this._orderNote;
+    },
+    set: function set(orderNote) {
+      this._orderNote = orderNote;
+    }
+  }, {
+    key: "swapInNote",
+    get: function get() {
+      return this._swapInNote;
+    },
+    set: function set(swapInNote) {
+      this._swapInNote = swapInNote;
+    }
+  }, {
+    key: "feeAmount",
+    get: function get() {
+      return this._feeAmount;
+    },
+    set: function set(feeAmount) {
+      this._feeAmount = feeAmount;
+    }
+  }, {
+    key: "proof",
+    get: function get() {
+      return this._proof;
+    },
+    set: function set(proof) {
+      this._proof = proof;
+    }
+  }, {
+    key: "swapMessage",
+    get: function get() {
+      return this._swapMessage;
+    },
+    set: function set(swapMessage) {
+      this._swapMessage = swapMessage;
+    }
+  }, {
+    key: "sourceChainId",
+    get: function get() {
+      return this._sourceChainId;
+    },
+    set: function set(sourceChainId) {
+      this._sourceChainId = sourceChainId;
+    }
+  }, {
+    key: "destChainId",
+    get: function get() {
+      return this._destChainId;
+    },
+    set: function set(destChainId) {
+      this._destChainId = destChainId;
+    }
+  }, {
+    key: "sourceAsset",
+    get: function get() {
+      return this._sourceAsset;
+    },
+    set: function set(sourceAsset) {
+      this._sourceAsset = sourceAsset;
+    }
+  }, {
+    key: "sourceAmount",
+    get: function get() {
+      return this._sourceAmount;
+    },
+    set: function set(sourceAmount) {
+      this._sourceAmount = sourceAmount;
+    }
+  }, {
+    key: "bridgeFeeAmount",
+    get: function get() {
+      return this._bridgeFeeAmount;
+    },
+    set: function set(bridgeFeeAmount) {
+      this._bridgeFeeAmount = bridgeFeeAmount;
+    }
+  }, {
+    key: "depositId",
+    get: function get() {
+      return this._depositId;
+    },
+    set: function set(depositId) {
+      this._depositId = depositId;
+    }
+  }, {
+    key: "attestationDetails",
+    get: function get() {
+      return this._attestationDetails;
+    },
+    set: function set(attestationDetails) {
+      this._attestationDetails = attestationDetails;
+    }
+  }, {
+    key: "relayer",
+    get: function get() {
+      return this._relayer;
+    },
+    set: function set(relayer) {
+      this._relayer = relayer;
+    }
+  }, {
+    key: "jobId",
+    get: function get() {
+      return this._jobId;
+    },
+    set: function set(jobId) {
+      this._jobId = jobId;
+    }
+  }, {
+    key: "canonicalId",
+    get: function get() {
+      return this._canonicalId;
+    },
+    set: function set(canonicalId) {
+      this._canonicalId = canonicalId;
+    }
+  }, {
+    key: "callDataHash",
+    get: function get() {
+      return this._callDataHash;
+    },
+    set: function set(callDataHash) {
+      this._callDataHash = callDataHash;
+    }
+  }, {
+    key: "nonce",
+    get: function get() {
+      return this._nonce;
     },
     set: function set(nonce) {
       this._nonce = nonce;
@@ -11267,24 +12812,82 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
     this._darkSwapOfDestChain = _darkSwapOfDestChain;
   }
   var _proto = BridgeCreateOrderService.prototype;
-  _proto.prepare = /*#__PURE__*/function () {
-    var _prepare = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(address, sourceChainId, sourceAsset, sourceAmount, canonicalId, bridgeFee, destChainId, depositAsset, depositAmount, swapInAsset, swapInAmount, signature) {
-      var _yield$generateKeyPai, pubKey, privKey, feeRatio, orderNote, feeAmount, realSwapInAmount, swapInNote, context, swapMessage, _t, _t2;
+  _proto.getCanonicalTokenAddress = /*#__PURE__*/function () {
+    var _getCanonicalTokenAddress = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(sourceAsset) {
+      var canonicalTokenRegistry;
       return _regenerator().w(function (_context) {
         while (1) switch (_context.n) {
           case 0:
+            canonicalTokenRegistry = new ethers.Contract(this._darkSwapOfSourceChain.contracts.synaraCanonicalTokenRegistry, CanonicalTokenRegistryAbi, this._darkSwapOfSourceChain.provider);
             _context.n = 1;
+            return canonicalTokenRegistry.getCanonicalId(sourceAsset);
+          case 1:
+            return _context.a(2, _context.v);
+        }
+      }, _callee, this);
+    }));
+    function getCanonicalTokenAddress(_x) {
+      return _getCanonicalTokenAddress.apply(this, arguments);
+    }
+    return getCanonicalTokenAddress;
+  }();
+  _proto.getBridgeFee = /*#__PURE__*/function () {
+    var _getBridgeFee = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(canonicalId, wallet, amount) {
+      var bridge;
+      return _regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
+          case 0:
+            bridge = new ethers.Contract(this._darkSwapOfSourceChain.contracts.synaraBridge, BridgeAbi.abi, this._darkSwapOfSourceChain.provider);
+            _context2.n = 1;
+            return bridge.getBridgeFee(canonicalId, wallet, amount);
+          case 1:
+            return _context2.a(2, _context2.v);
+        }
+      }, _callee2, this);
+    }));
+    function getBridgeFee(_x2, _x3, _x4) {
+      return _getBridgeFee.apply(this, arguments);
+    }
+    return getBridgeFee;
+  }();
+  _proto.prepare = /*#__PURE__*/function () {
+    var _prepare = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(address, sourceChainId, sourceAsset, sourceAmount, canonicalId, bridgeFee, destChainId, depositAsset, depositAmount, swapInAsset, swapInAmount, signature) {
+      var _yield$generateKeyPai, pubKey, privKey, feeRatio, canonicalIdFromContract, bridgeFeeAmountFromContract, orderNote, feeAmount, realSwapInAmount, swapInNote, context, swapMessage, _t, _t2;
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
+          case 0:
+            _context3.n = 1;
             return generateKeyPair(signature);
           case 1:
-            _yield$generateKeyPai = _context.v;
+            _yield$generateKeyPai = _context3.v;
             pubKey = _yield$generateKeyPai[0];
             privKey = _yield$generateKeyPai[1];
             _t = BigInt;
-            _context.n = 2;
+            _context3.n = 2;
             return getFeeRatio(address, this._darkSwapOfDestChain);
           case 2:
-            _t2 = _context.v;
+            _t2 = _context3.v;
             feeRatio = _t(_t2);
+            _context3.n = 3;
+            return this.getCanonicalTokenAddress(sourceAsset);
+          case 3:
+            canonicalIdFromContract = _context3.v;
+            if (!(canonicalIdFromContract !== canonicalId)) {
+              _context3.n = 4;
+              break;
+            }
+            throw new DarkSwapError('CanonicalId not match');
+          case 4:
+            _context3.n = 5;
+            return this.getBridgeFee(canonicalId, address, sourceAmount);
+          case 5:
+            bridgeFeeAmountFromContract = _context3.v;
+            if (!(bridgeFeeAmountFromContract !== bridgeFee)) {
+              _context3.n = 6;
+              break;
+            }
+            throw new DarkSwapError('BridgeFee not match');
+          case 6:
             orderNote = createOrderNoteExt(address, depositAsset, depositAmount, feeRatio, pubKey);
             feeAmount = calcFeeAmount(swapInAmount, feeRatio);
             realSwapInAmount = swapInAmount - feeAmount;
@@ -11300,19 +12903,19 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
             context.sourceAmount = sourceAmount;
             context.bridgeFeeAmount = bridgeFee;
             context.canonicalId = canonicalId;
-            _context.n = 3;
+            _context3.n = 7;
             return generateRetailSwapMessage(address, orderNote, swapInNote, feeAmount, pubKey, privKey);
-          case 3:
-            swapMessage = _context.v;
+          case 7:
+            swapMessage = _context3.v;
             context.swapMessage = swapMessage;
-            return _context.a(2, {
+            return _context3.a(2, {
               context: context,
               swapMessage: swapMessage
             });
         }
-      }, _callee, this);
+      }, _callee3, this);
     }));
-    function prepare(_x, _x2, _x3, _x4, _x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10) {
+    function prepare(_x5, _x6, _x7, _x8, _x9, _x0, _x1, _x10, _x11, _x12, _x13, _x14) {
       return _prepare.apply(this, arguments);
     }
     return prepare;
@@ -11321,123 +12924,123 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
     return this._darkSwapOfSourceChain.contracts.zkverifyRelayerUrls[0];
   };
   _proto.submitProof = /*#__PURE__*/function () {
-    var _submitProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(context) {
+    var _submitProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
       var relayerRequest, response, _yield$this$pollJobSt, error, result;
-      return _regenerator().w(function (_context2) {
-        while (1) switch (_context2.n) {
+      return _regenerator().w(function (_context4) {
+        while (1) switch (_context4.n) {
           case 0:
             if (context) {
-              _context2.n = 1;
+              _context4.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
           case 1:
-            _context2.n = 2;
+            _context4.n = 2;
             return this.generateProof(context);
           case 2:
-            context.proof = _context2.v;
+            context.proof = _context4.v;
             relayerRequest = {
               proof: context.proof.proof,
               publicSignals: context.proof.verifyInputs,
               vkHash: VK_HASH_CONFIG[PROOF_DOMAIN.RETAIL_BRIDGE_ORDER]
             };
             context.relayer = this.pickRelayer();
-            _context2.n = 3;
+            _context4.n = 3;
             return axios.post(context.relayer + '/v1/zkVerifySubmitProof', relayerRequest);
           case 3:
-            response = _context2.v;
+            response = _context4.v;
             if (!(response.status == 200)) {
-              _context2.n = 4;
+              _context4.n = 4;
               break;
             }
             context.jobId = response.data.id;
-            _context2.n = 6;
+            _context4.n = 6;
             break;
           case 4:
             if (!(response.status == 400)) {
-              _context2.n = 5;
+              _context4.n = 5;
               break;
             }
             throw new Error('Request error' + response.data.error);
           case 5:
             throw new Error('Relayer not asscessable');
           case 6:
-            _context2.n = 7;
+            _context4.n = 7;
             return this.pollJobStatus(context);
           case 7:
-            _yield$this$pollJobSt = _context2.v;
+            _yield$this$pollJobSt = _context4.v;
             error = _yield$this$pollJobSt.error;
             result = _yield$this$pollJobSt.result;
             if (!error) {
-              _context2.n = 8;
+              _context4.n = 8;
               break;
             }
             throw new DarkSwapError(error);
           case 8:
             context.attestationDetails = result;
           case 9:
-            return _context2.a(2);
+            return _context4.a(2);
         }
-      }, _callee2, this);
+      }, _callee4, this);
     }));
-    function submitProof(_x11) {
+    function submitProof(_x15) {
       return _submitProof.apply(this, arguments);
     }
     return submitProof;
   }();
   _proto.pollJobStatus = /*#__PURE__*/function () {
-    var _pollJobStatus = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3(context) {
+    var _pollJobStatus = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(context) {
       var tries, response, error, _response$data, status, failedReason, result, _t3;
-      return _regenerator().w(function (_context3) {
-        while (1) switch (_context3.n) {
+      return _regenerator().w(function (_context5) {
+        while (1) switch (_context5.n) {
           case 0:
             tries = 1;
           case 1:
             if (!(tries <= 100)) {
-              _context3.n = 10;
+              _context5.n = 10;
               break;
             }
             if (!(tries >= 100)) {
-              _context3.n = 2;
+              _context5.n = 2;
               break;
             }
-            return _context3.a(3, 10);
+            return _context5.a(3, 10);
           case 2:
-            _context3.p = 2;
-            _context3.n = 3;
+            _context5.p = 2;
+            _context5.n = 3;
             return axios.get(context.relayer + "/v1/jobs/" + context.jobId);
           case 3:
-            response = _context3.v;
+            response = _context5.v;
             if (!(response.status === 400)) {
-              _context3.n = 4;
+              _context5.n = 4;
               break;
             }
             error = response.data.error;
             console.log(error);
-            return _context3.a(2, {
+            return _context5.a(2, {
               error: 'Failed to submit proof to relayer:' + error,
               result: undefined
             });
           case 4:
             if (!(response.status === 200)) {
-              _context3.n = 6;
+              _context5.n = 6;
               break;
             }
             _response$data = response.data, status = _response$data.status, failedReason = _response$data.failedReason, result = _response$data.result;
             if (!(status === 'FAILED')) {
-              _context3.n = 5;
+              _context5.n = 5;
               break;
             }
-            return _context3.a(2, {
+            return _context5.a(2, {
               error: failedReason != null ? failedReason : 'Transaction failed.',
               result: undefined
             });
           case 5:
             if (!(status === 'CONFIRMED' || status === 'MINED')) {
-              _context3.n = 6;
+              _context5.n = 6;
               break;
             }
-            return _context3.a(2, {
+            return _context5.a(2, {
               error: undefined,
               result: {
                 attestationId: BigInt(result.attestationId),
@@ -11447,47 +13050,47 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
               }
             });
           case 6:
-            _context3.n = 7;
+            _context5.n = 7;
             return new Promise(function (resolve) {
               return setTimeout(resolve, 5000);
             });
           case 7:
-            _context3.n = 9;
+            _context5.n = 9;
             break;
           case 8:
-            _context3.p = 8;
-            _t3 = _context3.v;
+            _context5.p = 8;
+            _t3 = _context5.v;
             console.log(_t3);
           case 9:
             tries++;
-            _context3.n = 1;
+            _context5.n = 1;
             break;
           case 10:
-            return _context3.a(2, {
+            return _context5.a(2, {
               error: 'Waited too long for getting attestation details.',
               result: undefined
             });
         }
-      }, _callee3, null, [[2, 8]]);
+      }, _callee5, null, [[2, 8]]);
     }));
-    function pollJobStatus(_x12) {
+    function pollJobStatus(_x16) {
       return _pollJobStatus.apply(this, arguments);
     }
     return pollJobStatus;
   }();
   _proto.generateProof = /*#__PURE__*/function () {
-    var _generateProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(context) {
+    var _generateProof = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(context) {
       var proof;
-      return _regenerator().w(function (_context4) {
-        while (1) switch (_context4.n) {
+      return _regenerator().w(function (_context6) {
+        while (1) switch (_context6.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.swapInNote || !context.address || context.feeAmount === undefined || !context.signature || !context.sourceChainId || !context.destChainId || !context.sourceAsset || !context.sourceAmount || context.bridgeFeeAmount === undefined)) {
-              _context4.n = 1;
+              _context6.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
           case 1:
-            _context4.n = 2;
+            _context6.n = 2;
             return generateRetailBridgeOrderProof({
               depositSourceAsset: context.sourceAsset,
               depositNote: context.orderNote,
@@ -11500,77 +13103,77 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
               signedMessage: context.signature
             });
           case 2:
-            proof = _context4.v;
-            return _context4.a(2, proof);
+            proof = _context6.v;
+            return _context6.a(2, proof);
         }
-      }, _callee4);
+      }, _callee6);
     }));
-    function generateProof(_x13) {
+    function generateProof(_x17) {
       return _generateProof.apply(this, arguments);
     }
     return generateProof;
   }();
   _proto.computeDepositId = /*#__PURE__*/function () {
-    var _computeDepositId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee5(context) {
+    var _computeDepositId = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(context) {
       var callDataHash, currentNonce, packedData, depositCommitment;
-      return _regenerator().w(function (_context5) {
-        while (1) switch (_context5.n) {
+      return _regenerator().w(function (_context7) {
+        while (1) switch (_context7.n) {
           case 0:
             if (!(!context || !context.callData || !context.orderNote || !context.swapInNote || !context.address || context.feeAmount === undefined || !context.signature || !context.sourceChainId || !context.destChainId || !context.sourceAsset || context.bridgeFeeAmount === undefined)) {
-              _context5.n = 1;
+              _context7.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
           case 1:
-            callDataHash = ethers.solidityPackedKeccak256(['address', 'bytes'], [this._darkSwapOfSourceChain.contracts.synaraDarkSwapOnBridgeAssetManager, context.callData]);
+            callDataHash = ethers.solidityPackedKeccak256(['address', 'bytes'], [this._darkSwapOfDestChain.contracts.synaraDarkSwapOnBridgeAssetManager, context.callData]);
             context.callDataHash = callDataHash;
-            _context5.n = 2;
+            _context7.n = 2;
             return this.getCurrentNonce(context);
           case 2:
-            currentNonce = _context5.v;
+            currentNonce = _context7.v;
             context.nonce = currentNonce;
             packedData = solidityPacked(["bytes", "address", "bytes32", "address", "address", "bytes32", "bytes32", "bytes32", "bytes32", "bytes32" // _computeCallDataHash(call)
             ], [_DOMAIN_PREFIX, this._darkSwapOfSourceChain.contracts.synaraBridge, context.canonicalId, this._darkSwapOfSourceChain.contracts.synaraDarkSwapOnBridgeAssetManager, context.address, hexlify32(context.orderNote.amount), hexlify32(context.destChainId), hexlify32(context.nonce), hexlify32(context.sourceChainId), context.callDataHash]);
             depositCommitment = keccak256(packedData);
-            return _context5.a(2, depositCommitment);
+            return _context7.a(2, depositCommitment);
         }
-      }, _callee5, this);
+      }, _callee7, this);
     }));
-    function computeDepositId(_x14) {
+    function computeDepositId(_x18) {
       return _computeDepositId.apply(this, arguments);
     }
     return computeDepositId;
   }();
   _proto.getCurrentNonce = /*#__PURE__*/function () {
-    var _getCurrentNonce = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee6(context) {
+    var _getCurrentNonce = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(context) {
       var provider, contract;
-      return _regenerator().w(function (_context6) {
-        while (1) switch (_context6.n) {
+      return _regenerator().w(function (_context8) {
+        while (1) switch (_context8.n) {
           case 0:
             provider = this._darkSwapOfSourceChain.provider;
             contract = new ethers.Contract(this._darkSwapOfSourceChain.contracts.synaraDarkSwapOnBridgeAssetManager, SynaraDarkSwapOnBridgeAssetManagerAbi.abi, provider);
-            _context6.n = 1;
+            _context8.n = 1;
             return contract.currentNonce({
               from: context.address
             });
           case 1:
-            return _context6.a(2, _context6.v);
+            return _context8.a(2, _context8.v);
         }
-      }, _callee6, this);
+      }, _callee8, this);
     }));
-    function getCurrentNonce(_x15) {
+    function getCurrentNonce(_x19) {
       return _getCurrentNonce.apply(this, arguments);
     }
     return getCurrentNonce;
   }();
   _proto.composeCallData = /*#__PURE__*/function () {
-    var _composeCallData = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee7(context) {
+    var _composeCallData = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(context) {
       var functionSignature, args, iface, fullData;
-      return _regenerator().w(function (_context7) {
-        while (1) switch (_context7.n) {
+      return _regenerator().w(function (_context9) {
+        while (1) switch (_context9.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.swapInNote || !context.address || !context.destChainId || !context.sourceAsset || context.bridgeFeeAmount === undefined || !context.proof || !context.attestationDetails)) {
-              _context7.n = 1;
+              _context9.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
@@ -11583,7 +13186,7 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
               depositOutNote: hexlify32(context.orderNote.note),
               depositOutNoteFooter: context.proof.depositFooter,
               outAssetSource: context.sourceAsset,
-              outAssetDest: context.orderNote.address,
+              outAssetDest: context.orderNote.asset,
               outAmount: context.orderNote.amount,
               feeRatio: context.orderNote.feeRatio,
               inNote: hexlify32(context.swapInNote.note),
@@ -11592,23 +13195,23 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
             };
             iface = new ethers.Interface(["function " + functionSignature]);
             fullData = iface.encodeFunctionData('_retailBridgeCreateOrder', [[args.destChain, args.bridgeFee, args.owner, args.depositOutNote, args.depositOutNoteFooter, args.outAssetSource, args.outAssetDest, args.outAmount, args.feeRatio, args.inNote, args.inNoteFooter, args.destContractAddress], [context.attestationDetails.attestationId, context.attestationDetails.merklePath, context.attestationDetails.leafCount, context.attestationDetails.index]]);
-            return _context7.a(2, fullData);
+            return _context9.a(2, fullData);
         }
-      }, _callee7, this);
+      }, _callee9, this);
     }));
-    function composeCallData(_x16) {
+    function composeCallData(_x20) {
       return _composeCallData.apply(this, arguments);
     }
     return composeCallData;
   }();
   _proto.allowance = /*#__PURE__*/function () {
-    var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee8(context) {
+    var _allowance = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(context) {
       var signer, asset, amount, allowanceContract, allowance, isLegacy, contract, tx;
-      return _regenerator().w(function (_context8) {
-        while (1) switch (_context8.n) {
+      return _regenerator().w(function (_context0) {
+        while (1) switch (_context0.n) {
           case 0:
             if (!(!context || !context.orderNote || !context.address || !context.signature || !context.proof)) {
-              _context8.n = 1;
+              _context0.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
@@ -11617,74 +13220,74 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
             asset = context.orderNote.asset;
             amount = context.orderNote.amount;
             allowanceContract = new ethers.Contract(asset, ERC20Abi.abi, this._darkSwapOfSourceChain);
-            _context8.n = 2;
+            _context0.n = 2;
             return allowanceContract.allowance(signer.getAddress(), this._darkSwapOfSourceChain.contracts.darkSwapAssetManager);
           case 2:
-            allowance = _context8.v;
+            allowance = _context0.v;
             if (!(BigInt(allowance) < amount)) {
-              _context8.n = 4;
+              _context0.n = 4;
               break;
             }
             isLegacy = legacyTokenConfig.hasOwnProperty(this._darkSwapOfSourceChain.chainId) && legacyTokenConfig[this._darkSwapOfSourceChain.chainId].includes(asset.toLowerCase());
             contract = new ethers.Contract(asset, isLegacy ? ERC20_USDT.abi : ERC20Abi.abi, signer);
-            _context8.n = 3;
+            _context0.n = 3;
             return contract.approve(this._darkSwapOfSourceChain.contracts.darkSwapAssetManager, hexlify32(MAX_ALLOWANCE));
           case 3:
-            tx = _context8.v;
-            _context8.n = 4;
+            tx = _context0.v;
+            _context0.n = 4;
             return tx.wait();
           case 4:
-            return _context8.a(2);
+            return _context0.a(2);
         }
-      }, _callee8, this);
+      }, _callee0, this);
     }));
-    function allowance(_x17) {
+    function allowance(_x21) {
       return _allowance.apply(this, arguments);
     }
     return allowance;
   }();
   _proto.execute = /*#__PURE__*/function () {
-    var _execute2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee9(context) {
+    var _execute2 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee1(context) {
       var callData, txHash;
-      return _regenerator().w(function (_context9) {
-        while (1) switch (_context9.n) {
+      return _regenerator().w(function (_context1) {
+        while (1) switch (_context1.n) {
           case 0:
-            _context9.n = 1;
+            _context1.n = 1;
             return this.submitProof(context);
           case 1:
-            _context9.n = 2;
+            _context1.n = 2;
             return this.composeCallData(context);
           case 2:
-            callData = _context9.v;
+            callData = _context1.v;
             context.callData = callData;
-            _context9.n = 3;
+            _context1.n = 3;
             return this.computeDepositId(context);
           case 3:
-            context.depositId = _context9.v;
-            _context9.n = 4;
+            context.depositId = _context1.v;
+            _context1.n = 4;
             return this._execute(context);
           case 4:
-            txHash = _context9.v;
-            return _context9.a(2, {
+            txHash = _context1.v;
+            return _context1.a(2, {
               depositId: context.depositId,
               txHash: txHash
             });
         }
-      }, _callee9, this);
+      }, _callee1, this);
     }));
-    function execute(_x18) {
+    function execute(_x22) {
       return _execute2.apply(this, arguments);
     }
     return execute;
   }();
   _proto._execute = /*#__PURE__*/function () {
-    var _execute3 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee0(context) {
+    var _execute3 = /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee10(context) {
       var contract, ethAmount, tx;
-      return _regenerator().w(function (_context0) {
-        while (1) switch (_context0.n) {
+      return _regenerator().w(function (_context10) {
+        while (1) switch (_context10.n) {
           case 0:
             if (!(!context || !context.destChainId || !context.attestationDetails || !context.orderNote || !context.swapInNote || !context.sourceAsset || !context.sourceAmount || context.bridgeFeeAmount === undefined || !context.depositId || !context.proof)) {
-              _context0.n = 1;
+              _context10.n = 1;
               break;
             }
             throw new DarkSwapError('Invalid context');
@@ -11692,30 +13295,30 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
             contract = new ethers.Contract(this._darkSwapOfSourceChain.contracts.synaraDarkSwapOnBridgeAssetManager, SynaraDarkSwapOnBridgeAssetManagerAbi.abi, this._darkSwapOfSourceChain.signer);
             ethAmount = 0n;
             if (!isNativeAsset(context.sourceAsset)) {
-              _context0.n = 2;
+              _context10.n = 2;
               break;
             }
             ethAmount = context.sourceAmount;
-            _context0.n = 3;
+            _context10.n = 3;
             break;
           case 2:
-            _context0.n = 3;
+            _context10.n = 3;
             return this.allowance(context);
           case 3:
-            _context0.n = 4;
-            return contract.retailDepositBridge(context.depositId, [hexlify32(BigInt(context.destChainId)), hexlify32(context.bridgeFeeAmount), context.address, hexlify32(context.orderNote.note), context.proof.depositFooter, context.sourceAsset, context.orderNote.address, hexlify32(context.sourceAmount), hexlify32(context.orderNote.feeRatio), hexlify32(context.swapInNote.note), context.proof.swapInNoteFooter, this._darkSwapOfDestChain.contracts.synaraDarkSwapOnBridgeAssetManager], [hexlify32(context.attestationDetails.attestationId), context.attestationDetails.merklePath, hexlify32(context.attestationDetails.leafCount), hexlify32(context.attestationDetails.index)], {
+            _context10.n = 4;
+            return contract.retailDepositBridge(context.depositId, [hexlify32(BigInt(context.destChainId)), hexlify32(context.bridgeFeeAmount), context.address, hexlify32(context.orderNote.note), context.proof.depositFooter, context.sourceAsset, context.orderNote.asset, hexlify32(context.sourceAmount), hexlify32(context.orderNote.feeRatio), hexlify32(context.swapInNote.note), context.proof.swapInNoteFooter, this._darkSwapOfDestChain.contracts.synaraDarkSwapOnBridgeAssetManager], [hexlify32(context.attestationDetails.attestationId), context.attestationDetails.merklePath, hexlify32(context.attestationDetails.leafCount), hexlify32(context.attestationDetails.index)], {
               value: bn_to_0xhex(ethAmount)
             });
           case 4:
-            tx = _context0.v;
-            _context0.n = 5;
+            tx = _context10.v;
+            _context10.n = 5;
             return tx.wait();
           case 5:
-            return _context0.a(2, tx.hash);
+            return _context10.a(2, tx.hash);
         }
-      }, _callee0, this);
+      }, _callee10, this);
     }));
-    function _execute(_x19) {
+    function _execute(_x23) {
       return _execute3.apply(this, arguments);
     }
     return _execute;
@@ -11723,11 +13326,11 @@ var BridgeCreateOrderService = /*#__PURE__*/function () {
   return BridgeCreateOrderService;
 }();
 
-var DarkSwap = function DarkSwap(signer, chainId, contracts) {
+var DarkSwap = function DarkSwap(signer, chainId, provider, contracts) {
   // @ts-ignore
   this.signer = signer;
   // @ts-ignore
-  this.provider = signer.provider;
+  this.provider = provider || signer.provider;
   this.chainId = chainId;
   if (contracts) {
     this.contracts = contracts;
@@ -11791,5 +13394,5 @@ function deserializeDarkSwapMessage(serializedMessage) {
   };
 }
 
-export { BridgeCreateOrderService, 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 { BridgeCreateOrderService, 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, getConfirmations, 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