@subwallet/extension-base 1.3.17-0 → 1.3.18-0

package/cjs/utils/index.js

@@ -174,6 +174,18 @@ Object.keys(_eth).forEach(function (key) {
     }
   });
 });
+var _fee = require("./fee");
+Object.keys(_fee).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _fee[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _fee[key];
+    }
+  });
+});
 var _fetchEvmChainInfo = require("./fetchEvmChainInfo");
 Object.keys(_fetchEvmChainInfo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;

package/constants/index.d.ts

@@ -35,6 +35,7 @@ export declare const NETWORK_MULTI_GAS_FEE: string[];
 export declare const ORDINAL_COLLECTION = "__Ordinal__";
 export declare const ORDINAL_METHODS: string[];
 export declare const PERMISSIONS_TO_REVOKE: string[];
+export declare const ASSET_HUB_CHAIN_SLUGS: string[];
 export * from './blocked-actions';
 export * from './environment';
 export * from './signing';

package/constants/index.js

@@ -37,6 +37,7 @@ export const NETWORK_MULTI_GAS_FEE = ['*'];
 export const ORDINAL_COLLECTION = '__Ordinal__';
 export const ORDINAL_METHODS = ['drc-20', 'pol-20'];
 export const PERMISSIONS_TO_REVOKE = ['eth_accounts'];
+export const ASSET_HUB_CHAIN_SLUGS = ['paseo_assethub', 'westend_assethub', 'rococo_assethub', 'statemine', 'statemint'];
 export * from "./blocked-actions.js";
 export * from "./environment.js";
 export * from "./signing.js";

package/core/logic-validation/request.js

@@ -5,10 +5,10 @@ import { typedSignatureHash } from '@metamask/eth-sig-util';
 import { EvmProviderError } from '@subwallet/extension-base/background/errors/EvmProviderError';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { EvmProviderErrorType } from '@subwallet/extension-base/background/KoniTypes';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
 import { BasicTxErrorType } from '@subwallet/extension-base/types';
-import { BN_ZERO, createPromiseHandler, isSameAddress, stripUrl, wait } from '@subwallet/extension-base/utils';
+import { BN_ZERO, combineEthFee, createPromiseHandler, isSameAddress, stripUrl, wait } from '@subwallet/extension-base/utils';
 import { isContractAddress, parseContractInput } from '@subwallet/extension-base/utils/eth/parseTransaction';
+import { getId } from '@subwallet/extension-base/utils/getId';
 import { isSubstrateAddress } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import { getSdkError } from '@walletconnect/utils';
@@ -332,15 +332,22 @@ export async function validationEvmDataTransactionMiddleware(koni, url, payload)
       estimateGas = new BigN(transactionParams.gasPrice).multipliedBy(transaction.gas).toFixed(0);
     } else {
       try {
-        const priority = await calculateGasFeeParams(evmApi, networkKey || '');
-        if (priority.baseGasFee) {
-          transaction.maxPriorityFeePerGas = priority.maxPriorityFeePerGas.toString();
-          transaction.maxFeePerGas = priority.maxFeePerGas.toString();
-          const maxFee = priority.maxFeePerGas;
-          estimateGas = maxFee.multipliedBy(transaction.gas).toFixed(0);
+        const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
+        const id = getId();
+        const feeInfo = await koni.feeService.subscribeChainFee(id, transaction.chain || '', 'evm');
+        const feeCombine = combineEthFee(feeInfo);
+        if (transaction.maxFeePerGas) {
+          estimateGas = new BigN(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
+        } else if (transaction.gasPrice) {
+          estimateGas = new BigN(transaction.gasPrice.toString()).multipliedBy(gasLimit).toFixed(0);
         } else {
-          transaction.gasPrice = priority.gasPrice;
-          estimateGas = new BigN(priority.gasPrice).multipliedBy(transaction.gas).toFixed(0);
+          if (feeCombine.maxFeePerGas) {
+            const maxFee = new BigN(feeCombine.maxFeePerGas); // TODO: Need review
+
+            estimateGas = maxFee.multipliedBy(gasLimit).toFixed(0);
+          } else if (feeCombine.gasPrice) {
+            estimateGas = new BigN(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
+          }
         }
       } catch (e) {
         handleError(e.message);

package/core/logic-validation/transfer.d.ts

@@ -3,18 +3,18 @@ import { TransactionError } from '@subwallet/extension-base/background/errors/Tr
 import { _Address, AmountData, ExtrinsicType, FeeData } from '@subwallet/extension-base/background/KoniTypes';
 import { TransactionWarning } from '@subwallet/extension-base/background/warnings/TransactionWarning';
 import { FrameSystemAccountInfo } from '@subwallet/extension-base/core/substrate/types';
-import { _EvmApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _EvmApi, _SubstrateApi, _TonApi } from '@subwallet/extension-base/services/chain-service/types';
 import { OptionalSWTransaction, SWTransactionInput, SWTransactionResponse } from '@subwallet/extension-base/services/transaction-service/types';
+import { EvmFeeInfo } from '@subwallet/extension-base/types';
 import { KeyringPair } from '@subwallet/keyring/types';
-import BigN from 'bignumber.js';
-export declare function validateTransferRequest(tokenInfo: _ChainAsset, from: _Address, to: _Address, value: string | undefined, transferAll: boolean | undefined): [TransactionError[], KeyringPair | undefined, BigN | undefined];
+export declare function validateTransferRequest(tokenInfo: _ChainAsset, from: _Address, to: _Address, value: string | undefined, transferAll: boolean | undefined): TransactionError[];
 export declare function additionalValidateTransferForRecipient(sendingTokenInfo: _ChainAsset, nativeTokenInfo: _ChainAsset, extrinsicType: ExtrinsicType, receiverSendingTokenKeepAliveBalance: bigint, transferAmount: bigint, senderSendingTokenTransferable?: bigint, receiverSystemAccountInfo?: FrameSystemAccountInfo, isSendingTokenSufficient?: boolean): [TransactionWarning[], TransactionError[]];
-export declare function validateXcmTransferRequest(destTokenInfo: _ChainAsset | undefined, sender: _Address, sendingValue: string): [TransactionError[], KeyringPair | undefined, BigN | undefined];
+export declare function validateXcmTransferRequest(destTokenInfo: _ChainAsset | undefined, sender: _Address, sendingValue: string): [TransactionError[], KeyringPair | undefined];
 export declare function additionalValidateXcmTransfer(originTokenInfo: _ChainAsset, destinationTokenInfo: _ChainAsset, sendingAmount: string, senderTransferable: string, receiverNativeBalance: string, destChainInfo: _ChainInfo, isSnowBridge?: boolean): [TransactionWarning | undefined, TransactionError | undefined];
 export declare function checkSupportForFeature(validationResponse: SWTransactionResponse, blockedFeaturesList: string[], chainInfo: _ChainInfo): void;
 export declare function checkSupportForAction(validationResponse: SWTransactionResponse, blockedActionsMap: Record<ExtrinsicType, string[]>): void;
 export declare function checkSupportForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction): void;
-export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi): Promise<FeeData>;
+export declare function estimateFeeForTransaction(validationResponse: SWTransactionResponse, transaction: OptionalSWTransaction, chainInfo: _ChainInfo, evmApi: _EvmApi, substrateApi: _SubstrateApi, feeInfo: EvmFeeInfo, nativeTokenInfo: _ChainAsset, tokenPayFeeInfo: _ChainAsset | undefined, isTransferLocalTokenAndPayThatTokenAsFee: boolean | undefined): Promise<FeeData>;
 export declare function checkSigningAccountForTransaction(validationResponse: SWTransactionResponse, chainInfoMap: Record<string, _ChainInfo>): void;
 export declare function checkBalanceWithTransactionFee(validationResponse: SWTransactionResponse, transactionInput: SWTransactionInput, nativeTokenInfo: _ChainAsset, nativeTokenAvailable: AmountData): void;
 export declare function checkTonAddressBounceableAndAccountNotActive(tonApi: _TonApi, validationResponse: SWTransactionResponse): Promise<void>;

package/core/logic-validation/transfer.js

@@ -9,10 +9,10 @@ import { _canAccountBeReaped, _isAccountActive } from '@subwallet/extension-base
 import { isBounceableAddress } from '@subwallet/extension-base/services/balance-service/helpers/subscribe/ton/utils';
 import { _TRANSFER_CHAIN_GROUP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getAssetDecimals, _getChainExistentialDeposit, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getTokenMinAmount, _isNativeToken, _isTokenEvmSmartContract, _isTokenTonSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
-import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { calculateToAmountByReservePool, FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE } from '@subwallet/extension-base/services/fee-service/utils';
 import { isSubstrateTransaction, isTonTransaction } from '@subwallet/extension-base/services/transaction-service/helpers';
 import { AccountSignMode, BasicTxErrorType, BasicTxWarningCode, TransferTxErrorType } from '@subwallet/extension-base/types';
-import { balanceFormatter, formatNumber, pairToAccount } from '@subwallet/extension-base/utils';
+import { balanceFormatter, combineEthFee, formatNumber, pairToAccount } from '@subwallet/extension-base/utils';
 import { isTonAddress } from '@subwallet/keyring';
 import { keyring } from '@subwallet/ui-keyring';
 import BigN from 'bignumber.js';
@@ -22,15 +22,10 @@ import { isEthereumAddress } from '@polkadot/util-crypto';
 // normal transfer
 export function validateTransferRequest(tokenInfo, from, to, value, transferAll) {
   const errors = [];
-  const keypair = keyring.getPair(from);
-  let transferValue;
   if (!transferAll) {
     if (value === undefined) {
       errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Transfer amount is required')));
     }
-    if (value) {
-      transferValue = new BigN(value);
-    }
   }
   if (!tokenInfo) {
     errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Not found token from registry')));
@@ -41,7 +36,7 @@ export function validateTransferRequest(tokenInfo, from, to, value, transferAll)
   if (isTonAddress(from) && isTonAddress(to) && _isTokenTonSmartContract(tokenInfo) && _getContractAddressOfToken(tokenInfo).length === 0) {
     errors.push(new TransactionError(BasicTxErrorType.INVALID_PARAMS, t('Not found TEP74 address for this token')));
   }
-  return [errors, keypair, transferValue];
+  return errors;
 }
 export function additionalValidateTransferForRecipient(sendingTokenInfo, nativeTokenInfo, extrinsicType, receiverSendingTokenKeepAliveBalance, transferAmount, senderSendingTokenTransferable, receiverSystemAccountInfo, isSendingTokenSufficient) {
   const sendingTokenMinAmount = BigInt(_getTokenMinAmount(sendingTokenInfo));
@@ -103,11 +98,10 @@ export function additionalValidateTransferForRecipient(sendingTokenInfo, nativeT
 export function validateXcmTransferRequest(destTokenInfo, sender, sendingValue) {
   const errors = [];
   const keypair = keyring.getPair(sender);
-  const transferValue = new BigN(sendingValue);
   if (!destTokenInfo) {
     errors.push(new TransactionError(TransferTxErrorType.INVALID_TOKEN, t('Not found token from registry')));
   }
-  return [errors, keypair, transferValue];
+  return [errors, keypair];
 }
 export function additionalValidateXcmTransfer(originTokenInfo, destinationTokenInfo, sendingAmount, senderTransferable, receiverNativeBalance, destChainInfo, isSnowBridge = false) {
   const destMinAmount = _getTokenMinAmount(destinationTokenInfo);
@@ -333,7 +327,7 @@ export function checkSupportForTransaction(validationResponse, transaction) {
     }
   }
 }
-export async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi) {
+export async function estimateFeeForTransaction(validationResponse, transaction, chainInfo, evmApi, substrateApi, feeInfo, nativeTokenInfo, tokenPayFeeInfo, isTransferLocalTokenAndPayThatTokenAsFee) {
   const estimateFee = {
     symbol: '',
     decimals: 0,
@@ -354,21 +348,21 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
         estimateFee.value = transaction.estimateFee; // todo: might need to update logic estimate fee inside for future actions excluding normal transfer Ton and Jetton
       } else {
         const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
-        const priority = await calculateGasFeeParams(evmApi, chainInfo.slug);
+        const feeCombine = combineEthFee(feeInfo, validationResponse.feeOption, validationResponse.feeCustom);
         if (transaction.maxFeePerGas) {
           estimateFee.value = new BigN(transaction.maxFeePerGas.toString()).multipliedBy(gasLimit).toFixed(0);
         } else if (transaction.gasPrice) {
-          estimateFee.value = new BigN((transaction.gasPrice || 0).toString()).multipliedBy(gasLimit).toFixed(0);
+          estimateFee.value = new BigN(transaction.gasPrice.toString()).multipliedBy(gasLimit).toFixed(0);
         } else {
-          if (priority.baseGasFee) {
-            const maxFee = priority.maxFeePerGas; // TODO: Need review
+          if (feeCombine.maxFeePerGas) {
+            const maxFee = new BigN(feeCombine.maxFeePerGas); // TODO: Need review
 
             estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
-          } else {
-            estimateFee.value = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+          } else if (feeCombine.gasPrice) {
+            estimateFee.value = new BigN(feeCombine.gasPrice || 0).multipliedBy(gasLimit).toFixed(0);
           }
         }
-        estimateFee.tooHigh = priority.busyNetwork;
+        estimateFee.tooHigh = feeInfo.busyNetwork;
       }
     } catch (e) {
       const error = e;
@@ -377,6 +371,12 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
       }
     }
   }
+  if (tokenPayFeeInfo) {
+    const estimatedFeeAmount = isTransferLocalTokenAndPayThatTokenAsFee ? (BigInt(estimateFee.value) * BigInt(FEE_COVERAGE_PERCENTAGE_SPECIAL_CASE) / BigInt(100)).toString() : estimateFee.value;
+    estimateFee.decimals = tokenPayFeeInfo.decimals || 0;
+    estimateFee.symbol = tokenPayFeeInfo.symbol;
+    estimateFee.value = await calculateToAmountByReservePool(substrateApi.api, nativeTokenInfo, tokenPayFeeInfo, estimatedFeeAmount);
+  }
   return estimateFee;
 }
 export function checkSigningAccountForTransaction(validationResponse, chainInfoMap) {
@@ -415,9 +415,10 @@ export function checkBalanceWithTransactionFee(validationResponse, transactionIn
     edAsWarning,
     extrinsicType,
     isTransferAll,
+    nonNativeTokenPayFeeSlug,
     skipFeeValidation
   } = transactionInput;
-  if (skipFeeValidation) {
+  if (skipFeeValidation || nonNativeTokenPayFeeSlug) {
     return;
   }
   const bnFee = new BigN(validationResponse.estimateFee.value);

package/core/substrate/xcm-parser.d.ts

@@ -1,6 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _Address } from '@subwallet/extension-base/background/KoniTypes';
-export declare function _getXcmDestWeight(originChainInfo: _ChainInfo): "Unlimited" | 5000000000;
+export declare function _getXcmDestWeight(originChainInfo: _ChainInfo): 5000000000 | "Unlimited";
 export declare function _getXcmBeneficiary(destChainInfo: _ChainInfo, recipient: _Address, version: number): {
     [x: string]: {
         parents: number;

package/koni/api/contract-handler/evm/web3.js

@@ -3,6 +3,7 @@
 
 import { _ERC20_ABI } from '@subwallet/extension-base/koni/api/contract-handler/utils';
 import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { combineEthFee } from '@subwallet/extension-base/utils';
 export const getERC20Contract = (assetAddress, evmApi, options = {}) => {
   // @ts-ignore
   // eslint-disable-next-line @typescript-eslint/no-unsafe-argument,@typescript-eslint/no-unsafe-member-access
@@ -22,7 +23,6 @@ export async function getERC20Allowance(spender, owner, contractAddress, evmApi)
   return await allowanceCall.call();
 }
 export async function getERC20SpendingApprovalTx(spender, owner, contractAddress, evmApi, amount = '115792089237316195423570985008687907853269984665640564039457584007913129639935') {
-  var _priority$maxFeePerGa, _priority$maxPriority;
   const tokenContract = getERC20Contract(contractAddress, evmApi);
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
   const approveCall = tokenContract.methods.approve(spender, amount); // TODO: need test
@@ -33,13 +33,13 @@ export async function getERC20SpendingApprovalTx(spender, owner, contractAddress
     from: owner
   });
   const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const feeCombine = combineEthFee(priority);
   return {
     from: owner,
     to: contractAddress,
     data: approveEncodedCall,
     gas: gasLimit,
     gasPrice: priority.gasPrice,
-    maxFeePerGas: (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
-    maxPriorityFeePerGas: (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+    ...feeCombine
   };
 }

package/koni/background/handlers/Extension.d.ts

@@ -118,6 +118,8 @@ export default class KoniExtension {
     private approveSpending;
     private makeTransfer;
     private makeCrossChainTransfer;
+    private getTokensCanPayFee;
+    private getAmountForPair;
     private evmNftSubmitTransaction;
     private upsertChain;
     private removeCustomChain;
@@ -134,9 +136,7 @@ export default class KoniExtension {
     private validateCustomAsset;
     private getAddressTransferableBalance;
     private getAddressTotalBalance;
-    private getMaxTransferable;
-    private getXcmMaxTransferable;
-    private getNativeTokenMaxTransferable;
+    private subscribeMaxTransferable;
     private subscribeAddressTransferableBalance;
     private substrateNftSubmitTransaction;
     private enableChains;