@subwallet/extension-base 1.3.2-0 → 1.3.4-0

package/core/logic-validation/transfer.js

@@ -342,14 +342,20 @@ export async function estimateFeeForTransaction(validationResponse, transaction,
       } else if (isTonTransaction(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 = await evmApi.api.eth.estimateGas(transaction);
+        const gasLimit = transaction.gas || (await evmApi.api.eth.estimateGas(transaction));
         const priority = await calculateGasFeeParams(evmApi, chainInfo.slug);
-        if (priority.baseGasFee) {
-          const maxFee = priority.maxFeePerGas; // TODO: Need review
-
-          estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
+        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);
         } else {
-          estimateFee.value = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+          if (priority.baseGasFee) {
+            const maxFee = priority.maxFeePerGas; // TODO: Need review
+
+            estimateFee.value = maxFee.multipliedBy(gasLimit).toFixed(0);
+          } else {
+            estimateFee.value = new BigN(priority.gasPrice).multipliedBy(gasLimit).toFixed(0);
+          }
         }
         estimateFee.tooHigh = priority.busyNetwork;
       }

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

@@ -51,5 +51,6 @@ export declare function _isXcmTransferUnstable(originChainInfo: _ChainInfo, dest
 export declare function _getXcmUnstableWarning(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): string;
 export declare function _isXcmWithinSameConsensus(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isSnowBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
+export declare function _isAvailBridgeXcm(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo): boolean;
 export declare function _isMythosFromHydrationToMythos(originChainInfo: _ChainInfo, destChainInfo: _ChainInfo, assetSlug: string): boolean;
 export declare function _adaptX1Interior(assetIdentifier: Record<string, any>, version: number): Record<string, any>;

package/core/substrate/xcm-parser.js

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _getChainSubstrateAddressPrefix, _getEvmChainId, _getSubstrateParaId, _getSubstrateRelayParent, _getXcmAssetMultilocation, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateParaChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { decodeAddress, evmToAddress } from '@polkadot/util-crypto';
 const FOUR_INSTRUCTIONS_WEIGHT = 5000000000;
@@ -72,8 +73,13 @@ function getSnowBridgeUnstableWarning(originChainInfo) {
 function getMythosFromHydrationToMythosWarning() {
   return 'Cross-chain transfer of this token requires a high transaction fee. Do you want to continue?';
 }
+function getAvailBridgeWarning() {
+  return 'Cross-chain transfer of this token may take up to 90 minutes, and you’ll need to manually claim the funds on the destination network to complete the transfer. Do you still want to continue?';
+}
 export function _getXcmUnstableWarning(originChainInfo, destChainInfo, assetSlug) {
-  if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
+  if (_isAvailBridgeXcm(originChainInfo, destChainInfo)) {
+    return getAvailBridgeWarning();
+  } else if (_isSnowBridgeXcm(originChainInfo, destChainInfo)) {
     return getSnowBridgeUnstableWarning(originChainInfo);
   } else if (_isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug)) {
     return getMythosFromHydrationToMythosWarning();
@@ -87,6 +93,11 @@ export function _isXcmWithinSameConsensus(originChainInfo, destChainInfo) {
 export function _isSnowBridgeXcm(originChainInfo, destChainInfo) {
   return !_isXcmWithinSameConsensus(originChainInfo, destChainInfo) && (_isPureEvmChain(originChainInfo) || _isPureEvmChain(destChainInfo));
 }
+export function _isAvailBridgeXcm(originChainInfo, destChainInfo) {
+  const isAvailBridgeFromEvm = _isPureEvmChain(originChainInfo) && isAvailChainBridge(destChainInfo.slug);
+  const isAvailBridgeFromAvail = isAvailChainBridge(originChainInfo.slug) && _isPureEvmChain(destChainInfo);
+  return isAvailBridgeFromEvm || isAvailBridgeFromAvail;
+}
 export function _isMythosFromHydrationToMythos(originChainInfo, destChainInfo, assetSlug) {
   return originChainInfo.slug === 'hydradx_main' && destChainInfo.slug === 'mythos' && assetSlug === 'hydradx_main-LOCAL-MYTH';
 }