Merge pull request #39 from CityOfZion/CU-86drt7tym

CU-86drt7tym - BSEthereum: Wrong estimated fee
CityOfZion · Mar 4, 2024 · ff66462 · ff66462
2 parents ff6b150 + 81eed3f
commit ff66462
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/common/changes/@cityofzion/bs-ethereum/CU-86drt7tym_2024-03-04-21-33.json b/common/changes/@cityofzion/bs-ethereum/CU-86drt7tym_2024-03-04-21-33.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@cityofzion/bs-ethereum",
+      "comment": "fix wrong calculated fee",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@cityofzion/bs-ethereum"
+}
diff --git a/packages/bs-ethereum/src/BSEthereum.ts b/packages/bs-ethereum/src/BSEthereum.ts
@@ -155,6 +155,8 @@ export class BSEthereum<BSCustomName extends string = string>
     const provider = new ethers.providers.JsonRpcProvider(this.network.url)
     const wallet = new ethers.Wallet(senderAccount.key, provider)
 
+    const gasPrice = await provider.getGasPrice()
+
     let estimated: ethers.BigNumber
 
     const isNative = NATIVE_ASSETS.some(asset => asset.hash === intent.tokenHash)
@@ -176,7 +178,7 @@ export class BSEthereum<BSCustomName extends string = string>
       })
     }
 
-    return ethers.utils.formatEther(estimated)
+    return ethers.utils.formatEther(gasPrice.mul(estimated))
   }
 
   async resolveNameServiceDomain(domainName: string): Promise<string> {

diff --git a/packages/bs-ethereum/src/__tests__/BSEthereum.spec.ts b/packages/bs-ethereum/src/__tests__/BSEthereum.spec.ts
@@ -89,7 +89,7 @@ describe('BSEthereum', () => {
       },
     })
 
-    expect(fee).toEqual(expect.any(Number))
+    expect(fee).toEqual(expect.any(String))
   })
 
   it.skip('Should be able to transfer a native token', async () => {
-Original file line number
+Diff line change
@@ Expand Up / @@ -89,7 +89,7 @@ describe('BSEthereum', () => { @@
           },
         })
-        expect(fee).toEqual(expect.any(Number))
+        expect(fee).toEqual(expect.any(String))
       })
       it.skip('Should be able to transfer a native token', async () => {
@@ Expand Down @@