@subwallet/extension-base 1.0.13-0 → 1.1.1-dev.0

package/cjs/utils/lazy.js

@@ -0,0 +1,52 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.addLazy = addLazy;
+exports.removeLazy = removeLazy;
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+const lazyMap = {};
+function removeLazy(key) {
+  if (lazyMap[key]) {
+    clearTimeout(lazyMap[key].timeout);
+    delete lazyMap[key];
+  }
+}
+
+// Add or update new lazy thread
+function addLazy(key, callback) {
+  let lazyTime = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 300;
+  let maxLazyTime = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 3000;
+  const existed = lazyMap[key];
+  const now = new Date().getTime();
+  if (existed) {
+    clearTimeout(existed.timeout);
+    lazyMap[key] = {
+      ...existed,
+      callback
+    };
+
+    // Fire callback if last fire is too long
+    if (now - existed.lastFire >= maxLazyTime) {
+      callback();
+      lazyMap[key].lastFire = now;
+    } else {
+      lazyMap[key].timeout = setTimeout(() => {
+        // This will be fire in the last call of lazy thread
+        callback();
+        lazyMap[key].lastFire = new Date().getTime();
+        removeLazy(key);
+      }, lazyTime);
+    }
+  } else {
+    // Fire callback immediately in the first time
+    callback();
+    lazyMap[key] = {
+      callback,
+      lastFire: now
+    };
+  }
+}

package/constants/index.d.ts

@@ -12,6 +12,8 @@ export declare const CRON_GET_API_MAP_STATUS = 10000;
 export declare const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
 export declare const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export declare const CRON_RECOVER_HISTORY_INTERVAL = 30000;
+export declare const CRON_SYNC_MANTA_PAY = 300000;
+export declare const MANTA_PAY_BALANCE_INTERVAL = 30000;
 export declare const ALL_ACCOUNT_KEY = "ALL";
 export declare const ALL_NETWORK_KEY = "all";
 export declare const ALL_GENESIS_HASH: null;

package/constants/index.js

@@ -15,6 +15,8 @@ export const CRON_GET_API_MAP_STATUS = 10000;
 export const CRON_REFRESH_CHAIN_STAKING_METADATA = 900000;
 export const CRON_REFRESH_CHAIN_NOMINATOR_METADATA = 1800000;
 export const CRON_RECOVER_HISTORY_INTERVAL = 30000;
+export const CRON_SYNC_MANTA_PAY = 300000;
+export const MANTA_PAY_BALANCE_INTERVAL = 30000;
 export const ALL_ACCOUNT_KEY = 'ALL';
 export const ALL_NETWORK_KEY = 'all';
 export const ALL_GENESIS_HASH = null;

package/defaults.d.ts

@@ -1,4 +1,4 @@
-declare const ALLOWED_PATH: readonly ["/", "/settings/security", "/accounts/connect-ledger", "/accounts/restore-json", "/accounts/new-seed-phrase"];
+declare const ALLOWED_PATH: readonly ["/", "/settings/security", "/accounts/connect-ledger", "/accounts/restore-json", "/accounts/detail", "/accounts/new-seed-phrase"];
 declare const PHISHING_PAGE_REDIRECT = "/phishing-page-detected";
 declare const EXTENSION_PREFIX: string;
 declare const PORT_MOBILE: string;

package/defaults.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @polkadot/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const ALLOWED_PATH = ['/', '/settings/security', '/accounts/connect-ledger', '/accounts/restore-json', '/accounts/new-seed-phrase'];
+const ALLOWED_PATH = ['/', '/settings/security', '/accounts/connect-ledger', '/accounts/restore-json', '/accounts/detail', '/accounts/new-seed-phrase'];
 const PHISHING_PAGE_REDIRECT = '/phishing-page-detected';
 const EXTENSION_PREFIX = process.env.EXTENSION_PREFIX || '';
 const PORT_MOBILE = `${EXTENSION_PREFIX}mobile`;

package/koni/api/dotsama/balance.js

