@injectivelabs/wallet-core 1.15.36 → 1.15.38

package/dist/cjs/broadcaster/MsgBroadcaster.d.ts

@@ -112,6 +112,7 @@ export declare class MsgBroadcaster {
      * Returns a base64 version of it
      */
     private fetchFeePayerPubKey;
+    private getStdFeeWithDynamicBaseFee;
     /**
      * In case we don't want to simulate the transaction
      * we get the gas limit based on the message type.

package/dist/cjs/broadcaster/MsgBroadcaster.js

@@ -181,11 +181,14 @@ class MsgBroadcaster {
         const gas = (tx.gas?.gas || (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs)).toString();
         let stdFee = (0, utils_1.getStdFee)({ ...tx.gas, gas });
         /**
-         * Account has been created on chain
-         * and we can simulate the transaction
+         * Account has not been created on chain
+         * and we cannot simulate the transaction
          * to estimate the gas
          **/
-        if (baseAccount.pubKey) {
+        if (!baseAccount.pubKey) {
+            stdFee = await this.getStdFeeWithDynamicBaseFee(stdFee);
+        }
+        else {
             const { stdFee: simulatedStdFee } = await this.getTxWithSignersAndStdFee({
                 chainId,
                 signMode: sdk_ts_1.SIGN_EIP712,
@@ -267,11 +270,14 @@ class MsgBroadcaster {
         const gas = (tx.gas?.gas || (0, sdk_ts_1.getGasPriceBasedOnMessage)(msgs)).toString();
         let stdFee = (0, utils_1.getStdFee)({ ...tx.gas, gas });
         /**
-         * Account has been created on chain
-         * and we can simulate the transaction
+         * Account has not been created on chain
+         * and we cannot simulate the transaction
          * to estimate the gas
          **/
-        if (baseAccount.pubKey) {
+        if (!baseAccount.pubKey) {
+            stdFee = await this.getStdFeeWithDynamicBaseFee(stdFee);
+        }
+        else {
             const { stdFee: simulatedStdFee } = await this.getTxWithSignersAndStdFee({
                 chainId,
                 signMode: sdk_ts_1.SIGN_EIP712_V2,
@@ -280,8 +286,8 @@ class MsgBroadcaster {
                 timeoutHeight: timeoutHeight.toNumber(),
                 signers: {
                     pubKey: baseAccount.pubKey.key,
-                    accountNumber: baseAccount.accountNumber,
                     sequence: baseAccount.sequence,
+                    accountNumber: baseAccount.accountNumber,
                 },
                 fee: stdFee,
             });
@@ -529,13 +535,13 @@ class MsgBroadcaster {
         /** EIP712 for signing on Ethereum wallets */
         const eip712TypedData = (0, sdk_ts_1.getEip712TypedData)({
             msgs,
-            fee: (0, utils_1.getStdFee)({ ...tx.gas, gas }),
+            fee: await this.getStdFeeWithDynamicBaseFee({ ...tx.gas, gas }),
             tx: {
+                chainId,
                 memo: tx.memo,
-                accountNumber: baseAccount.accountNumber.toString(),
-                sequence: baseAccount.sequence.toString(),
                 timeoutHeight: timeoutHeight.toFixed(),
-                chainId,
+                sequence: baseAccount.sequence.toString(),
+                accountNumber: baseAccount.accountNumber.toString(),
             },
             ethereumChainId,
         });
@@ -713,6 +719,32 @@ class MsgBroadcaster {
         }
         return response.feePayerPubKey.key;
     }
+    async getStdFeeWithDynamicBaseFee(args) {
+        const client = new sdk_ts_1.ChainGrpcTxFeesApi(this.endpoints.grpc);
+        let baseFee = utils_1.DEFAULT_GAS_PRICE;
+        try {
+            const response = await client.fetchEipBaseFee();
+            baseFee = Number(response?.baseFee || utils_1.DEFAULT_GAS_PRICE);
+        }
+        catch { }
+        if (!args) {
+            return (0, utils_1.getStdFee)(baseFee ? { gasPrice: baseFee } : {});
+        }
+        if (typeof args === 'string') {
+            return (0, utils_1.getStdFee)({
+                ...(baseFee && {
+                    gasPrice: new utils_1.BigNumberInBase(baseFee).toFixed(),
+                }),
+                gas: args,
+            });
+        }
+        return (0, utils_1.getStdFee)({
+            ...args,
+            ...(baseFee && {
+                gasPrice: new utils_1.BigNumberInBase(baseFee).toFixed(),
+            }),
+        });
+    }
     /**
      * In case we don't want to simulate the transaction
      * we get the gas limit based on the message type.
@@ -726,24 +758,21 @@ class MsgBroadcaster {
         if (!simulateTx) {
             return {
                 ...(0, sdk_ts_1.createTransactionWithSigners)(args),
-                stdFee: (0, utils_1.getStdFee)(args.fee),
+                stdFee: await this.getStdFeeWithDynamicBaseFee(args.fee),
             };
         }
         const result = await this.simulateTxWithSigners(args);
         if (!result.gasInfo?.gasUsed) {
             return {
                 ...(0, sdk_ts_1.createTransactionWithSigners)(args),
-                stdFee: (0, utils_1.getStdFee)(args.fee),
+                stdFee: await this.getStdFeeWithDynamicBaseFee(args.fee),
             };
         }
-        const stdGasFee = {
-            ...(0, utils_1.getStdFee)({
-                ...(0, utils_1.getStdFee)(args.fee),
-                gas: new utils_1.BigNumberInBase(result.gasInfo.gasUsed)
-                    .times(this.gasBufferCoefficient)
-                    .toFixed(),
-            }),
-        };
+        const stdGasFee = await this.getStdFeeWithDynamicBaseFee({
+            gas: new utils_1.BigNumberInBase(result.gasInfo.gasUsed)
+                .times(this.gasBufferCoefficient)
+                .toFixed(),
+        });
         return {
             ...(0, sdk_ts_1.createTransactionWithSigners)({
                 ...args,

package/dist/esm/broadcaster/MsgBroadcaster.d.ts

@@ -112,6 +112,7 @@ export declare class MsgBroadcaster {
      * Returns a base64 version of it
      */
     private fetchFeePayerPubKey;
+    private getStdFeeWithDynamicBaseFee;
     /**
      * In case we don't want to simulate the transaction
      * we get the gas limit based on the message type.

package/dist/esm/broadcaster/MsgBroadcaster.js

@@ -1,5 +1,5 @@
-import { TxGrpcApi, hexToBuff, PublicKey, SIGN_DIRECT, hexToBase64, ofacWallets, SIGN_EIP712_V2, SIGN_EIP712, ChainGrpcAuthApi, createTxRawEIP712, createTransaction, getAminoStdSignDoc, getEip712TypedData, createWeb3Extension, getEip712TypedDataV2, IndexerGrpcWeb3GwApi, ChainGrpcTendermintApi, createTransactionWithSigners, createTxRawFromSigResponse, getGasPriceBasedOnMessage, recoverTypedSignaturePubKey, } from '@injectivelabs/sdk-ts';
-import { sleep, getStdFee, BigNumberInBase, DEFAULT_BLOCK_TIMEOUT_HEIGHT, } from '@injectivelabs/utils';
+import { TxGrpcApi, hexToBuff, PublicKey, SIGN_DIRECT, hexToBase64, ofacWallets, SIGN_EIP712, SIGN_EIP712_V2, ChainGrpcAuthApi, createTxRawEIP712, createTransaction, ChainGrpcTxFeesApi, getAminoStdSignDoc, getEip712TypedData, createWeb3Extension, getEip712TypedDataV2, IndexerGrpcWeb3GwApi, ChainGrpcTendermintApi, getGasPriceBasedOnMessage, createTxRawFromSigResponse, recoverTypedSignaturePubKey, createTransactionWithSigners, } from '@injectivelabs/sdk-ts';
+import { sleep, getStdFee, BigNumberInBase, DEFAULT_GAS_PRICE, DEFAULT_BLOCK_TIMEOUT_HEIGHT, } from '@injectivelabs/utils';
 import { GeneralException, isThrownException, UnspecifiedErrorCode, ChainCosmosErrorCode, TransactionException, TransactionChainErrorModule, } from '@injectivelabs/exceptions';
 import { getNetworkInfo, getNetworkEndpoints, } from '@injectivelabs/networks';
 import { WalletStrategyEmitterEventType, } from './types.js';
@@ -178,11 +178,14 @@ export class MsgBroadcaster {
         const gas = (tx.gas?.gas || getGasPriceBasedOnMessage(msgs)).toString();
         let stdFee = getStdFee({ ...tx.gas, gas });
         /**
-         * Account has been created on chain
-         * and we can simulate the transaction
+         * Account has not been created on chain
+         * and we cannot simulate the transaction
          * to estimate the gas
          **/
-        if (baseAccount.pubKey) {
+        if (!baseAccount.pubKey) {
+            stdFee = await this.getStdFeeWithDynamicBaseFee(stdFee);
+        }
+        else {
             const { stdFee: simulatedStdFee } = await this.getTxWithSignersAndStdFee({
                 chainId,
                 signMode: SIGN_EIP712,
@@ -264,11 +267,14 @@ export class MsgBroadcaster {
         const gas = (tx.gas?.gas || getGasPriceBasedOnMessage(msgs)).toString();
         let stdFee = getStdFee({ ...tx.gas, gas });
         /**
-         * Account has been created on chain
-         * and we can simulate the transaction
+         * Account has not been created on chain
+         * and we cannot simulate the transaction
          * to estimate the gas
          **/
-        if (baseAccount.pubKey) {
+        if (!baseAccount.pubKey) {
+            stdFee = await this.getStdFeeWithDynamicBaseFee(stdFee);
+        }
+        else {
             const { stdFee: simulatedStdFee } = await this.getTxWithSignersAndStdFee({
                 chainId,
                 signMode: SIGN_EIP712_V2,
@@ -277,8 +283,8 @@ export class MsgBroadcaster {
                 timeoutHeight: timeoutHeight.toNumber(),
                 signers: {
                     pubKey: baseAccount.pubKey.key,
-                    accountNumber: baseAccount.accountNumber,
                     sequence: baseAccount.sequence,
+                    accountNumber: baseAccount.accountNumber,
                 },
                 fee: stdFee,
             });
@@ -526,13 +532,13 @@ export class MsgBroadcaster {
         /** EIP712 for signing on Ethereum wallets */
         const eip712TypedData = getEip712TypedData({
             msgs,
-            fee: getStdFee({ ...tx.gas, gas }),
+            fee: await this.getStdFeeWithDynamicBaseFee({ ...tx.gas, gas }),
             tx: {
+                chainId,
                 memo: tx.memo,
-                accountNumber: baseAccount.accountNumber.toString(),
-                sequence: baseAccount.sequence.toString(),
                 timeoutHeight: timeoutHeight.toFixed(),
-                chainId,
+                sequence: baseAccount.sequence.toString(),
+                accountNumber: baseAccount.accountNumber.toString(),
             },
             ethereumChainId,
         });
@@ -710,6 +716,32 @@ export class MsgBroadcaster {
         }
         return response.feePayerPubKey.key;
     }
+    async getStdFeeWithDynamicBaseFee(args) {
+        const client = new ChainGrpcTxFeesApi(this.endpoints.grpc);
+        let baseFee = DEFAULT_GAS_PRICE;
+        try {
+            const response = await client.fetchEipBaseFee();
+            baseFee = Number(response?.baseFee || DEFAULT_GAS_PRICE);
+        }
+        catch { }
+        if (!args) {
+            return getStdFee(baseFee ? { gasPrice: baseFee } : {});
+        }
+        if (typeof args === 'string') {
+            return getStdFee({
+                ...(baseFee && {
+                    gasPrice: new BigNumberInBase(baseFee).toFixed(),
+                }),
+                gas: args,
+            });
+        }
+        return getStdFee({
+            ...args,
+            ...(baseFee && {
+                gasPrice: new BigNumberInBase(baseFee).toFixed(),
+            }),
+        });
+    }
     /**
      * In case we don't want to simulate the transaction
      * we get the gas limit based on the message type.
@@ -723,24 +755,21 @@ export class MsgBroadcaster {
         if (!simulateTx) {
             return {
                 ...createTransactionWithSigners(args),
-                stdFee: getStdFee(args.fee),
+                stdFee: await this.getStdFeeWithDynamicBaseFee(args.fee),
             };
         }
         const result = await this.simulateTxWithSigners(args);
         if (!result.gasInfo?.gasUsed) {
             return {
                 ...createTransactionWithSigners(args),
-                stdFee: getStdFee(args.fee),
+                stdFee: await this.getStdFeeWithDynamicBaseFee(args.fee),
             };
         }
-        const stdGasFee = {
-            ...getStdFee({
-                ...getStdFee(args.fee),
-                gas: new BigNumberInBase(result.gasInfo.gasUsed)
-                    .times(this.gasBufferCoefficient)
-                    .toFixed(),
-            }),
-        };
+        const stdGasFee = await this.getStdFeeWithDynamicBaseFee({
+            gas: new BigNumberInBase(result.gasInfo.gasUsed)
+                .times(this.gasBufferCoefficient)
+                .toFixed(),
+        });
         return {
             ...createTransactionWithSigners({
                 ...args,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@injectivelabs/wallet-core",
   "description": "Core wallet strategy",
-  "version": "1.15.36",
+  "version": "1.15.38",
   "sideEffects": false,
   "type": "module",
   "author": {
@@ -56,17 +56,17 @@
     "start": "node dist/index.js"
   },
   "dependencies": {
-    "@injectivelabs/exceptions": "^1.15.33",
-    "@injectivelabs/networks": "^1.15.34",
-    "@injectivelabs/sdk-ts": "^1.15.36",
-    "@injectivelabs/ts-types": "^1.15.34",
-    "@injectivelabs/utils": "^1.15.34",
-    "@injectivelabs/wallet-base": "^1.15.36",
+    "@injectivelabs/exceptions": "^1.15.35",
+    "@injectivelabs/networks": "^1.15.36",
+    "@injectivelabs/sdk-ts": "^1.15.38",
+    "@injectivelabs/ts-types": "^1.15.36",
+    "@injectivelabs/utils": "^1.15.36",
+    "@injectivelabs/wallet-base": "^1.15.38",
     "@keplr-wallet/types": "^0.12.159",
     "eventemitter3": "^5.0.1"
   },
   "devDependencies": {
     "shx": "^0.3.3"
   },
-  "gitHead": "ac2df064aa01bc617fb79c547a085dae55c53703"
+  "gitHead": "2f6b7586dc08c30e83fe780a565571b73af6cacc"
 }