isTakingConceroFee refactor

concero · Oct 9, 2024 · 7e241c6 · 7e241c6
1 parent deec118
commit 7e241c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/hardhat/contracts/DexSwap.sol b/packages/hardhat/contracts/DexSwap.sol
@@ -88,13 +88,10 @@ contract DexSwap is IDexSwap, InfraCommon, InfraStorage {
 
             _performSwap(_swapData[i], destinationAddress);
 
-            if (swapDataLength - 1 > i) {
+            if (i < swapDataLength - 1) {
                 if (_swapData[i].toToken != _swapData[i + 1].fromToken) {
                     revert InvalidTokenPath();
                 }
-            }
-
-            if (i + 1 <= swapDataLength - 1) {
                 uint256 postBalance = LibConcero.getBalance(_swapData[i].toToken, address(this));
                 uint256 newBalance = postBalance - previousBalance;
                 _swapData[i + 1].fromAmount = newBalance;
@@ -105,6 +102,7 @@ contract DexSwap is IDexSwap, InfraCommon, InfraStorage {
             }
         }
 
+        //TODO: optimise this line in the future
         uint256 outputAmount = LibConcero.getBalance(dstToken, address(this)) -
             dstTokenBalanceBefore;
 

diff --git a/packages/hardhat/tasks/concero/ensureBalances/ensureErc20Balances.ts b/packages/hardhat/tasks/concero/ensureBalances/ensureErc20Balances.ts
@@ -15,9 +15,9 @@ const rl = readline.createInterface({ input: process.stdin, output: process.stdo
 const prompt = (question: string): Promise<string> => new Promise(resolve => rl.question(question, resolve));
 
 const minBalances: Record<ProxyEnum, bigint> = {
-  parentPoolProxy: parseEther("7"),
+  parentPoolProxy: parseEther("10"),
   childPoolProxy: parseEther("1.5"),
-  infraProxy: parseEther("7"),
+  infraProxy: parseEther("10"),
 };
 
 async function checkChainBalance(chain: CNetwork, contractType: ProxyEnum): Promise<BalanceInfo> {