@subwallet/extension-base 1.3.10-0 → 1.3.12-0

package/koni/background/handlers/Extension.js

@@ -3,6 +3,7 @@
 
 import { Common } from '@ethereumjs/common';
 import { LegacyTransaction } from '@ethereumjs/tx';
+import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
 import { _AssetType } from '@subwallet/chain-list/types';
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { withErrorLog } from '@subwallet/extension-base/background/handlers/helpers';
@@ -29,16 +30,17 @@ import { createTonTransaction } from '@subwallet/extension-base/services/balance
 import { createAvailBridgeExtrinsicFromAvail, createAvailBridgeTxFromEth, createPolygonBridgeExtrinsic, createSnowBridgeExtrinsic, createXcmExtrinsic, getXcmMockTxFee } from '@subwallet/extension-base/services/balance-service/transfer/xcm';
 import { getClaimTxOnAvail, getClaimTxOnEthereum, isAvailChainBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { _isPolygonChainBridge, getClaimPolygonBridge, isClaimedPolygonBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
+import { _isPosChainBridge, getClaimPosBridge } from '@subwallet/extension-base/services/balance-service/transfer/xcm/posBridge';
 import { _API_OPTIONS_CHAIN_GROUP, _DEFAULT_MANTA_ZK_CHAIN, _MANTA_ZK_CHAIN_GROUP, _ZK_ASSET_PREFIX, SUFFICIENT_CHAIN } from '@subwallet/extension-base/services/chain-service/constants';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
-import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
+import { _getAssetDecimals, _getAssetSymbol, _getChainNativeTokenBasicInfo, _getContractAddressOfToken, _getEvmChainId, _getTokenMinAmount, _getTokenOnChainAssetId, _getXcmAssetMultilocation, _isAssetSmartContractNft, _isBridgedToken, _isChainEvmCompatible, _isChainSubstrateCompatible, _isChainTonCompatible, _isCustomAsset, _isLocalToken, _isMantaZkAsset, _isNativeToken, _isPureEvmChain, _isTokenEvmSmartContract, _isTokenTransferredByEvm, _isTokenTransferredByTon } from '@subwallet/extension-base/services/chain-service/utils';
 import { EXTENSION_REQUEST_URL } from '@subwallet/extension-base/services/request-service/constants';
 import { DEFAULT_AUTO_LOCK_TIME } from '@subwallet/extension-base/services/setting-service/constants';
 import { isProposalExpired, isSupportWalletConnectChain, isSupportWalletConnectNamespace } from '@subwallet/extension-base/services/wallet-connect-service/helpers';
 import { SWStorage } from '@subwallet/extension-base/storage';
 import { AccountsStore } from '@subwallet/extension-base/stores';
 import { BasicTxErrorType, BasicTxWarningCode, StakingTxErrorType, YieldPoolType } from '@subwallet/extension-base/types';
-import { _analyzeAddress, BN_ZERO, combineAllAccountProxy, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
+import { _analyzeAddress, BN_ZERO, combineAllAccountProxy, createTransactionFromRLP, isSameAddress, MODULE_SUPPORT, reformatAddress, signatureToHex, toBNString, transformAccounts, transformAddresses, uniqueStringArray } from '@subwallet/extension-base/utils';
 import { parseContractInput, parseEvmRlp } from '@subwallet/extension-base/utils/eth/parseTransaction';
 import { metadataExpand } from '@subwallet/extension-chains';
 import { getKeypairTypeByAddress, isAddress, isSubstrateAddress, isTonAddress } from '@subwallet/keyring';
@@ -1262,6 +1264,7 @@ export default class KoniExtension {
     const isAvailBridgeFromAvail = isAvailChainBridge(originNetworkKey) && _isPureEvmChain(chainInfoMap[destinationNetworkKey]);
     const isSnowBridgeEvmTransfer = _isPureEvmChain(chainInfoMap[originNetworkKey]) && _isSnowBridgeXcm(chainInfoMap[originNetworkKey], chainInfoMap[destinationNetworkKey]) && !isAvailBridgeFromEvm;
     const isPolygonBridgeTransfer = _isPolygonChainBridge(originNetworkKey, destinationNetworkKey);
+    const isPosBridgeTransfer = _isPosChainBridge(originNetworkKey, destinationNetworkKey);
     let additionalValidator;
     let eventsHandler;
     if (fromKeyPair && destinationTokenInfo) {
@@ -1278,7 +1281,7 @@ export default class KoniExtension {
         evmApi
       };
       let funcCreateExtrinsic;
-      if (isPolygonBridgeTransfer) {
+      if (isPosBridgeTransfer || isPolygonBridgeTransfer) {
         funcCreateExtrinsic = createPolygonBridgeExtrinsic;
       } else if (isSnowBridgeEvmTransfer) {
         funcCreateExtrinsic = createSnowBridgeExtrinsic;
@@ -1345,7 +1348,7 @@ export default class KoniExtension {
       transaction: extrinsic,
       data: inputData,
       extrinsicType: ExtrinsicType.TRANSFER_XCM,
-      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
+      chainType: !isSnowBridgeEvmTransfer && !isAvailBridgeFromEvm && !isPolygonBridgeTransfer && !isPosBridgeTransfer ? ChainType.SUBSTRATE : ChainType.EVM,
       transferNativeAmount: _isNativeToken(originTokenInfo) ? value : '0',
       ignoreWarnings,
       isTransferAll: transferAll,
@@ -1562,6 +1565,10 @@ export default class KoniExtension {
     const chainInfoMap = this.#koniState.chainService.getChainInfoMap();
     const destinationTokenInfo = this.#koniState.getXcmEqualAssetByChain(destChain, originTokenInfo.slug);
     const existentialDeposit = originTokenInfo.minAmount || '0';
+
+    // todo: improve this case. Currently set 1 AVAIL for covering fee as default.
+    const isSpecialBridgeFromAvail = originTokenInfo.slug === 'avail_mainnet-NATIVE-AVAIL' && destChain === COMMON_CHAIN_SLUGS.ETHEREUM;
+    const specialBridgeFromAvailFee = new BigN(toBNString(1, _getAssetDecimals(originTokenInfo))).minus(new BigN(_getTokenMinAmount(originTokenInfo)));
     if (destinationTokenInfo) {
       const [bnMockExecutionFee, {
         value
@@ -1572,7 +1579,7 @@ export default class KoniExtension {
         token: originTokenInfo.slug
       })]);
       const bnMaxTransferable = new BigN(value);
-      const estimatedFee = bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO).plus(new BigN(existentialDeposit));
+      const estimatedFee = isSpecialBridgeFromAvail ? specialBridgeFromAvailFee : bnMockExecutionFee.multipliedBy(XCM_FEE_RATIO).plus(new BigN(existentialDeposit));
       return bnMaxTransferable.minus(estimatedFee);
     }
     return new BigN(0);
@@ -3447,7 +3454,12 @@ export default class KoniExtension {
     const extrinsicType = ExtrinsicType.CLAIM_BRIDGE;
     let transaction = null;
     const evmApi = this.#koniState.getEvmApi(chain);
-    transaction = await getClaimPolygonBridge(chain, notification, evmApi);
+    const metadata = notification.metadata;
+    if (metadata.bridgeType === 'POS') {
+      transaction = await getClaimPosBridge(chain, notification, evmApi);
+    } else {
+      transaction = await getClaimPolygonBridge(chain, notification, evmApi);
+    }
     const chainType = ChainType.EVM;
     return await this.#koniState.transactionService.handleTransaction({
       address,

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.3.10-0",
+  "version": "1.3.12-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -272,6 +272,8 @@
     "./koni/api/contract-handler/utils/neuroguns_psp34_abi.json": "./koni/api/contract-handler/utils/neuroguns_psp34_abi.json",
     "./koni/api/contract-handler/utils/pink_psp34_abi.json": "./koni/api/contract-handler/utils/pink_psp34_abi.json",
     "./koni/api/contract-handler/utils/polygon_bridge_abi.json": "./koni/api/contract-handler/utils/polygon_bridge_abi.json",
+    "./koni/api/contract-handler/utils/pos_bridge_abi.json": "./koni/api/contract-handler/utils/pos_bridge_abi.json",
+    "./koni/api/contract-handler/utils/pos_bridge_l2_abi.json": "./koni/api/contract-handler/utils/pos_bridge_l2_abi.json",
     "./koni/api/contract-handler/utils/psp22_abi.json": "./koni/api/contract-handler/utils/psp22_abi.json",
     "./koni/api/contract-handler/utils/psp34_abi.json": "./koni/api/contract-handler/utils/psp34_abi.json",
     "./koni/api/contract-handler/utils/snowbridge_gateway_abi.json": "./koni/api/contract-handler/utils/snowbridge_gateway_abi.json",
@@ -722,6 +724,11 @@
       "require": "./cjs/services/balance-service/transfer/xcm/polygonBridge.js",
       "default": "./services/balance-service/transfer/xcm/polygonBridge.js"
     },
+    "./services/balance-service/transfer/xcm/posBridge": {
+      "types": "./services/balance-service/transfer/xcm/posBridge.d.ts",
+      "require": "./cjs/services/balance-service/transfer/xcm/posBridge.js",
+      "default": "./services/balance-service/transfer/xcm/posBridge.js"
+    },
     "./services/balance-service/transfer/xcm/snowBridge": {
       "types": "./services/balance-service/transfer/xcm/snowBridge.d.ts",
       "require": "./cjs/services/balance-service/transfer/xcm/snowBridge.js",
@@ -1774,6 +1781,11 @@
       "require": "./cjs/services/swap-service/handler/hydradx-handler.js",
       "default": "./services/swap-service/handler/hydradx-handler.js"
     },
+    "./services/swap-service/handler/simpleswap-handler": {
+      "types": "./services/swap-service/handler/simpleswap-handler.d.ts",
+      "require": "./cjs/services/swap-service/handler/simpleswap-handler.js",
+      "default": "./services/swap-service/handler/simpleswap-handler.js"
+    },
     "./services/swap-service/utils": {
       "types": "./services/swap-service/utils.d.ts",
       "require": "./cjs/services/swap-service/utils.js",
@@ -2491,11 +2503,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.95-beta.1",
-    "@subwallet/extension-base": "^1.3.10-0",
-    "@subwallet/extension-chains": "^1.3.10-0",
-    "@subwallet/extension-dapp": "^1.3.10-0",
-    "@subwallet/extension-inject": "^1.3.10-0",
+    "@subwallet/chain-list": "0.2.97",
+    "@subwallet/extension-base": "^1.3.12-0",
+    "@subwallet/extension-chains": "^1.3.12-0",
+    "@subwallet/extension-dapp": "^1.3.12-0",
+    "@subwallet/extension-inject": "^1.3.12-0",
     "@subwallet/keyring": "^0.1.8-beta.0",
     "@subwallet/ui-keyring": "^0.1.8-beta.0",
     "@ton/core": "^0.56.3",

package/packageInfo.js

@@ -7,5 +7,5 @@ export const packageInfo = {
   name: '@subwallet/extension-base',
   path: (import.meta && import.meta.url) ? new URL(import.meta.url).pathname.substring(0, new URL(import.meta.url).pathname.lastIndexOf('/') + 1) : 'auto',
   type: 'esm',
-  version: '1.3.10-0'
+  version: '1.3.12-0'
 };

package/services/balance-service/transfer/smart-contract.js

@@ -58,6 +58,8 @@ export async function getERC20TransactionObject(assetAddress, chainInfo, from, t
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
   erc20Contract.methods.transfer(to, transferValue).estimateGas({
     from
+  }).catch(() => {
+    throw Error('Unable to estimate fee for this transaction. Try again or contact support at agent@subwallet.app');
   }), calculateGasFeeParams(evmApi, networkKey)]);
   const transactionObject = {
     gas: gasLimit,

package/services/balance-service/transfer/xcm/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
-import { _isPolygonBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
+import { _isPolygonBridgeXcm, _isPosBridgeXcm, _isSnowBridgeXcm } from '@subwallet/extension-base/core/substrate/xcm-parser';
 import { getAvailBridgeExtrinsicFromAvail, getAvailBridgeTxFromEth } from '@subwallet/extension-base/services/balance-service/transfer/xcm/availBridge';
 import { getExtrinsicByPolkadotXcmPallet } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polkadotXcm';
 import { _createPolygonBridgeL1toL2Extrinsic, _createPolygonBridgeL2toL1Extrinsic } from '@subwallet/extension-base/services/balance-service/transfer/xcm/polygonBridge';
@@ -13,6 +13,7 @@ import { _isChainEvmCompatible, _isNativeToken } from '@subwallet/extension-base
 import BigN from 'bignumber.js';
 import { u8aToHex } from '@polkadot/util';
 import { addressToEvm } from '@polkadot/util-crypto';
+import { _createPosBridgeL1toL2Extrinsic, _createPosBridgeL2toL1Extrinsic } from "./posBridge.js";
 export const createSnowBridgeExtrinsic = async ({
   chainInfoMap,
   destinationTokenInfo,
@@ -97,7 +98,9 @@ export const createPolygonBridgeExtrinsic = async ({
 }) => {
   const originChainInfo = chainInfoMap[originTokenInfo.originChain];
   const destinationChainInfo = chainInfoMap[destinationTokenInfo.originChain];
-  if (!_isPolygonBridgeXcm(originChainInfo, destinationChainInfo)) {
+  const isPolygonBridgeXcm = _isPolygonBridgeXcm(originChainInfo, destinationChainInfo);
+  const isValidBridge = isPolygonBridgeXcm || _isPosBridgeXcm(originChainInfo, destinationChainInfo);
+  if (!isValidBridge) {
     throw new Error('This is not a valid PolygonBridge transfer');
   }
   if (!evmApi) {
@@ -107,11 +110,8 @@ export const createPolygonBridgeExtrinsic = async ({
     throw Error('Sender is required');
   }
   const sourceChain = originChainInfo.slug;
-  if (sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm') {
-    return _createPolygonBridgeL2toL1Extrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
-  } else {
-    return _createPolygonBridgeL1toL2Extrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
-  }
+  const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm' ? _createPolygonBridgeL2toL1Extrinsic : _createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _createPosBridgeL2toL1Extrinsic : _createPosBridgeL1toL2Extrinsic;
+  return createExtrinsic(originTokenInfo, originChainInfo, sender, recipient, sendingValue, evmApi);
 };
 export const getXcmMockTxFee = async (substrateApi, chainInfoMap, originTokenInfo, destinationTokenInfo) => {
   try {

package/services/balance-service/transfer/xcm/polygonBridge.js

@@ -48,13 +48,13 @@ export async function _createPolygonBridgeL2toL1Extrinsic(tokenInfo, originChain
   return createPolygonBridgeTransaction(tokenInfo, originChainInfo, sender, recipientAddress, value, 0, evmApi);
 }
 export async function getClaimPolygonBridge(chainSlug, notification, evmApi) {
-  var _priority$maxFeePerGa2, _priority$maxPriority2;
+  var _metadata$sourceNetwo, _metadata$counter, _priority$maxFeePerGa2, _priority$maxPriority2;
   const polygonBridgeContractAddress = getPolygonBridgeContract(chainSlug);
   const polygonBridgeContract = getWeb3Contract(polygonBridgeContractAddress, evmApi, _POLYGON_BRIDGE_ABI);
   const metadata = notification.metadata;
   const isTestnet = chainSlug === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
   const proofDomain = isTestnet ? POLYGON_PROOF_INDEXER.TESTNET : POLYGON_PROOF_INDEXER.MAINNET;
-  const proofResponse = await fetch(`${proofDomain}?networkId=${metadata.sourceNetwork}&depositCount=${metadata.counter}`).then(res => res.json());
+  const proofResponse = await fetch(`${proofDomain}?networkId=${(_metadata$sourceNetwo = metadata.sourceNetwork) !== null && _metadata$sourceNetwo !== void 0 ? _metadata$sourceNetwo : ''}&depositCount=${(_metadata$counter = metadata.counter) !== null && _metadata$counter !== void 0 ? _metadata$counter : ''}`).then(res => res.json());
   const proof = proofResponse.proof;
 
   // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment

package/services/balance-service/transfer/xcm/posBridge.d.ts

@@ -0,0 +1,14 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
+import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { _NotificationInfo } from '@subwallet/extension-base/services/inapp-notification-service/interfaces';
+import { TransactionConfig } from 'web3-core';
+export declare const POS_EXIT_PAYLOAD_INDEXER: {
+    MAINNET: string;
+    TESTNET: string;
+};
+export declare function _createPosBridgeL1toL2Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function _createPosBridgeL2toL1Extrinsic(tokenInfo: _ChainAsset, originChainInfo: _ChainInfo, sender: string, recipientAddress: string, value: string, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function getClaimPosBridge(chainSlug: string, notification: _NotificationInfo, evmApi: _EvmApi): Promise<TransactionConfig>;
+export declare function isClaimedPosBridge(id: string, address: string, isTestnet: boolean): Promise<boolean>;
+export declare function _isPosChainBridge(srcChain: string, destChain: string): boolean;
+export declare function _isPosChainL2Bridge(srcChain: string, destChain: string): boolean;

package/services/balance-service/transfer/xcm/posBridge.js

@@ -0,0 +1,131 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+import { COMMON_CHAIN_SLUGS } from '@subwallet/chain-list';
+import { getWeb3Contract } from '@subwallet/extension-base/koni/api/contract-handler/evm/web3';
+import { _POS_BRIDGE_ABI, _POS_BRIDGE_L2_ABI, getPosL1BridgeContract, getPosL2BridgeContract } from '@subwallet/extension-base/koni/api/contract-handler/utils';
+import { calculateGasFeeParams } from '@subwallet/extension-base/services/fee-service/utils';
+import { fetchPolygonBridgeTransactions } from '@subwallet/extension-base/services/inapp-notification-service/utils';
+import { BasicTxErrorType } from '@subwallet/extension-base/types';
+export const POS_EXIT_PAYLOAD_INDEXER = {
+  MAINNET: 'https://proof-generator.polygon.technology/api/v1/matic/exit-payload',
+  TESTNET: 'https://proof-generator.polygon.technology/api/v1/amoy/exit-payload'
+};
+export async function _createPosBridgeL1toL2Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
+  var _priority$maxFeePerGa, _priority$maxPriority;
+  const posBridgeContractAddress = getPosL1BridgeContract(originChainInfo.slug);
+  const posBridgeContract = getWeb3Contract(posBridgeContractAddress, evmApi, _POS_BRIDGE_ABI);
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const transferCall = posBridgeContract.methods.depositEtherFor(recipientAddress);
+  const transferEncodedCall = transferCall.encodeABI();
+  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const transactionConfig = {
+    from: sender,
+    to: posBridgeContractAddress,
+    value: value,
+    data: transferEncodedCall,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa = priority.maxFeePerGas) === null || _priority$maxFeePerGa === void 0 ? void 0 : _priority$maxFeePerGa.toString(),
+    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority = priority.maxPriorityFeePerGas) === null || _priority$maxPriority === void 0 ? void 0 : _priority$maxPriority.toString()
+  };
+  const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
+  transactionConfig.gas = gasLimit.toString();
+  return transactionConfig;
+}
+export async function _createPosBridgeL2toL1Extrinsic(tokenInfo, originChainInfo, sender, recipientAddress, value, evmApi) {
+  var _priority$maxFeePerGa2, _priority$maxPriority2;
+  const posBridgeContractAddress = getPosL2BridgeContract(originChainInfo.slug);
+  const posBridgeContract = getWeb3Contract(posBridgeContractAddress, evmApi, _POS_BRIDGE_L2_ABI);
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const transferCall = posBridgeContract.methods.withdraw(value);
+  const transferEncodedCall = transferCall.encodeABI();
+  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const transactionConfig = {
+    from: sender,
+    to: posBridgeContractAddress,
+    value: undefined,
+    data: transferEncodedCall,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxFeePerGa2 = priority.maxFeePerGas) === null || _priority$maxFeePerGa2 === void 0 ? void 0 : _priority$maxFeePerGa2.toString(),
+    maxPriorityFeePerGas: priority === null || priority === void 0 ? void 0 : (_priority$maxPriority2 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority2 === void 0 ? void 0 : _priority$maxPriority2.toString()
+  };
+  const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
+  transactionConfig.gas = gasLimit.toString();
+  return transactionConfig;
+}
+export async function getClaimPosBridge(chainSlug, notification, evmApi) {
+  var _event$arguments, _event$arguments$, _event$arguments$$top, _priority$maxFeePerGa3, _priority$maxPriority3;
+  const posBridgeContractAddress = getPosL2BridgeContract(chainSlug);
+  const posBridgeContract = getWeb3Contract(posBridgeContractAddress, evmApi, _POS_BRIDGE_L2_ABI);
+  const metadata = notification.metadata;
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const event = posBridgeContract.events.Transfer(metadata.userAddress, metadata.userAddress, metadata.amounts[0]);
+  const isTestnet = chainSlug === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
+  const domain = isTestnet ? POS_EXIT_PAYLOAD_INDEXER.TESTNET : POS_EXIT_PAYLOAD_INDEXER.MAINNET;
+  const eventSignature = event === null || event === void 0 ? void 0 : (_event$arguments = event.arguments) === null || _event$arguments === void 0 ? void 0 : (_event$arguments$ = _event$arguments[0]) === null || _event$arguments$ === void 0 ? void 0 : (_event$arguments$$top = _event$arguments$.topics) === null || _event$arguments$$top === void 0 ? void 0 : _event$arguments$$top[0];
+  let inputData;
+  try {
+    const res = await fetch(`${domain}/${metadata.transactionHash}?eventSignature=${eventSignature}`);
+    inputData = await res.json();
+    if (inputData.error && inputData.message.includes('not been checkpointed yet')) {
+      throw new Error(`${inputData.message}. Please try again later.`);
+    }
+  } catch (err) {
+    console.error('Error:', err);
+    throw new Error(BasicTxErrorType.INTERNAL_ERROR);
+  }
+  const posClaimContractAddress = getPosL1BridgeContract(chainSlug);
+  const posClaimContract = getWeb3Contract(posClaimContractAddress, evmApi, _POS_BRIDGE_ABI);
+
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment
+  const transferCall = posClaimContract.methods.exit(inputData.result);
+  const transferEncodedCall = transferCall.encodeABI();
+  const priority = await calculateGasFeeParams(evmApi, evmApi.chainSlug);
+  const transactionConfig = {
+    from: metadata.userAddress,
+    to: posClaimContractAddress,
+    value: '0',
+    data: transferEncodedCall,
+    gasPrice: priority.gasPrice,
+    maxFeePerGas: (_priority$maxFeePerGa3 = priority.maxFeePerGas) === null || _priority$maxFeePerGa3 === void 0 ? void 0 : _priority$maxFeePerGa3.toString(),
+    maxPriorityFeePerGas: (_priority$maxPriority3 = priority.maxPriorityFeePerGas) === null || _priority$maxPriority3 === void 0 ? void 0 : _priority$maxPriority3.toString()
+  };
+  const gasLimit = await evmApi.api.eth.estimateGas(transactionConfig).catch(() => 200000);
+  transactionConfig.gas = gasLimit.toString();
+  return transactionConfig;
+}
+export async function isClaimedPosBridge(id, address, isTestnet) {
+  try {
+    const isClaimableBridge = await fetchPolygonBridgeTransactions(address, isTestnet);
+    if (isClaimableBridge && isClaimableBridge.success) {
+      const isIdClaimable = isClaimableBridge.result.some(transaction => transaction._id === id);
+      return !isIdClaimable;
+    }
+  } catch (err) {
+    console.error('Error:', err);
+  }
+  return false;
+}
+export function _isPosChainBridge(srcChain, destChain) {
+  if (srcChain === 'polygon_amoy' && destChain === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+    return true;
+  } else if (srcChain === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA && destChain === 'polygon_amoy') {
+    return true;
+  } else if (srcChain === 'polygon' && destChain === COMMON_CHAIN_SLUGS.ETHEREUM) {
+    return true;
+  } else if (srcChain === COMMON_CHAIN_SLUGS.ETHEREUM && destChain === 'polygon') {
+    return true;
+  }
+  return false;
+}
+export function _isPosChainL2Bridge(srcChain, destChain) {
+  if (srcChain === 'polygon_amoy' && destChain === COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+    return true;
+  } else if (srcChain === 'polygon' && destChain === COMMON_CHAIN_SLUGS.ETHEREUM) {
+    return true;
+  }
+  return false;
+}

package/services/chain-service/utils/patch.js

@@ -5,7 +5,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'https://chain-list-assets.subwallet.app' : 'https://dev.sw-chain-list-assets.pages.dev';
 const fetchFile = PRODUCTION_BRANCHES.indexOf(branchName) > -1 ? 'list.json' : 'preview.json';
-const ChainListVersion = '0.2.95'; // update this when build chainlist
+const ChainListVersion = '0.2.97'; // update this when build chainlist
 
 // todo: move this interface to chainlist
 

package/services/earning-service/constants/chains.d.ts

@@ -19,3 +19,4 @@ export declare const MaxEraRewardPointsEras = 14;
 export declare const ST_LIQUID_TOKEN_ABI: Record<string, any>;
 export declare const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
 export declare const MANTA_MIN_DELEGATION = 500;
+export declare const CHANNEL_ID = 7;

package/services/earning-service/constants/chains.js

@@ -25,4 +25,5 @@ export const MaxEraRewardPointsEras = 14;
 // eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-unsafe-assignment
 export const ST_LIQUID_TOKEN_ABI = require("./abis/st_liquid_token_abi.json");
 export const MANTA_VALIDATOR_POINTS_PER_BLOCK = 20;
-export const MANTA_MIN_DELEGATION = 500;
+export const MANTA_MIN_DELEGATION = 500;
+export const CHANNEL_ID = 7;

package/services/earning-service/handlers/liquid-staking/bifrost-manta.js

@@ -3,6 +3,7 @@
 
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _getAssetDecimals, _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
+import { CHANNEL_ID } from '@subwallet/extension-base/services/earning-service/constants';
 import { YieldStepType } from '@subwallet/extension-base/types';
 import BifrostLiquidStakingPoolHandler from "./bifrost.js";
 const STATS_URL = 'https://api.bifrost.app/api/site';
@@ -98,7 +99,7 @@ export default class BifrostMantaLiquidStakingPoolHandler extends BifrostLiquidS
     const substrateApi = await this.substrateApi.isReady;
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
-    const extrinsic = substrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), data.amount, undefined, undefined);
+    const extrinsic = substrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), data.amount, undefined, CHANNEL_ID);
     return {
       txChain: this.chain,
       extrinsicType: ExtrinsicType.MINT_VMANTA,

package/services/earning-service/handlers/liquid-staking/bifrost.js

@@ -4,7 +4,7 @@
 import { ChainType, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
 import { _STAKING_ERA_LENGTH_MAP } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getAssetDecimals, _getTokenOnChainInfo } from '@subwallet/extension-base/services/chain-service/utils';
-import { fakeAddress } from '@subwallet/extension-base/services/earning-service/constants';
+import { CHANNEL_ID, fakeAddress } from '@subwallet/extension-base/services/earning-service/constants';
 import { EarningStatus, UnstakingStatus, YieldStepType } from '@subwallet/extension-base/types';
 import { reformatAddress } from '@subwallet/extension-base/utils';
 import BigNumber from 'bignumber.js';
@@ -244,7 +244,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
     const defaultFeeTokenSlug = this.feeAssets[0];
     if (new BN(params.amount).gt(BN_ZERO)) {
-      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), params.amount, undefined, undefined).paymentInfo(fakeAddress);
+      const _mintFeeInfo = await poolOriginSubstrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), params.amount, undefined, CHANNEL_ID).paymentInfo(fakeAddress);
       const mintFeeInfo = _mintFeeInfo.toPrimitive();
       return {
         amount: mintFeeInfo.partialFee.toString(),
@@ -261,7 +261,7 @@ export default class BifrostLiquidStakingPoolHandler extends BaseLiquidStakingPo
     const substrateApi = await this.substrateApi.isReady;
     const inputTokenSlug = this.inputAsset;
     const inputTokenInfo = this.state.getAssetBySlug(inputTokenSlug);
-    const extrinsic = substrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), data.amount, undefined, undefined);
+    const extrinsic = substrateApi.api.tx.vtokenMinting.mint(_getTokenOnChainInfo(inputTokenInfo), data.amount, undefined, CHANNEL_ID);
     return {
       txChain: this.chain,
       extrinsicType: ExtrinsicType.MINT_VDOT,

package/services/inapp-notification-service/index.js

@@ -276,6 +276,7 @@ export class InappNotificationService {
       const {
         _id,
         amounts,
+        bridgeType,
         counter,
         destinationNetwork,
         originTokenAddress,
@@ -292,6 +293,7 @@ export class InappNotificationService {
         tokenSlug: token.slug,
         _id,
         amounts,
+        bridgeType,
         counter,
         destinationNetwork,
         originTokenAddress,

package/services/inapp-notification-service/interfaces.d.ts

@@ -59,15 +59,16 @@ export interface ClaimPolygonBridgeNotificationMetadata {
     tokenSlug: string;
     _id: string;
     amounts: string[];
-    counter: number;
+    bridgeType: string;
+    counter?: number;
     destinationNetwork: number;
-    originTokenAddress: string;
-    originTokenNetwork: number;
-    receiver: string;
-    sourceNetwork: number;
+    originTokenAddress?: string;
+    originTokenNetwork?: number;
+    receiver?: string;
+    sourceNetwork?: number;
     status: BridgeTransactionStatus;
     transactionHash: string;
-    transactionInitiator: string;
+    transactionInitiator?: string;
     userAddress: string;
 }
 export declare enum NotificationTimePeriod {

package/services/inapp-notification-service/utils/polygon.d.ts

@@ -6,7 +6,7 @@ export declare const POLYGON_BRIDGE_INDEXER: {
 export interface PolygonTransaction {
     _id: string;
     transactionIndex?: number;
-    sourceNetwork: number;
+    sourceNetwork?: number;
     destinationNetwork: number;
     blockNumber: number;
     amounts: string[];
@@ -20,16 +20,16 @@ export interface PolygonTransaction {
     userAddress: string;
     wrappedTokenAddress?: string;
     wrappedTokenNetwork?: number;
-    counter: number;
+    counter?: number;
     bridgeContractAddress?: string;
     eventInitiatorAddress?: string;
     globalExitRootManager?: string;
     leaf?: string;
     mainnetExitRoot?: string;
     metadata?: string;
-    originTokenAddress: string;
-    originTokenNetwork: number;
-    receiver: string;
+    originTokenAddress?: string;
+    originTokenNetwork?: number;
+    receiver?: string;
     refuel: boolean;
     rollUpExitRoot?: string;
     nonce?: any;
@@ -38,7 +38,7 @@ export interface PolygonTransaction {
     claimTransactionBlockNumber?: number;
     claimTransactionHash?: string;
     claimTransactionTimestamp?: string;
-    transactionInitiator: string;
+    transactionInitiator?: string;
 }
 interface PaginationData {
     hasNextPage: boolean;

package/services/inapp-notification-service/utils/polygon.js

@@ -18,7 +18,7 @@ export async function fetchPolygonBridgeTransactions(userAddress, isTestnet, pag
     pageSize: pageSize.toString(),
     page: page.toString()
   });
-  const networkIds = [0, 1];
+  const networkIds = [0, 1, -1];
   networkIds.forEach(networkId => {
     params.append('destinationNetworkIds', networkId.toString());
     params.append('sourceNetworkIds', networkId.toString());

package/services/keyring-service/context/handlers/Ledger.js

@@ -94,6 +94,7 @@ export class AccountLedgerHandler extends AccountBaseHandler {
         hardwareType,
         isEthereum,
         isGeneric,
+        isLedgerRecovery,
         name,
         originGenesisHash
       } = account;
@@ -104,7 +105,8 @@ export class AccountLedgerHandler extends AccountBaseHandler {
         addressOffset,
         genesisHash,
         originGenesisHash,
-        isGeneric
+        isGeneric,
+        isLedgerRecovery
       };
       const type = isEthereum ? 'ethereum' : 'sr25519';
       const pair = keyring.keyring.createFromAddress(address, {

package/services/swap-service/handler/chainflip-handler.js

@@ -362,7 +362,6 @@ export class ChainflipSwapHandler {
       }
     });
 
-    console.log('depositAddressResp', depositAddressResponse);
     const txData = {
       address,
       provider: this.providerInfo,

package/services/swap-service/handler/simpleswap-handler.d.ts

@@ -0,0 +1,24 @@
+import { SwapError } from '@subwallet/extension-base/background/errors/SwapError';
+import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
+import { BaseStepDetail, CommonOptimalPath, CommonStepFeeInfo, OptimalSwapPathParams, SwapEarlyValidation, SwapProviderId, SwapQuote, SwapRequest, SwapSubmitParams, SwapSubmitStepData, ValidateSwapProcessParams } from '@subwallet/extension-base/types';
+import { BalanceService } from '../../balance-service';
+import { ChainService } from '../../chain-service';
+import { SwapBaseInterface } from './base-handler';
+export declare const simpleSwapApiKey: string;
+export declare class SimpleSwapHandler implements SwapBaseInterface {
+    private swapBaseHandler;
+    providerSlug: SwapProviderId;
+    constructor(chainService: ChainService, balanceService: BalanceService);
+    validateSwapProcess(params: ValidateSwapProcessParams): Promise<TransactionError[]>;
+    get chainService(): ChainService;
+    get balanceService(): BalanceService;
+    get providerInfo(): import("@subwallet/extension-base/types").SwapProvider;
+    get name(): string;
+    get slug(): string;
+    getSwapQuote(request: SwapRequest): Promise<SwapQuote | SwapError>;
+    generateOptimalProcess(params: OptimalSwapPathParams): Promise<CommonOptimalPath>;
+    getSubmitStep(params: OptimalSwapPathParams): Promise<[BaseStepDetail, CommonStepFeeInfo] | undefined>;
+    validateSwapRequest(request: SwapRequest): Promise<SwapEarlyValidation>;
+    handleSwapProcess(params: SwapSubmitParams): Promise<SwapSubmitStepData>;
+    handleSubmitStep(params: SwapSubmitParams): Promise<SwapSubmitStepData>;
+}