@subwallet/extension-base 1.3.79-1 → 1.3.81-0

package/background/KoniTypes.d.ts

@@ -204,6 +204,11 @@ export interface NftItem extends NftItemExtraInfo {
     rarity?: string;
     description?: string;
     properties?: Record<any, any> | null;
+    isBundle?: boolean;
+    nestingLevel?: number;
+    nestingTokens?: NftItem[];
+    parent?: NftItem;
+    parentId?: string;
 }
 interface NftItemExtraInfo {
     type?: _AssetType.ERC721 | _AssetType.PSP34 | RMRK_VER;
@@ -817,9 +822,15 @@ export interface NftTransactionRequest extends BaseRequestSign {
     nftItem: NftItem;
 }
 export interface NftFullListRequest {
-    contractAddress: string;
+    collectionId: string;
     owners: string[];
     chainInfo: _ChainInfo;
+    tokenIds?: string[];
+}
+export interface NftDetailRequest {
+    collectionId: string;
+    chainSlug: string;
+    tokenId: string;
 }
 export interface EvmNftTransaction extends ValidateTransactionResponse {
     tx: Record<string, any> | null;
@@ -1875,11 +1886,10 @@ export interface KoniRequestSignatures {
     'pri(evmNft.getTransaction)': [NftTransactionRequest, EvmNftTransaction];
     'pri(substrateNft.submitTransaction)': [NftTransactionRequest, SWTransactionResponse];
     'pri(substrateNft.getTransaction)': [NftTransactionRequest, SubstrateNftTransaction];
-    'pri(nft.getNft)': [null, NftJson];
     'pri(nft.getSubscription)': [RequestSubscribeNft, NftJson, NftJson];
-    'pri(nftCollection.getNftCollection)': [null, NftCollectionJson];
     'pri(nftCollection.getSubscription)': [null, NftCollection[], NftCollection[]];
     'pri(nft.getFullList)': [NftFullListRequest, boolean];
+    'pri(nft.getNftdetail)': [NftDetailRequest, NftItem];
     'pri(staking.getStaking)': [null, StakingJson];
     'pri(staking.getSubscription)': [RequestSubscribeStaking, StakingJson, StakingJson];
     'pri(stakingReward.getStakingReward)': [null, StakingRewardJson];

package/cjs/core/substrate/system-pallet.js

@@ -54,6 +54,9 @@ function _getAppliedExistentialDeposit(accountInfo, existentialDeposit, strictMo
   if (strictMode) {
     return bnExistentialDeposit;
   }
+  if (accountInfo.data.free.toString() === existentialDeposit) {
+    return BigInt(0);
+  }
   return _canAccountBeReaped(accountInfo) ? BigInt(0) : bnExistentialDeposit; // account for ED here will go better with max transfer logic
 }
 function _getSystemPalletTransferableV2(accountInfo, existentialDeposit, strictMode) {

package/cjs/core/substrate/xcm-parser.js

@@ -49,7 +49,7 @@ 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?';
 }
 function getPolygonBridgeWarning(originChainInfo) {
-  if (originChainInfo.slug === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM || originChainInfo.slug === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+  if (originChainInfo.slug === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
     return 'Cross-chain transfer of this token may take up to 40 minutes. Do you still want to continue?';
   } else {
     return 'Cross-chain transfer of this token may take up to 3 hours, and you’ll need to manually claim the funds on the destination network to complete the transfer. Do you still want to continue?';

package/cjs/koni/api/contract-handler/utils/index.js

@@ -79,13 +79,10 @@ function getAvailBridgeGatewayContract(chain) {
 function isAvailBridgeGatewayContract(contractAddress) {
   return [AVAILBRIDGE_GATEWAY_ETHEREUM_CONTRACT_ADDRESS, AVAILBRIDGE_GATEWAY_SEPOLIA_CONTRACT_ADDRESS].includes(contractAddress);
 }
-const POLYGONBRIDGE_GATEWAY_ETHEREUM_CONTRACT_ADDRESS = '0x2a3DD3EB832aF982ec71669E178424b10Dca2EDe';
 const POLYGONBRIDGE_GATEWAY_SEPOLIA_CONTRACT_ADDRESS = '0x528e26b25a34a4A5d0dbDa1d57D318153d2ED582';
 function getPolygonBridgeContract(chain) {
   if (chain === 'polygonzkEvm_cardona' || chain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
     return POLYGONBRIDGE_GATEWAY_SEPOLIA_CONTRACT_ADDRESS;
-  } else if (chain === 'polygonZkEvm' || chain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM) {
-    return POLYGONBRIDGE_GATEWAY_ETHEREUM_CONTRACT_ADDRESS;
   }
   throw new Error('Invalid chain');
 }

package/cjs/koni/api/nft/index.js

@@ -40,8 +40,6 @@ function createSubstrateNftApi(chain, substrateApi, addresses) {
     return [new _assethub_unique.default(substrateApi, substrateAddresses, chain), new _assethub_nft.default(substrateApi, substrateAddresses, chain)];
   } else if (_constants._NFT_CHAIN_GROUP.statemint.includes(chain)) {
     return [new _assethub_unique.default(substrateApi, substrateAddresses, chain), new _assethub_nft.default(substrateApi, substrateAddresses, chain)];
-  } else if (_constants._NFT_CHAIN_GROUP.unique_network.includes(chain)) {
-    return [new _unique_network_nft.UniqueNftApi(chain, substrateAddresses)];
   } else if (_constants._NFT_CHAIN_GROUP.unique_evm.includes(chain)) {
     return [new _unique_network_nft.UniqueNftApi(chain, evmAddresses)];
   } else if (_constants._NFT_CHAIN_GROUP.bitcountry.includes(chain)) {
@@ -63,10 +61,6 @@ function createWasmNftApi(chain, apiProps, addresses) {
   const substrateAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.SUBSTRATE]);
   return new _wasm_nft.WasmNftApi(apiProps, substrateAddresses, chain);
 }
-function createWeb3NftApi(chain, evmApi, addresses) {
-  const evmAddresses = (0, _utils2.getAddressesByChainType)(addresses, [_KoniTypes.ChainType.EVM]);
-  return new _evm_nft.EvmNftApi(evmApi, evmAddresses, chain);
-}
 const createOrdinalApi = (chain, subscanChain, addresses) => {
   return new _ordinal_nft.default(addresses, chain, subscanChain);
 };
@@ -136,14 +130,6 @@ class NftHandler {
               }
             }
           }
-          if ((0, _utils._isChainSupportEvmNft)(chainInfo)) {
-            if (this.evmApiMap[chain]) {
-              const handler = createWeb3NftApi(chain, this.evmApiMap[chain], evmAddresses);
-              if (handler) {
-                this.handlers.push(handler);
-              }
-            }
-          }
           if (chain === 'unique_evm') {
             const handlers = createSubstrateNftApi(chain, null, evmAddresses);
             if (handlers && !!handlers.length) {

package/cjs/koni/background/cron.js

@@ -98,7 +98,6 @@ class KoniCron {
       // NFT
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
-      (commonReload || needUpdateNft) && this.removeCron('detectNft');
       commonReload && this.removeCron('refreshPoolingStakingReward');
       if (mktCampaignNeedReload) {
         this.removeCron('fetchMktCampaignData');
@@ -114,7 +113,6 @@ class KoniCron {
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron jobs if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-        (commonReload || needUpdateNft) && this.addCron('detectNft', this.detectEvmCollectionNft(address), _constants.CRON_NFT_DETECT_INTERVAL);
         reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
       }
     };
@@ -127,8 +125,6 @@ class KoniCron {
     if (Object.keys(this.state.getSubstrateApiMap()).length !== 0 || Object.keys(this.state.getEvmApiMap()).length !== 0) {
       this.resetNft(currentAccountInfo.proxyId);
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.proxyId, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-      this.addCron('detectNft', this.detectEvmCollectionNft(currentAccountInfo.proxyId), _constants.CRON_NFT_DETECT_INTERVAL);
-      // this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('syncMantaPay', this.syncMantaPay, _constants.CRON_SYNC_MANTA_PAY);
     }
     this.status = 'running';
@@ -177,25 +173,12 @@ class KoniCron {
   checkNetworkAvailable = serviceInfo => {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };
-  detectEvmCollectionNft = address => {
-    return () => {
-      let addresses = [];
-      addresses = this.state.keyringService.context.getDecodedAddresses();
-      if (!addresses.length) {
-        console.warn('[Cron] No decoded addresses found for ALL_ACCOUNT_KEY');
-        return;
-      }
-      this.state.nftDetectionService.fetchEvmCollectionsWithPreview(addresses).catch(err => console.warn(`[Cron] NFT detection failed for ${address}:`, err));
-    };
-  };
   async reloadNft() {
     const address = this.state.keyringService.context.currentAccount.proxyId;
     const serviceInfo = this.state.getServiceInfo();
     this.resetNft(address);
     this.removeCron('refreshNft');
-    this.removeCron('detectNft');
     this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), _constants.CRON_REFRESH_NFT_INTERVAL);
-    this.addCron('detectNft', this.detectEvmCollectionNft(address), _constants.CRON_NFT_DETECT_INTERVAL);
     await (0, _utils2.waitTimeout)(1800);
     return true;
   }

package/cjs/koni/background/handlers/Extension.js

@@ -8,6 +8,7 @@ exports.default = void 0;
 exports.isJsonPayload = isJsonPayload;
 var _common = require("@ethereumjs/common");
 var _tx = require("@ethereumjs/tx");
+var _chainList = require("@subwallet/chain-list");
 var _types = require("@subwallet/chain-list/types");
 var _TransactionError = require("@subwallet/extension-base/background/errors/TransactionError");
 var _helpers = require("@subwallet/extension-base/background/handlers/helpers");
@@ -1198,7 +1199,10 @@ class KoniExtension {
     return this.getNft();
   }
   async handleGetNftFullList(request) {
-    return this.#koniState.nftDetectionService.getFullNftInstancesByCollection(request);
+    return this.#koniState.nftService.fetchFullListNftOfACollection(request);
+  }
+  async handleGetNftDetail(request) {
+    return this.#koniState.nftService.fetchNftDetail(request);
   }
   getStakingReward() {
     return new Promise((resolve, reject) => {
@@ -5258,6 +5262,9 @@ class KoniExtension {
     });
   }
   async getIsClaimedPolygonBridge(data) {
+    if (data.chainslug !== _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+      throw new Error('Polygon zkEVM Mainnet Beta has sunset. Please use Polygon official Ethereum claim flow.');
+    }
     const evmApi = this.#koniState.getEvmApi(data.chainslug);
     // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const isClaimed = await (0, _polygonBridge.isClaimedPolygonBridge)(data.chainslug, data.counter, data.sourceNetwork, evmApi);
@@ -5271,12 +5278,15 @@ class KoniExtension {
     } = data;
     const extrinsicType = _KoniTypes.ExtrinsicType.CLAIM_BRIDGE;
     let transaction = null;
-    const evmApi = this.#koniState.getEvmApi(chain);
     const metadata = notification.metadata;
+    if (metadata.bridgeType !== 'POS' && chain !== _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
+      throw new Error('Polygon zkEVM Mainnet Beta has sunset. Please use Polygon official Ethereum claim flow.');
+    }
+    const evmApi = this.#koniState.getEvmApi(chain);
     const feeInfo = await this.#koniState.feeService.subscribeChainFee((0, _getId.getId)(), chain, 'evm');
     if (metadata.bridgeType === 'POS') {
       transaction = await (0, _posBridge.getClaimPosBridge)(chain, notification, evmApi, feeInfo);
-    } else {
+    } else if (chain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA) {
       transaction = await (0, _polygonBridge.getClaimPolygonBridge)(chain, notification, evmApi, feeInfo);
     }
     const chainType = _KoniTypes.ChainType.EVM;
@@ -5758,16 +5768,14 @@ class KoniExtension {
         return this.getCrowdloanContributions(request);
       case 'pri(crowdloan.getSubscription)':
         return this.subscribeCrowdloan(id, port);
-      case 'pri(nft.getNft)':
-        return await this.getNft();
       case 'pri(nft.getSubscription)':
         return await this.subscribeNft(id, port);
-      case 'pri(nftCollection.getNftCollection)':
-        return await this.getNftCollection();
       case 'pri(nftCollection.getSubscription)':
         return await this.subscribeNftCollection(id, port);
       case 'pri(nft.getFullList)':
         return await this.handleGetNftFullList(request);
+      case 'pri(nft.getNftdetail)':
+        return await this.handleGetNftDetail(request);
       case 'pri(staking.getStaking)':
         return this.getStaking();
       case 'pri(staking.getSubscription)':

package/cjs/koni/background/handlers/State.js

@@ -33,7 +33,7 @@ var _migrationService = _interopRequireDefault(require("@subwallet/extension-bas
 var _mintCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mint-campaign-service"));
 var _mktCampaignService = _interopRequireDefault(require("@subwallet/extension-base/services/mkt-campaign-service"));
 var _multisigService = require("@subwallet/extension-base/services/multisig-service");
-var _nftService = _interopRequireDefault(require("@subwallet/extension-base/services/nft-service"));
+var _nftService = require("@subwallet/extension-base/services/nft-service");
 var _NotificationService = _interopRequireDefault(require("@subwallet/extension-base/services/notification-service/NotificationService"));
 var _openGov = _interopRequireDefault(require("@subwallet/extension-base/services/open-gov"));
 var _priceService = require("@subwallet/extension-base/services/price-service");
@@ -86,6 +86,12 @@ class KoniState {
   externalRequest = {};
   crowdloanMap = generateDefaultCrowdloanMap();
   crowdloanSubject = new _rxjs.Subject();
+
+  /**
+   * TODO: Remove this subject once NFT migration to the service layer is completed.
+   * The state manager should not handle the internal state of the NFT service.
+   * The NFT service will manage its own state independently.
+   */
   nftSubject = new _rxjs.Subject();
   mantaPayConfigSubject = new _rxjs.Subject();
   isMantaPayEnabled = false;
@@ -123,13 +129,13 @@ class KoniState {
     this.requestService = new _requestService.default(this.chainService, this.settingService, this.keyringService, this.transactionService);
     this.priceService = new _priceService.PriceService(this.dbService, this.eventService, this.chainService);
     this.balanceService = new _balanceService.BalanceService(this);
+    this.nftService = new _nftService.NftService(this);
     this.historyService = new _historyService.HistoryService(this.dbService, this.chainService, this.eventService, this.keyringService, this.subscanService);
     this.mintCampaignService = new _mintCampaignService.default(this);
     this.walletConnectService = new _walletConnectService.default(this, this.requestService);
     this.migrationService = new _migrationService.default(this, this.eventService);
     this.campaignService = new _campaignService.default(this);
     this.mktCampaignService = new _mktCampaignService.default(this);
-    this.nftDetectionService = new _nftService.default(this);
     this.buyService = new _buyService.default(this);
     this.earningService = new _service.default(this);
     this.swapService = new _swapService.SwapService(this);
@@ -241,6 +247,7 @@ class KoniState {
     this.mktCampaignService.init();
     this.eventService.emit('chain.ready', true);
     await this.balanceService.init();
+    await this.nftService.init();
     await this.earningService.init();
     await this.swapService.init();
     await this.inappNotificationService.init();
@@ -398,6 +405,7 @@ class KoniState {
     return this.dbService.getAllNftCollection(this.activeChainSlugs);
   }
   subscribeNftCollection() {
+    // TODO: Move this logic to the NFT service once migration is complete.
     const getChains = () => this.activeChainSlugs;
     return this.dbService.stores.nftCollection.subscribeNftCollection(getChains);
   }
@@ -1799,7 +1807,7 @@ class KoniState {
     this.campaignService.stop();
     await Promise.all([this.cron.stop(), this.subscription.stop()]);
     await this.pauseAllNetworks(undefined, 'IDLE mode');
-    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.earningService.stop(), this.swapService.stop(), this.inappNotificationService.stop(), this.openGovService.stop(), this.multisigService.stop()]);
+    await Promise.all([this.historyService.stop(), this.priceService.stop(), this.balanceService.stop(), this.nftService.stop(), this.earningService.stop(), this.swapService.stop(), this.inappNotificationService.stop(), this.openGovService.stop(), this.multisigService.stop()]);
 
     // Complete sleeping
     sleeping.resolve();
@@ -1855,7 +1863,7 @@ class KoniState {
     this.generalStatus = _types.ServiceStatus.STARTING_FULL;
     const startingFull = (0, _promise.createPromiseHandler)();
     this.waitStartingFull = startingFull.promise;
-    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.earningService.start(), this.swapService.start(), this.inappNotificationService.start(), this.openGovService.start(), this.multisigService.start()]);
+    await Promise.all([this.cron.start(), this.subscription.start(), this.historyService.start(), this.priceService.start(), this.balanceService.start(), this.nftService.start(), this.earningService.start(), this.swapService.start(), this.inappNotificationService.start(), this.openGovService.start(), this.multisigService.start()]);
     this.eventService.emit('general.start_full', true);
     this.waitStartingFull = null;
     this.generalStatus = _types.ServiceStatus.STARTED_FULL;
@@ -1917,9 +1925,19 @@ class KoniState {
     });
   }
   async reloadNft() {
-    const currentAddress = this.keyringService.context.currentAccount.proxyId;
+    const currentProxyId = this.keyringService.context.currentAccount.proxyId;
+    const currentAddress = this.keyringService.context.addressesByProxyId(currentProxyId);
     await this.dbService.removeNftsByAddress(currentAddress);
-    return await this.cron.reloadNft();
+    await this.cron.reloadNft();
+    await this.reloadNftV2();
+    return true;
+  }
+  async reloadNftV2() {
+    // TODO: Recheck: Uncomment this block when migration is complete
+    // const currentAddress = this.keyringService.context.currentAccount.proxyId;
+    //
+    // await this.dbService.removeNftsByAddress(currentAddress);
+    await this.nftService.forceReload();
   }
   async reloadStaking() {
     await this.earningService.reloadEarning(true);

package/cjs/packageInfo.js

@@ -13,6 +13,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '1.3.79-1'
+  version: '1.3.81-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/services/balance-service/helpers/process.js

@@ -1,5 +1,6 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -7,7 +8,11 @@ exports.getAcrossbridgeTransferProcessFromEvm = getAcrossbridgeTransferProcessFr
 exports.getDefaultTransferProcess = getDefaultTransferProcess;
 exports.getSnowbridgeTransferProcessFromEvm = getSnowbridgeTransferProcessFromEvm;
 var _chainList = require("@subwallet/chain-list");
+var _web = require("@subwallet/extension-base/koni/api/contract-handler/evm/web3");
+var _utils = require("@subwallet/extension-base/koni/api/contract-handler/utils");
+var _utils2 = require("@subwallet/extension-base/services/chain-service/utils");
 var _serviceBase = require("@subwallet/extension-base/types/service-base");
+var _bignumber = _interopRequireDefault(require("bignumber.js"));
 // Copyright 2019-2022 @subwallet/extension-base
 // SPDX-License-Identifier: Apache-2.0
 
@@ -30,18 +35,25 @@ async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, a
     totalFee: [_serviceBase.MOCK_STEP_FEE],
     steps: [_serviceBase.DEFAULT_FIRST_STEP]
   };
-  // const allowance = await getERC20Allowance(getSnowBridgeGatewayContract(evmApi.chainSlug), address, _getContractAddressOfToken(tokenInfo), evmApi);
-
-  result.steps.push({
-    // always approve spending because sometimes allowance check fails
-    id: result.steps.length,
-    type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
-    name: 'Approve spending'
-  });
-  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
-  // if (!allowance || BigInt(allowance) < BigInt(amount)) {
-  // }
-
+  try {
+    const allowance = await (0, _web.getERC20Allowance)((0, _utils.getSnowBridgeGatewayContract)(evmApi.chainSlug), address, (0, _utils2._getContractAddressOfToken)(tokenInfo), evmApi);
+    if (!allowance || new _bignumber.default(allowance).lt(amount)) {
+      result.steps.push({
+        id: result.steps.length,
+        type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+        name: 'Approve spending'
+      });
+      result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+    }
+  } catch (e) {
+    console.error(e);
+    result.steps.push({
+      id: result.steps.length,
+      type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+      name: 'Approve spending'
+    });
+    result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  }
   result.steps.push({
     id: result.steps.length,
     type: _serviceBase.CommonStepType.TRANSFER,
@@ -50,20 +62,36 @@ async function getSnowbridgeTransferProcessFromEvm(address, evmApi, tokenInfo, a
   result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
   return Promise.resolve(result);
 }
-async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress) {
+async function getAcrossbridgeTransferProcessFromEvm(SpokePoolAddress, address, tokenInfo, evmApi, amount) {
   const result = {
     totalFee: [_serviceBase.MOCK_STEP_FEE],
     steps: [_serviceBase.DEFAULT_FIRST_STEP]
   };
-  result.steps.push({
-    id: result.steps.length,
-    type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
-    name: 'Approve spending',
-    metadata: {
-      SpokePoolAddress
+  try {
+    const allowance = await (0, _web.getERC20Allowance)(SpokePoolAddress, address, (0, _utils2._getContractAddressOfToken)(tokenInfo), evmApi);
+    if (!allowance || new _bignumber.default(allowance).lt(amount)) {
+      result.steps.push({
+        id: result.steps.length,
+        type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+        name: 'Approve spending',
+        metadata: {
+          SpokePoolAddress
+        }
+      });
+      result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
     }
-  });
-  result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  } catch (e) {
+    console.error(e);
+    result.steps.push({
+      id: result.steps.length,
+      type: _serviceBase.CommonStepType.TOKEN_APPROVAL,
+      name: 'Approve spending',
+      metadata: {
+        SpokePoolAddress
+      }
+    });
+    result.totalFee.push(_serviceBase.MOCK_STEP_FEE);
+  }
   result.steps.push({
     id: result.steps.length,
     type: _serviceBase.CommonStepType.TRANSFER,

package/cjs/services/balance-service/index.js

@@ -627,10 +627,10 @@ class BalanceService {
       return (0, _process.getDefaultTransferProcess)();
     }
     const destChainInfo = this.state.chainService.getChainInfoByKey(params.destChain);
+    const evmApi = this.state.chainService.getEvmApi(originChainInfo.slug);
 
     // xcm
     if (!(0, _xcmParser._isXcmWithinSameConsensus)(originChainInfo, destChainInfo) && (0, _utils._isPureEvmChain)(originChainInfo)) {
-      const evmApi = this.state.chainService.getEvmApi(originChainInfo.slug);
       const tokenInfo = this.state.chainService.getAssetBySlug(params.tokenSlug);
       return (0, _process.getSnowbridgeTransferProcessFromEvm)(params.address, evmApi, tokenInfo, params.amount);
     }
@@ -658,7 +658,7 @@ class BalanceService {
         if (!data) {
           throw new Error('Failed to fetch Across Bridge Data. Please try again later');
         }
-        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(data.to);
+        return (0, _process.getAcrossbridgeTransferProcessFromEvm)(data.to, params.address, originTokenInfo, evmApi, params.amount);
       }
     }
     return (0, _process.getDefaultTransferProcess)();

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

@@ -100,7 +100,7 @@ const createPolygonBridgeExtrinsic = async _ref4 => {
     throw Error('Sender is required');
   }
   const sourceChain = originChain.slug;
-  const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' || sourceChain === 'polygonZkEvm' ? _polygonBridge._createPolygonBridgeL2toL1Extrinsic : _polygonBridge._createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _posBridge._createPosBridgeL2toL1Extrinsic : _posBridge._createPosBridgeL1toL2Extrinsic;
+  const createExtrinsic = isPolygonBridgeXcm ? sourceChain === 'polygonzkEvm_cardona' ? _polygonBridge._createPolygonBridgeL2toL1Extrinsic : _polygonBridge._createPolygonBridgeL1toL2Extrinsic : sourceChain === 'polygon_amoy' || sourceChain === 'polygon' ? _posBridge._createPosBridgeL2toL1Extrinsic : _posBridge._createPosBridgeL1toL2Extrinsic;
   return createExtrinsic(originTokenInfo, originChain, sender, recipient, sendingValue, evmApi, feeInfo, feeCustom, feeOption);
 };
 exports.createPolygonBridgeExtrinsic = createPolygonBridgeExtrinsic;

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

@@ -18,12 +18,10 @@ var _utils3 = require("@subwallet/extension-base/utils");
 // SPDX-License-Identifier: Apache-2.0
 
 const POLYGON_PROOF_INDEXER = {
-  MAINNET: 'https://api-gateway.polygon.technology/api/v3/proof/mainnet/merkle-proof',
   TESTNET: 'https://api-gateway.polygon.technology/api/v3/proof/testnet/merkle-proof'
 };
 exports.POLYGON_PROOF_INDEXER = POLYGON_PROOF_INDEXER;
 const POLYGON_GAS_INDEXER = {
-  MAINNET: 'https://gasstation.polygon.technology/zkevm',
   TESTNET: 'https://gasstation.polygon.technology/zkevm/cardona'
 };
 exports.POLYGON_GAS_INDEXER = POLYGON_GAS_INDEXER;
@@ -63,8 +61,7 @@ async function getClaimPolygonBridge(chainSlug, notification, evmApi, feeInfo) {
   const polygonBridgeContractAddress = (0, _utils.getPolygonBridgeContract)(chainSlug);
   const polygonBridgeContract = (0, _web.getWeb3Contract)(polygonBridgeContractAddress, evmApi, _utils._POLYGON_BRIDGE_ABI);
   const metadata = notification.metadata;
-  const isTestnet = chainSlug === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA;
-  const proofDomain = isTestnet ? POLYGON_PROOF_INDEXER.TESTNET : POLYGON_PROOF_INDEXER.MAINNET;
+  const proofDomain = POLYGON_PROOF_INDEXER.TESTNET;
   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;
 
@@ -95,10 +92,6 @@ function _isPolygonChainBridge(srcChain, destChain) {
     return true;
   } else if (srcChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM_SEPOLIA && destChain === 'polygonzkEvm_cardona') {
     return true;
-  } else if (srcChain === 'polygonZkEvm' && destChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM) {
-    return true;
-  } else if (srcChain === _chainList.COMMON_CHAIN_SLUGS.ETHEREUM && destChain === 'polygonZkEvm') {
-    return true;
   }
   return false;
 }

package/cjs/services/chain-service/constants.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.USE_MULTILOCATION_INDEX = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
+exports._ZK_ASSET_PREFIX = exports._TRANSFER_CHAIN_GROUP = exports._SUBSTRATE_DEFAULT_INFLATION_PARAMS = exports._STAKING_ERA_LENGTH_MAP = exports._PURE_EVM_CHAINS = exports._PREDEFINED_SINGLE_MODES = exports._PARACHAIN_INFLATION_DISTRIBUTION = exports._NFT_CHAIN_GROUP = exports._MANTA_ZK_CHAIN_GROUP = exports._KNOWN_CHAIN_INFLATION_PARAMS = exports._GOVERNANCE_CHAIN_GROUP = exports._EXPECTED_BLOCK_TIME = exports._DEFAULT_MANTA_ZK_CHAIN = exports._DEFAULT_ACTIVE_CHAINS = exports._BTC_SERVICE_TOKEN = exports._BITCOIN_TESTNET_NAME = exports._BITCOIN_TESTNET_CHAIN_SLUG = exports._BITCOIN_NAME = exports._BITCOIN_CHAIN_SLUG = exports._BALANCE_LOCKED_ID_GROUP = exports._BALANCE_CHAIN_GROUP = exports._API_OPTIONS_CHAIN_GROUP = exports.USE_MULTILOCATION_INDEX = exports.NFT_CHAIN_GROUPS_MIGRATED = exports.LATEST_CHAIN_DATA_FETCHING_INTERVAL = exports.EVM_REFORMAT_DECIMALS = exports.EVM_PASS_CONNECT_STATUS = exports.API_CONNECT_TIMEOUT = exports.API_AUTO_CONNECT_MS = void 0;
 var _chainList = require("@subwallet/chain-list");
 var _KoniTypes = require("@subwallet/extension-base/background/KoniTypes");
 // Copyright 2019-2022 @subwallet/extension-base
@@ -80,9 +80,13 @@ const _NFT_CHAIN_GROUP = {
   rari: ['rari'],
   story_odyssey: ['storyOdyssey', 'storyOdyssey_testnet']
 };
+exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
+const NFT_CHAIN_GROUPS_MIGRATED = {
+  unique_network: ['unique_network']
+};
 
 // Staking--------------------------------------------------------------------------------------------------------------
-exports._NFT_CHAIN_GROUP = _NFT_CHAIN_GROUP;
+exports.NFT_CHAIN_GROUPS_MIGRATED = NFT_CHAIN_GROUPS_MIGRATED;
 const _STAKING_ERA_LENGTH_MAP = {
   // in hours
   alephTest: 24,

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

@@ -12,7 +12,7 @@ const PRODUCTION_BRANCHES = ['master', 'webapp', 'webapp-dev'];
 const branchName = process.env.BRANCH_NAME || 'subwallet-dev';
 const fetchDomain = process.env.PATCH_CHAIN_LIST_URL || (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.127'; // update this when build chain-list
+const ChainListVersion = '0.2.128'; // update this when build chain-list
 
 // todo: move this interface to chainlist
 exports.ChainListVersion = ChainListVersion;

package/cjs/services/earning-service/handlers/special.js

@@ -473,6 +473,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const originChainInfo = this.state.getChainInfo(originTokenInfo.originChain);
     const originTokenSlug = (0, _utils3._getChainNativeTokenSlug)(originChainInfo);
     const substrateApi = this.state.getSubstrateApi(originChainInfo.slug);
+    const fromAddress = (0, _utils4._reformatAddressWithChain)(address, originChainInfo);
     const id = (0, _getId.getId)();
     const feeInfo = await this.state.feeService.subscribeChainFee(id, originChainInfo.slug, 'substrate');
     const xcmRequest = {
@@ -481,7 +482,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
       recipient: address,
       sendingValue,
       substrateApi,
-      sender: address,
+      sender: fromAddress,
       originChain: originChainInfo,
       destinationChain: this.chainInfo,
       feeInfo
@@ -493,7 +494,7 @@ class BaseSpecialStakingPoolHandler extends _base.default {
     const xcmData = {
       originNetworkKey: originChainInfo.slug,
       destinationNetworkKey: destinationTokenInfo.originChain,
-      from: address,
+      from: fromAddress,
       to: address,
       value: sendingValue,
       tokenSlug: originTokenSlug,

package/cjs/services/fee-service/utils/index.js

@@ -139,10 +139,8 @@ const calculateGasFeeParams = async function (web3, networkKey) {
     } catch (e) {}
   }
   try {
-    if (networkKey === 'polygonzkEvm_cardona' || networkKey === 'polygonZkEvm') {
-      const isTestnet = networkKey === 'polygonzkEvm_cardona';
-      const gasDomain = isTestnet ? _polygonBridge.POLYGON_GAS_INDEXER.TESTNET : _polygonBridge.POLYGON_GAS_INDEXER.MAINNET;
-      const gasResponse = await fetch(`${gasDomain}`).then(res => res.json());
+    if (networkKey === 'polygonzkEvm_cardona') {
+      const gasResponse = await fetch(`${_polygonBridge.POLYGON_GAS_INDEXER.TESTNET}`).then(res => res.json());
       const gasPriceInWei = gasResponse.standard * 1e9 + 200000;
       return {
         type: 'evm',

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

@@ -22,6 +22,9 @@ function getPolygonBridgeClaimDescription(amount, symbol) {
 }
 /* Description */
 
+function getPolygonBridgeNetworkIds(isTestnet) {
+  return isTestnet ? [0, 1, -1] : [0, -1];
+}
 async function fetchPolygonBridgeTransactions(userAddress, isTestnet) {
   let pageSize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 500;
   let page = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 0;
@@ -30,7 +33,7 @@ async function fetchPolygonBridgeTransactions(userAddress, isTestnet) {
     pageSize: pageSize.toString(),
     page: page.toString()
   });
-  const networkIds = [0, 1, -1];
+  const networkIds = getPolygonBridgeNetworkIds(isTestnet);
   networkIds.forEach(networkId => {
     params.append('destinationNetworkIds', networkId.toString());
     params.append('sourceNetworkIds', networkId.toString());