Merge branch '120-check-asset-balance-before-gas-estimation' into 'dev'

fix insufficient asset edge case in EVM Closes #120 See merge request ergo/rosen-bridge/rosen-chains!145
rosen-bridge · Oct 12, 2024 · 6e46f0d · 6e46f0d
2 parents 0219448 + 3265b21
commit 6e46f0d
Show file tree

Hide file tree

Showing 9 changed files with 55 additions and 35 deletions.
diff --git a/.changeset/old-starfishes-kick.md → .changeset/eight-dots-provide.md b/.changeset/old-starfishes-kick.md → .changeset/eight-dots-provide.md
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/chains/ethereum/CHANGELOG.md b/packages/chains/ethereum/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @rosen-chains/ethereum
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies
+  - @rosen-chains/evm@4.1.1
+
 ## 0.1.7
 
 ### Patch Changes

diff --git a/packages/chains/ethereum/package.json b/packages/chains/ethereum/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/ethereum",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "this project contains ethereum chain for Rosen-bridge",
   "repository": "https://github.com/rosen-bridge/rosen-chains",
   "license": "GPL-3.0",
@@ -31,6 +31,6 @@
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/tokens": "^1.2.1",
     "@rosen-chains/abstract-chain": "^9.0.2",
-    "@rosen-chains/evm": "^4.1.0"
+    "@rosen-chains/evm": "^4.1.1"
   }
 }
diff --git a/packages/chains/evm/CHANGELOG.md b/packages/chains/evm/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @rosen-chains/evm
 
+## 4.1.1
+
+### Patch Changes
+
+- check lock address balance for required assets before estimating the tx required gas
+
 ## 4.1.0
 
 ### Minor Changes

diff --git a/packages/chains/evm/lib/EvmChain.ts b/packages/chains/evm/lib/EvmChain.ts
@@ -127,9 +127,33 @@ abstract class EvmChain extends AbstractChain<Transaction> {
     }
 
     const gasPrice = await this.network.getMaxFeePerGas();
-    let totalGas = 0n;
+
+    // check the balance in the lock address
+    const requiredAssets: AssetBalance = ChainUtils.sumAssetBalance(
+      orderRequiredAssets,
+      {
+        nativeToken: this.tokenMap.wrapAmount(
+          this.NATIVE_TOKEN_ID,
+          this.configs.gasLimitCap * BigInt(orders.length) * gasPrice,
+          this.CHAIN
+        ).amount,
+        tokens: [],
+      }
+    );
+    this.logger.debug(
+      `Required assets: ${JsonBigInt.stringify(requiredAssets)}`
+    );
+
+    if (!(await this.hasLockAddressEnoughAssets(requiredAssets))) {
+      const neededETH = requiredAssets.nativeToken.toString();
+      const neededTokens = JSONBigInt.stringify(requiredAssets.tokens);
+      throw new NotEnoughAssetsError(
+        `Locked assets cannot cover required assets. native: ${neededETH}, erc-20: ${neededTokens}`
+      );
+    }
 
     // try to generate transactions
+    let totalGas = 0n;
     const maxPriorityFeePerGas = await this.network.getMaxPriorityFeePerGas();
     const evmTrxs: Array<PaymentTransaction> = [];
     for (const singleOrder of orders) {
@@ -196,30 +220,6 @@ abstract class EvmChain extends AbstractChain<Transaction> {
       nextNonce += 1;
     }
 
-    // check the balance in the lock address
-    const requiredAssets: AssetBalance = ChainUtils.sumAssetBalance(
-      orderRequiredAssets,
-      {
-        nativeToken: this.tokenMap.wrapAmount(
-          this.NATIVE_TOKEN_ID,
-          totalGas * gasPrice,
-          this.CHAIN
-        ).amount,
-        tokens: [],
-      }
-    );
-    this.logger.debug(
-      `Required assets: ${JsonBigInt.stringify(requiredAssets)}`
-    );
-
-    if (!(await this.hasLockAddressEnoughAssets(requiredAssets))) {
-      const neededETH = requiredAssets.nativeToken.toString();
-      const neededTokens = JSONBigInt.stringify(requiredAssets.tokens);
-      throw new NotEnoughAssetsError(
-        `Locked assets cannot cover required assets. native: ${neededETH}, erc-20: ${neededTokens}`
-      );
-    }
-
     // report result
     evmTrxs.forEach((trx) => {
       this.logger.info(

diff --git a/packages/chains/evm/package.json b/packages/chains/evm/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/evm",
-  "version": "4.1.0",
+  "version": "4.1.1",
   "description": "this project contains evm chains for Rosen-bridge",
   "repository": "https://github.com/rosen-bridge/rosen-chains",
   "license": "GPL-3.0",

diff --git a/packages/networks/evm-rpc/CHANGELOG.md b/packages/networks/evm-rpc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @rosen-chains/evm-rpc
 
+## 2.1.5
+
+### Patch Changes
+
+- Updated dependencies
+  - @rosen-chains/evm@4.1.1
+
 ## 2.1.4
 
 ### Patch Changes

diff --git a/packages/networks/evm-rpc/package.json b/packages/networks/evm-rpc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rosen-chains/evm-rpc",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "description": "A package to be used as network api provider for @rosen-chains/evm package",
   "repository": "https://github.com/rosen-bridge/rosen-chains",
   "license": "GPL-3.0",
@@ -36,7 +36,7 @@
     "@rosen-bridge/abstract-logger": "^1.0.0",
     "@rosen-bridge/evm-address-tx-extractor": "^1.0.3",
     "@rosen-chains/abstract-chain": "^9.0.2",
-    "@rosen-chains/evm": "^4.1.0",
+    "@rosen-chains/evm": "^4.1.1",
     "typeorm": "^0.3.20"
   }
 }