@@ -9,7 +9,7 @@ import { getERC20Contract } from '@subwallet/extension-base/koni/api/tokens/evm/
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { state } from '@subwallet/extension-base/koni/background/handlers';
-import { _BALANCE_CHAIN_GROUP, _PURE_EVM_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _BALANCE_CHAIN_GROUP, _MANTA_ZK_CHAIN_GROUP, _PURE_EVM_CHAINS, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _checkSmartContractSupportByChain, _getChainNativeTokenSlug, _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isPureEvmChain, _isSubstrateRelayChain } from '@subwallet/extension-base/services/chain-service/utils';
 import { categoryAddresses, sumBN } from '@subwallet/extension-base/utils';
 import BigN from 'bignumber.js';
@@ -324,6 +324,11 @@ async function subscribeTokensAccountsPallet(addresses, chain, api, callBack, in
 }
 async function subscribeAssetsAccountPallet(addresses, chain, api, callBack) {
   const tokenMap = state.getAssetByChainAndAsset(chain, [_AssetType.LOCAL]);
+  Object.values(tokenMap).forEach(token => {
+    if (_MANTA_ZK_CHAIN_GROUP.includes(token.originChain) && token.symbol.startsWith(_ZK_ASSET_PREFIX)) {
+      delete tokenMap[token.slug];
+    }
+  });
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const assetIndex = _getTokenOnChainAssetId(tokenInfo);

package/koni/api/dotsama/transfer.js

@@ -3,7 +3,7 @@
 
 import { getPSP22ContractPromise } from '@subwallet/extension-base/koni/api/tokens/wasm';
 import { getWasmContractGasLimit } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
-import { _BALANCE_TOKEN_GROUP, _TRANSFER_CHAIN_GROUP, _TRANSFER_NOT_SUPPORTED_CHAINS } from '@subwallet/extension-base/services/chain-service/constants';
+import { _BALANCE_TOKEN_GROUP, _MANTA_ZK_CHAIN_GROUP, _TRANSFER_CHAIN_GROUP, _TRANSFER_NOT_SUPPORTED_CHAINS, _ZK_ASSET_PREFIX } from '@subwallet/extension-base/services/chain-service/constants';
 import { _getContractAddressOfToken, _getTokenOnChainAssetId, _getTokenOnChainInfo, _isChainEvmCompatible, _isNativeToken, _isTokenWasmSmartContract } from '@subwallet/extension-base/services/chain-service/utils';
 import { BN } from '@polkadot/util';
 function isRefCount(accountInfo) {
@@ -34,6 +34,12 @@ export async function checkSupportTransfer(networkKey, tokenInfo, substrateApiMa
       supportTransferAll: true
     };
   }
+  if (tokenInfo.symbol.startsWith(_ZK_ASSET_PREFIX) && _MANTA_ZK_CHAIN_GROUP.includes(tokenInfo.originChain)) {
+    return {
+      supportTransfer: false,
+      supportTransferAll: false
+    };
+  }
   if (_TRANSFER_NOT_SUPPORTED_CHAINS.includes(networkKey)) {
     return {
       supportTransfer: false,

package/koni/api/staking/bonding/astar.d.ts

@@ -12,4 +12,4 @@ export declare function getAstarBondingExtrinsic(substrateApi: _SubstrateApi, am
 export declare function getAstarUnbondingExtrinsic(substrateApi: _SubstrateApi, amount: string, dappAddress: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAstarWithdrawalExtrinsic(substrateApi: _SubstrateApi): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
 export declare function getAstarClaimRewardExtrinsic(substrateApi: _SubstrateApi, address: string): Promise<import("@polkadot/api-base/types").SubmittableExtrinsic<"promise", import("@polkadot/types/types").ISubmittableResult>>;
-export declare function getAstarWithdrawable(nominatorMetadata: NominatorMetadata): UnstakingInfo;
+export declare function getCompoundWithdrawable(nominatorMetadata: NominatorMetadata): UnstakingInfo;

package/koni/api/staking/bonding/astar.js

@@ -351,7 +351,7 @@ export async function getAstarClaimRewardExtrinsic(substrateApi, address) {
   }
   return apiPromise.api.tx.utility.batch(transactions);
 }
-export function getAstarWithdrawable(nominatorMetadata) {
+export function getCompoundWithdrawable(nominatorMetadata) {
   const unstakingInfo = {
     chain: nominatorMetadata.chain,
     status: UnstakingStatus.CLAIMABLE,

package/koni/api/staking/bonding/relayChain.js

@@ -588,17 +588,27 @@ export async function getRelayBondingExtrinsic(substrateApi, amount, targetValid
   const binaryAmount = new BN(amount);
   let bondTx;
   let nominateTx;
+  const _params = chainApi.api.tx.staking.bond.toJSON();
+  const paramsCount = _params.args.length;
   const validatorParamList = targetValidators.map(validator => {
     return validator.address;
   });
   if (!nominatorMetadata) {
-    bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   }
   if (!nominatorMetadata.isBondedBefore) {
     // first time
-    bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    if (paramsCount === 2) {
+      bondTx = chainApi.api.tx.staking.bond(binaryAmount, bondDest);
+    } else {
+      bondTx = chainApi.api.tx.staking.bond(nominatorMetadata.address, binaryAmount, bondDest);
+    }
     nominateTx = chainApi.api.tx.staking.nominate(validatorParamList);
     return chainApi.api.tx.utility.batchAll([bondTx, nominateTx]);
   } else {

package/koni/api/staking/bonding/utils.js

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { StakingStatus, StakingType, UnstakingStatus } from '@subwallet/extension-base/background/KoniTypes';
-import { getAstarWithdrawable } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
+import { getCompoundWithdrawable } from '@subwallet/extension-base/koni/api/staking/bonding/astar';
 import { _KNOWN_CHAIN_INFLATION_PARAMS, _STAKING_CHAIN_GROUP, _SUBSTRATE_DEFAULT_INFLATION_PARAMS } from '@subwallet/extension-base/services/chain-service/constants';
 import { parseRawNumber, reformatAddress } from '@subwallet/extension-base/utils';
 import { BN, BN_BILLION, BN_HUNDRED, BN_MILLION, BN_THOUSAND, BN_ZERO, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
@@ -218,8 +218,8 @@ export function isActionFromValidator(stakingType, chain) {
 export function getWithdrawalInfo(nominatorMetadata) {
   const unstakings = nominatorMetadata.unstakings;
   let result;
-  if (_STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain)) {
-    return getAstarWithdrawable(nominatorMetadata);
+  if (_STAKING_CHAIN_GROUP.astar.includes(nominatorMetadata.chain) || _STAKING_CHAIN_GROUP.relay.includes(nominatorMetadata.chain)) {
+    return getCompoundWithdrawable(nominatorMetadata);
   }
   for (const unstaking of unstakings) {
     if (unstaking.status === UnstakingStatus.CLAIMABLE) {

package/koni/background/cron.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { ApiMap, ServiceInfo } from '@subwallet/extension-base/background/KoniTypes';
 import { KoniSubscription } from '@subwallet/extension-base/koni/background/subscription';
-import { _ChainState, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
 import { Subject } from 'rxjs';
 import KoniState from './handlers/State';
@@ -24,17 +23,14 @@ export declare class KoniCron {
     removeAllCrons: () => void;
     start: () => Promise<void>;
     stop: () => Promise<void>;
+    syncMantaPay: () => void;
     refreshNft: (address: string, apiMap: ApiMap, smartContractNfts: _ChainAsset[], chainInfoMap: Record<string, _ChainInfo>) => () => void;
     resetNft: (newAddress: string) => void;
-    resetStakingReward: () => void;
     refreshStakingReward: (address: string) => () => void;
     refreshStakingRewardFastInterval: (address: string) => () => void;
     setStakingRewardReady: () => void;
     checkNetworkAvailable: (serviceInfo: ServiceInfo) => boolean;
-    updateChainStakingMetadata: (chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
-    updateNominatorMetadata: (address: string, chainInfoMap: Record<string, _ChainInfo>, chainStateMap: Record<string, _ChainState>, substrateApiMap: Record<string, _SubstrateApi>) => () => void;
     reloadNft(): Promise<boolean>;
     reloadStaking(): Promise<boolean>;
     private needUpdateNft;
-    private needUpdateStaking;
 }

package/koni/background/cron.js

@@ -1,8 +1,8 @@
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { CRON_REFRESH_CHAIN_STAKING_METADATA, CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL } from '@subwallet/extension-base/constants';
-import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportSubstrateStaking, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
+import { CRON_REFRESH_NFT_INTERVAL, CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL, CRON_REFRESH_STAKING_REWARD_INTERVAL, CRON_SYNC_MANTA_PAY } from '@subwallet/extension-base/constants';
+import { _isChainSupportEvmNft, _isChainSupportNativeNft, _isChainSupportWasmNft } from '@subwallet/extension-base/services/chain-service/utils';
 import { waitTimeout } from '@subwallet/extension-base/utils';
 import { Subject } from 'rxjs';
 import { logger as createLogger } from '@polkadot/util';
@@ -61,7 +61,7 @@ export class KoniCron {
       const serviceInfo = this.state.getServiceInfo();
       const commonReload = eventTypes.some(eventType => commonReloadEvents.includes(eventType));
       const chainUpdated = eventTypes.includes('chain.updateState');
-      const stakingSubmitted = eventTypes.includes('transaction.submitStaking');
+      const reloadMantaPay = eventTypes.includes('mantaPay.submitTransaction') || eventTypes.includes('mantaPay.enable');
       const updatedChains = [];
       if (chainUpdated) {
         events.forEach(event => {
@@ -71,7 +71,7 @@ export class KoniCron {
           }
         });
       }
-      if (!commonReload && !chainUpdated && !stakingSubmitted) {
+      if (!commonReload && !chainUpdated && !reloadMantaPay) {
         return;
       }
       const address = (_serviceInfo$currentA = serviceInfo.currentAccountInfo) === null || _serviceInfo$currentA === void 0 ? void 0 : _serviceInfo$currentA.address;
@@ -80,25 +80,19 @@ export class KoniCron {
       }
       const chainInfoMap = serviceInfo.chainInfoMap;
       const needUpdateNft = this.needUpdateNft(chainInfoMap, updatedChains);
-      const needUpdateStaking = this.needUpdateStaking(chainInfoMap, updatedChains);
+
+      // MantaPay
+      reloadMantaPay && this.removeCron('syncMantaPay');
 
       // NFT
       (commonReload || needUpdateNft) && this.resetNft(address);
       (commonReload || needUpdateNft) && this.removeCron('refreshNft');
 
-      // Staking
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.resetStakingReward();
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshStakingReward');
-      (commonReload || needUpdateStaking || stakingSubmitted) && this.removeCron('refreshPoolingStakingReward');
-      needUpdateStaking && this.removeCron('updateChainStakingMetadata');
-
       // Chains
       if (this.checkNetworkAvailable(serviceInfo)) {
         // only add cron job if there's at least 1 active network
         (commonReload || needUpdateNft) && this.addCron('refreshNft', this.refreshNft(address, serviceInfo.chainApiMap, this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-        (commonReload || needUpdateStaking || stakingSubmitted) && this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-        needUpdateStaking && this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(serviceInfo.chainInfoMap, serviceInfo.chainStateMap, serviceInfo.chainApiMap.substrate), CRON_REFRESH_CHAIN_STAKING_METADATA);
+        reloadMantaPay && this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
       } else {
         this.setStakingRewardReady();
       }
@@ -112,7 +106,7 @@ export class KoniCron {
       this.addCron('refreshNft', this.refreshNft(currentAccountInfo.address, this.state.getApiMap(), this.state.getSmartContractNfts(), this.state.getActiveChainInfoMap()), CRON_REFRESH_NFT_INTERVAL);
       this.addCron('refreshStakingReward', this.refreshStakingReward(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
       this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(currentAccountInfo.address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
-      this.addCron('updateChainStakingMetadata', this.updateChainStakingMetadata(this.state.getChainInfoMap(), this.state.getChainStateMap(), this.state.getSubstrateApiMap()), CRON_REFRESH_CHAIN_STAKING_METADATA);
+      this.addCron('syncMantaPay', this.syncMantaPay, CRON_SYNC_MANTA_PAY);
     } else {
       this.setStakingRewardReady();
     }
@@ -136,6 +130,11 @@ export class KoniCron {
     this.status = 'stopped';
     return Promise.resolve();
   };
+  syncMantaPay = () => {
+    if (this.state.isMantaPayEnabled) {
+      this.state.syncMantaPay().catch(console.warn);
+    }
+  };
   refreshNft = (address, apiMap, smartContractNfts, chainInfoMap) => {
     return () => {
       this.subscriptions.subscribeNft(address, apiMap.substrate, apiMap.evm, smartContractNfts, chainInfoMap);
@@ -144,9 +143,6 @@ export class KoniCron {
   resetNft = newAddress => {
     this.state.resetNft(newAddress);
   };
-  resetStakingReward = () => {
-    this.state.resetStakingReward();
-  };
   refreshStakingReward = address => {
     return () => {
       this.subscriptions.subscribeStakingReward(address).catch(this.logger.error);
@@ -163,16 +159,6 @@ export class KoniCron {
   checkNetworkAvailable = serviceInfo => {
     return Object.keys(serviceInfo.chainApiMap.substrate).length > 0 || Object.keys(serviceInfo.chainApiMap.evm).length > 0;
   };
-  updateChainStakingMetadata = (chainInfoMap, chainStateMap, substrateApiMap) => {
-    return () => {
-      this.subscriptions.fetchChainStakingMetadata(chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
-    };
-  };
-  updateNominatorMetadata = (address, chainInfoMap, chainStateMap, substrateApiMap) => {
-    return () => {
-      this.subscriptions.fetchNominatorMetadata(address, chainInfoMap, chainStateMap, substrateApiMap).catch(this.logger.error);
-    };
-  };
   async reloadNft() {
     const address = this.state.keyringService.currentAccount.address;
     const serviceInfo = this.state.getServiceInfo();
@@ -184,11 +170,7 @@ export class KoniCron {
   }
   async reloadStaking() {
     const address = this.state.keyringService.currentAccount.address;
-    this.resetStakingReward();
-    this.removeCron('refreshStakingReward');
-    this.removeCron('refreshPoolingStakingReward');
-    this.addCron('refreshStakingReward', this.refreshStakingReward(address), CRON_REFRESH_STAKING_REWARD_INTERVAL);
-    this.addCron('refreshPoolingStakingReward', this.refreshStakingRewardFastInterval(address), CRON_REFRESH_STAKING_REWARD_FAST_INTERVAL);
+    console.log('reload staking', address);
     await waitTimeout(1800);
     return true;
   }
@@ -201,10 +183,4 @@ export class KoniCron {
     }
     return false;
   }
-  needUpdateStaking(chainInfoMap, updatedChains) {
-    if (updatedChains && updatedChains.length > 0) {
-      return updatedChains.some(updatedChain => _isChainSupportSubstrateStaking(chainInfoMap[updatedChain]));
-    }
-    return false;
-  }
 }

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

@@ -194,5 +194,10 @@ export default class KoniExtension {
     private rejectWalletConnectSession;
     private subscribeWalletConnectSessions;
     private disconnectWalletConnectSession;
+    private enableMantaPay;
+    private initSyncMantaPay;
+    private disableMantaPay;
+    private subscribeMantaPayConfig;
+    private subscribeMantaPaySyncState;
     handle<TMessageType extends MessageTypes>(id: string, type: TMessageType, request: RequestTypes[TMessageType], port: chrome.runtime.Port): Promise<ResponseType<TMessageType>>;
 }