update withdraw nonce

helix-bridge · Aug 7, 2023 · c28cdc7 · c28cdc7
1 parent 4900c75
commit c28cdc7
Show file tree

Hide file tree

Showing 5 changed files with 1,868 additions and 1,870 deletions.
diff --git a/helix-contract/address/eth2arbi-ln-dev.json b/helix-contract/address/eth2arbi-ln-dev.json
@@ -1,7 +1,7 @@
 {
     "ethereum2arbitrumLnV2-goerli": {
         "LnBridgeProxyAdmin": "0x3F3eDBda6124462a09E071c5D90e072E0d5d4ed4",
-        "LnBridgeLogic": "0xB78eA02970801506eE5333E9659eAe95a1ee5f80",
+        "LnBridgeLogic": "0x26F3925F0cbcf79bF8Ca9041347327b82c55916b",
         "LnBridgeProxy": "0xcD86cf37a4Dc6f78B4899232E7dD1b5c8130EFDA",
         "Ring": "0x1836BAFa3016Dd5Ce543D0F7199cB858ec69F41E",
         "USDC": "0xd35CCeEAD182dcee0F148EbaC9447DA2c4D449c4",

diff --git a/helix-contract/contracts/ln/base/LnDefaultBridgeSource.sol b/helix-contract/contracts/ln/base/LnDefaultBridgeSource.sol
@@ -278,7 +278,7 @@ contract LnDefaultBridgeSource is LnBridgeHelper {
         uint112 targetAmount = _sourceAmountToTargetAmount(tokenInfo, amount);
         message = _encodeWithdrawCall(
             providerInfo.lastTransferId,
-            providerInfo.withdrawNonce,
+            providerInfo.withdrawNonce + 1,
             msg.sender,
             sourceToken,
             tokenInfo.targetToken,

diff --git a/helix-contract/deploy/deploy_eth2arbi_ln.js b/helix-contract/deploy/deploy_eth2arbi_ln.js
@@ -362,10 +362,9 @@ async function main() {
     const ringOnEthereum = await ethers.getContractAt("Erc20", ringEthereumAddress, ethereumWallet);
     //await ringOnEthereum.approve(ethereumLnBridgeAddress, ethers.utils.parseEther("10000000"));
 
-    const amount1 = ethers.utils.parseEther("30");
+    const amount1 = ethers.utils.parseEther("60");
 
     // lock
-    /*
     await transferAndLockMargin(
         ethereumWallet,
         ethereumLnBridgeAddress,
@@ -374,11 +373,10 @@ async function main() {
         ringArbitrumAddress,
         amount1,
         ethereumWallet.address,
-        0,
+        5,
     );
     console.log("transfer and lock margin 1 successed");
     return;
-    */
 
     // relay
     // query: lastTransferId on arbitrum
@@ -445,7 +443,7 @@ main()
   });
 
 /*
-ethereumLnBridgeAddressLogic = 0xB78eA02970801506eE5333E9659eAe95a1ee5f80
+ethereumLnBridgeAddressLogic = 0x26F3925F0cbcf79bF8Ca9041347327b82c55916b
 ethereumLnBridgeAddressProxy = 0xcD86cf37a4Dc6f78B4899232E7dD1b5c8130EFDA
 arbitrumLnBridgeAddressLogic = 0xC91aff6adA5e743Ae89589126AE4521eB2ec47f2
 arbitrumLnBridgeAddressProxy = 0x4112c9d474951246fBC2B4D868D247e714698aE1