fix calculation

celo-org · Jun 18, 2024 · 84e2e89 · 84e2e89
1 parent 5808b1d
commit 84e2e89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/packages/sdk/contractkit/src/kit.test.ts b/packages/sdk/contractkit/src/kit.test.ts
@@ -246,7 +246,7 @@ testWithAnvil('kit', (web3) => {
             {
               "feeCurrency": "0x2A3733dBc31980f02b12135C809b5da33BF3a1e9",
               "gas": 53001,
-              "maxFeeInFeeCurrency": "53001000000000",
+              "maxFeeInFeeCurrency": "106002000000000",
               "maxFeePerGas": "2000000000",
               "maxPriorityFeePerGas": "1000000000",
             }
@@ -276,7 +276,13 @@ testWithAnvil('kit', (web3) => {
               feeCurrency: feeToken,
               gas: '102864710371401736267367367',
             })
-          ).resolves.toEqual({})
+          ).resolves.toEqual({
+            feeCurrency: '0x2A3733dBc31980f02b12135C809b5da33BF3a1e9',
+            gas: '102864710371401736267367367',
+            maxFeeInFeeCurrency: '205729420742803472534734734000000000',
+            maxFeePerGas: '2000000000',
+            maxPriorityFeePerGas: '1000000000',
+          })
         })
       })
     })

diff --git a/packages/sdk/contractkit/src/kit.ts b/packages/sdk/contractkit/src/kit.ts
@@ -253,7 +253,7 @@ export class ContractKit {
       const maxFeeInFeeCurrency = await this.estimateMaxFeeInFeeToken({
         feeCurrency: tx.feeCurrency,
         gasLimit: BigInt(tx.gas),
-        maxFeePerGas: BigInt(maxPriorityFeePerGas),
+        maxFeePerGas: BigInt(maxFeePerGas),
       })
 
       tx.maxFeeInFeeCurrency = maxFeeInFeeCurrency.toString(10)
@@ -279,10 +279,15 @@ export class ContractKit {
     maxFeePerGas: bigint
     feeCurrency: StrongAddress
   }) {
+    // 2 percent wriggle room
+    const slippage = BigInt(102) / BigInt(100)
     const maxGasFeesInCELO = gasLimit * maxFeePerGas
     const fcd = await this.contracts.getFeeCurrencyDirectory()
     const { numerator: ratioTOKEN, denominator: ratioCELO } = await fcd.getExchangeRate(feeCurrency)
-    return (maxGasFeesInCELO * BigInt(ratioCELO.toString(10))) / BigInt(ratioTOKEN.toString(10))
+    return (
+      ((maxGasFeesInCELO * BigInt(ratioCELO.toString(10))) / BigInt(ratioTOKEN.toString(10))) *
+      slippage
+    )
   }
 
   // *** NOTICE ***