@cityofzion/bs-ethereum 1.0.3 → 1.0.4

package/.rush/temp/operation/build/state.json

@@ -1,3 +1,3 @@
 {
-  "nonCachedDurationMs": 2456.2693220000074
+  "nonCachedDurationMs": 2408.369583000007
 }

package/.rush/temp/package-deps_build.json

@@ -2,18 +2,18 @@
   "files": {
     "packages/bs-ethereum/.eslintignore": "3ee402c88b68258919e4f4b4eef4f25e5d078d90",
     "packages/bs-ethereum/.eslintrc.cjs": "5ec0bf6332ec01b3e02beb532bb47025c4c1bf7b",
-    "packages/bs-ethereum/CHANGELOG.json": "52f7565b9455ae693f0b870741ce9ac69ac8ece3",
-    "packages/bs-ethereum/CHANGELOG.md": "1a2e1ab64b099b95532c397fd44a19ec709a5931",
+    "packages/bs-ethereum/CHANGELOG.json": "0094ceba141816910afd5af220cb454d2c78761a",
+    "packages/bs-ethereum/CHANGELOG.md": "6402c0560ff4ad6a6cafcfb1b53a6dbd2d87d97e",
     "packages/bs-ethereum/jest.config.ts": "d944475db93cbe41a9339187fd94b9962e411c43",
     "packages/bs-ethereum/jest.setup.ts": "9a1976a32050616d4d2ee95b1aa21041bc4daca3",
-    "packages/bs-ethereum/package.json": "1adbf3bd6afb0f62ab98f33bf7e38089707f92e7",
-    "packages/bs-ethereum/src/BSEthereum.ts": "21e03098208f6764ca8848cc344a6268ff16262c",
+    "packages/bs-ethereum/package.json": "6898373785607fd411c9c33df47c7484a27a7f9b",
+    "packages/bs-ethereum/src/BSEthereum.ts": "f1214f4571cd94d2072e76f356e36d8d5b6d2094",
     "packages/bs-ethereum/src/BitqueryBDSEthereum.ts": "47f24d0f3a94aa0eb761e1c2e96f6aeb9c51f82b",
     "packages/bs-ethereum/src/BitqueryEDSEthereum.ts": "a1232bf1d1683d7fe0e752577f3eb489cfce734f",
     "packages/bs-ethereum/src/GhostMarketNDSEthereum.ts": "c97f7fd9323b4089a8f2ed4178dbc14a0d17c61c",
     "packages/bs-ethereum/src/RpcBDSEthereum.ts": "6cbca256420b09cef7182cbc485eb4799ff9b614",
     "packages/bs-ethereum/src/__tests__/BDSEthereum.spec.ts": "b5d64fe975c82fb604f15717ede1707d016d1f9d",
-    "packages/bs-ethereum/src/__tests__/BSEthereum.spec.ts": "4d123a45f1431ad00db142522423359122b692b7",
+    "packages/bs-ethereum/src/__tests__/BSEthereum.spec.ts": "13a4b1a9c94b95536d4e067cd7f738b9779344e2",
     "packages/bs-ethereum/src/__tests__/BitqueryEDSEthereum.spec.ts": "a0994e0ad66408b281ec96a5f72b30b5e14a68ce",
     "packages/bs-ethereum/src/__tests__/GhostMarketNDSEthereum.spec.ts": "4b10ef2b59437c9ea06695ab4844d5b131f65738",
     "packages/bs-ethereum/src/assets/tokens/common.json": "96597dd06475ee6068b484510f27ffad27b52ebd",

package/CHANGELOG.json

@@ -1,6 +1,18 @@
 {
   "name": "@cityofzion/bs-ethereum",
   "entries": [
+    {
+      "version": "1.0.4",
+      "tag": "@cityofzion/bs-ethereum_v1.0.4",
+      "date": "Mon, 04 Mar 2024 21:53:09 GMT",
+      "comments": {
+        "patch": [
+          {
+            "comment": "fix wrong calculated fee"
+          }
+        ]
+      }
+    },
     {
       "version": "1.0.3",
       "tag": "@cityofzion/bs-ethereum_v1.0.3",

package/CHANGELOG.md

@@ -1,6 +1,13 @@
 # Change Log - @cityofzion/bs-ethereum
 
-This log was last generated on Wed, 28 Feb 2024 17:43:01 GMT and should not be manually modified.
+This log was last generated on Mon, 04 Mar 2024 21:53:09 GMT and should not be manually modified.
+
+## 1.0.4
+Mon, 04 Mar 2024 21:53:09 GMT
+
+### Patches
+
+- fix wrong calculated fee
 
 ## 1.0.3
 Wed, 28 Feb 2024 17:43:01 GMT

package/dist/BSEthereum.js

@@ -152,6 +152,7 @@ class BSEthereum {
         return __awaiter(this, void 0, void 0, function* () {
             const provider = new ethers_1.ethers.providers.JsonRpcProvider(this.network.url);
             const wallet = new ethers_1.ethers.Wallet(senderAccount.key, provider);
+            const gasPrice = yield provider.getGasPrice();
             let estimated;
             const isNative = constants_1.NATIVE_ASSETS.some(asset => asset.hash === intent.tokenHash);
             const decimals = (_a = intent.tokenDecimals) !== null && _a !== void 0 ? _a : 18;
@@ -166,7 +167,7 @@ class BSEthereum {
                     value: amount,
                 });
             }
-            return ethers_1.ethers.utils.formatEther(estimated);
+            return ethers_1.ethers.utils.formatEther(gasPrice.mul(estimated));
         });
     }
     resolveNameServiceDomain(domainName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cityofzion/bs-ethereum",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "repository": "https://github.com/CityOfZion/blockchain-services",

package/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> {

package/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 () => {