fix: updated fetchEvmGasPrice fn (#69)

* fix: updated fetchEvmGasPrice fn

* fix: renamed to fetchTipPrice

* fix: lint

Author: impelcrypto

README.md

@@ -239,7 +239,7 @@ Here is the list of functions and their brief explanations:
 39. `getEvmGas`: Retrieves the gas price for Ethereum Virtual Machine (EVM) transactions.
 40. `getEvmGasCost`: Calculates the cost of gas for a transaction.
 41. `formatTip`: Converts the provided fee into ether format.
-42. `fetchEvmGasPrice`: Fetches gas price from an API and formats it accordingly.
+42. `fetchTipPrice`: Fetches tip price from an API and formats it accordingly.
 43. `getUsdBySymbol`: Fetches the price of a token in USD.
 44. `calUsdAmount`: Fetches the USD price for a given token symbol and multiplies it by an amount.
 45. `mergeTvlArray`: Merges the TVL (Total Value Locked) array based on the base type.

package.json

@@ -12,7 +12,7 @@
     "url": "https://github.com/AstarNetwork/astar.js.git"
   },
   "sideEffects": false,
-  "version": "0.2.7",
+  "version": "0.2.8",
   "workspaces": [
     "packages/*",
     "examples/*"

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/astar-api-derive",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Astar JS API",
   "main": "index.js",
   "author": "Astar Network <[email protected]>",

packages/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/astar-api",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Astar JS API",
   "main": "index.js",
   "author": "Astar Network <[email protected]>",

packages/sdk-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/astar-sdk-core",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "the core for astar SDK",
   "main": "index.js",
   "author": "Astar Network <[email protected]>",

packages/sdk-core/src/modules/common/index.ts

@@ -7,6 +7,10 @@ export const objToArray = (obj: any): any[] => {
   return array;
 };
 
+export const hasProperty = (obj: object, key: string): boolean => {
+  return !!obj && Object.prototype.hasOwnProperty.call(obj, key);
+};
+
 export const checkIsNullOrUndefined = (value: any): boolean => {
   return value === null || value === undefined;
 };

packages/sdk-core/src/modules/dapp-staking/pending-rewards/index.ts

@@ -3,7 +3,7 @@ import { Perbill } from '@polkadot/types/interfaces';
 import { ApiPromise } from '@polkadot/api';
 import { ethers } from 'ethers';
 import { Codec } from '@polkadot/types/types';
-import { truncate } from '@astar-network/astar-sdk-core';
+import { hasProperty, truncate } from '@astar-network/astar-sdk-core';
 
 export interface RewardDistributionConfig extends Struct {
   readonly baseTreasuryPercent: Perbill;
@@ -210,7 +210,7 @@ export const estimatePendingRewards = async ({ api,
         api.query.system.number(),
         Number(api.consts.dappsStaking.blockPerEra),
         String(
-          Object.prototype.hasOwnProperty.call(api.consts.blockReward, 'maxBlockRewardAmount')
+          hasProperty(api.consts.blockReward, 'maxBlockRewardAmount')
             ? api.consts.blockReward.maxBlockRewardAmount
             : api.consts.blockReward.rewardAmount
         ),

packages/sdk-core/src/modules/gas-api/utils/index.ts

@@ -62,76 +62,33 @@ export const formatTip = (fee: string): string => {
   return price;
 };
 
-export const fetchEvmGasPrice = async ({ network,
-  isEip1559,
-  web3 }: {
-  network: string;
-  isEip1559: boolean;
-  web3: Web3;
-}): Promise<{ evmGasPrice: GasPrice; nativeTipPrice: GasPrice }> => {
+export const fetchTipPrice = async ({ network }: { network: string }): Promise<{ nativeTipPrice: GasPrice }> => {
   try {
     const url = `${GAS_API_URL}/gasnow?network=${network}`;
     const { data } = await axios.get<ApiGasNow>(url);
     if (!data || data.code !== 200) {
       throw Error('something went wrong');
     }
     const { tip } = data.data;
-    const { priorityFeePerGas } = data.data.eip1559;
     const nativeTipPrice = {
       slow: formatTip(tip.slow),
       average: formatTip(tip.average),
       fast: formatTip(tip.fast)
     };
 
-    if (isEip1559) {
-      const evmGasPrice = {
-        slow: priorityFeePerGas.slow,
-        average: priorityFeePerGas.average,
-        fast: priorityFeePerGas.fast,
-        baseFeePerGas: data.data.eip1559.baseFeePerGas
-      };
-      return {
-        evmGasPrice,
-        nativeTipPrice
-      };
-    } else {
-      const { slow, average, fast } = data.data;
-      const evmGasPrice = {
-        slow,
-        average,
-        fast,
-        baseFeePerGas: '0'
-      };
-      return {
-        evmGasPrice,
-        nativeTipPrice
-      };
-    }
+    return {
+      nativeTipPrice
+    };
   } catch (error) {
     if (network.toLowerCase() !== astarChain.DEVELOPMENT.toLowerCase()) {
       console.error(error);
     }
-    const fallbackGasPrice = Number(
-      await web3.eth.getGasPrice().catch(() => {
-        const oneGwei = '1000000000';
-        return oneGwei;
-      })
-    );
 
-    const slow = fallbackGasPrice;
-    const average = Math.floor(fallbackGasPrice * 9);
-    const fast = Math.floor(fallbackGasPrice * 56);
-    const evmGasPrice = {
-      slow: String(slow),
-      average: String(average),
-      fast: String(fast),
-      baseFeePerGas: '0'
-    };
     const nativeTipPrice = {
       slow: formatTip('10000000000000'),
       average: formatTip('50000000000000'),
       fast: formatTip('5000000000000000')
     };
-    return { evmGasPrice, nativeTipPrice };
+    return { nativeTipPrice };
   }
 };

packages/type-definitions/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/astar-type-definitions",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Polkadot.js type definitions for astar Network",
   "main": "index.js",
   "author": "Astar Network <[email protected]>",

packages/types/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astar-network/astar-types",
-  "version": "0.2.7",
+  "version": "0.2.8",
   "description": "Polkadot.js type definitions for Astar Network",
   "main": "index.js",
   "author": "Astar Network <[email protected]>",