@subwallet/extension-base 1.2.3-1 → 1.2.4-0

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

@@ -43,6 +43,7 @@ var _uiKeyring = require("@subwallet/ui-keyring");
 var _utils4 = require("@walletconnect/utils");
 var _bignumber = _interopRequireDefault(require("bignumber.js"));
 var _i18next = require("i18next");
+var _rxjs = require("rxjs");
 var _types3 = require("@polkadot/types");
 var _util = require("@polkadot/util");
 var _utilCrypto = require("@polkadot/util-crypto");
@@ -87,6 +88,7 @@ class KoniExtension {
   #skipAutoLock = false;
   #firstTime = true;
   #alwaysLock = false;
+  #keyringLockSubject = new _rxjs.Subject();
   constructor(state) {
     this.#koniState = state;
     const updateTimeAutoLock = rs => {
@@ -1976,29 +1978,6 @@ class KoniExtension {
     });
     return convertData(currentFreeBalance);
   }
-  async transferCheckReferenceCount(_ref52) {
-    let {
-      address,
-      networkKey
-    } = _ref52;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-return
-    return await (0, _transfer2.checkReferenceCount)(networkKey, address, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
-  }
-  async transferCheckSupporting(_ref53) {
-    let {
-      networkKey,
-      tokenSlug
-    } = _ref53;
-    const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    return await (0, _transfer2.checkSupportTransfer)(networkKey, tokenInfo, this.#koniState.getSubstrateApiMap(), this.#koniState.getChainInfo(networkKey));
-  }
-  transferGetExistentialDeposit(_ref54) {
-    let {
-      tokenSlug
-    } = _ref54;
-    const tokenInfo = this.#koniState.getAssetBySlug(tokenSlug);
-    return (0, _utils2._getTokenMinAmount)(tokenInfo);
-  }
   async substrateNftSubmitTransaction(inputData) {
     const {
       params,
@@ -2031,11 +2010,11 @@ class KoniExtension {
       isSendingSelf
     };
   }
-  async enableChains(_ref55) {
+  async enableChains(_ref52) {
     let {
       chainSlugs,
       enableTokens
-    } = _ref55;
+    } = _ref52;
     try {
       await Promise.all(chainSlugs.map(chainSlug => this.enableChain({
         chainSlug,
@@ -2046,24 +2025,24 @@ class KoniExtension {
     }
     return true;
   }
-  getAccountMeta(_ref56) {
+  getAccountMeta(_ref53) {
     let {
       address
-    } = _ref56;
+    } = _ref53;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     return {
       meta: pair.meta
     };
   }
-  accountsTie2(_ref57) {
+  accountsTie2(_ref54) {
     let {
       address,
       genesisHash
-    } = _ref57;
+    } = _ref54;
     return this.#koniState.setAccountTie(address, genesisHash);
   }
-  async accountsCreateExternalV2(_ref58) {
+  async accountsCreateExternalV2(_ref55) {
     let {
       address,
       genesisHash,
@@ -2071,7 +2050,7 @@ class KoniExtension {
       isEthereum,
       isReadOnly,
       name
-    } = _ref58;
+    } = _ref55;
     try {
       let result;
       try {
@@ -2130,7 +2109,7 @@ class KoniExtension {
       }];
     }
   }
-  async accountsCreateHardwareV2(_ref59) {
+  async accountsCreateHardwareV2(_ref56) {
     let {
       accountIndex,
       address,
@@ -2139,7 +2118,7 @@ class KoniExtension {
       hardwareType,
       isAllowed,
       name
-    } = _ref59;
+    } = _ref56;
     const key = _uiKeyring.keyring.addHardware(address, hardwareType, {
       accountIndex,
       addressOffset,
@@ -2162,10 +2141,10 @@ class KoniExtension {
     });
     return true;
   }
-  async accountsCreateHardwareMultiple(_ref60) {
+  async accountsCreateHardwareMultiple(_ref57) {
     let {
       accounts
-    } = _ref60;
+    } = _ref57;
     const addresses = [];
     if (!accounts.length) {
       throw new Error((0, _i18next.t)("Can't find an account. Please try again"));
@@ -2243,14 +2222,14 @@ class KoniExtension {
     }
     return true;
   }
-  async accountsCreateWithSecret(_ref61) {
+  async accountsCreateWithSecret(_ref58) {
     let {
       isAllow,
       isEthereum,
       name,
       publicKey,
       secretKey
-    } = _ref61;
+    } = _ref58;
     try {
       let keyringPair = null;
       if (isEthereum) {
@@ -2396,30 +2375,30 @@ class KoniExtension {
 
   // Parse transaction
 
-  parseSubstrateTransaction(_ref62) {
+  parseSubstrateTransaction(_ref59) {
     let {
       data,
       networkKey
-    } = _ref62;
+    } = _ref59;
     const apiProps = this.#koniState.getSubstrateApi(networkKey);
     const apiPromise = apiProps.api;
     return (0, _parseTransaction.parseSubstrateTransaction)(data, apiPromise);
   }
-  async parseEVMRLP(_ref63) {
+  async parseEVMRLP(_ref60) {
     let {
       data
-    } = _ref63;
+    } = _ref60;
     return await (0, _parseTransaction2.parseEvmRlp)(data, this.#koniState.getChainInfoMap(), this.#koniState.getEvmApiMap());
   }
 
   // Sign
 
-  qrSignSubstrate(_ref64) {
+  qrSignSubstrate(_ref61) {
     let {
       address,
       data,
       networkKey
-    } = _ref64;
+    } = _ref61;
     const pair = _uiKeyring.keyring.getPair(address);
     (0, _util.assert)(pair, (0, _i18next.t)('Unable to find account'));
     if (pair.isLocked) {
@@ -2436,13 +2415,13 @@ class KoniExtension {
       signature: signed
     };
   }
-  async qrSignEVM(_ref65) {
+  async qrSignEVM(_ref62) {
     let {
       address,
       chainId,
       message,
       type
-    } = _ref65;
+    } = _ref62;
     let signed;
     const network = this.getNetworkJsonByChainId(chainId);
     if (!network) {
@@ -2526,11 +2505,11 @@ class KoniExtension {
     });
     return this.#koniState.getNominatorMetadata();
   }
-  async getBondingOptions(_ref66) {
+  async getBondingOptions(_ref63) {
     let {
       chain,
       type
-    } = _ref66;
+    } = _ref63;
     const apiProps = this.#koniState.getSubstrateApi(chain);
     const chainInfo = this.#koniState.getChainInfo(chain);
     const chainStakingMetadata = await this.#koniState.getStakingMetadataByChain(chain, type);
@@ -2720,12 +2699,12 @@ class KoniExtension {
   }
 
   // EVM Transaction
-  async parseContractInput(_ref67) {
+  async parseContractInput(_ref64) {
     let {
       chainId,
       contract,
       data
-    } = _ref67;
+    } = _ref64;
     const network = this.getNetworkJsonByChainId(chainId);
     return await (0, _parseTransaction2.parseContractInput)(data, contract, network);
   }
@@ -2796,12 +2775,12 @@ class KoniExtension {
 
   // Change master password
 
-  keyringChangeMasterPassword(_ref68) {
+  keyringChangeMasterPassword(_ref65) {
     let {
       createNew,
       newPassword,
       oldPassword
-    } = _ref68;
+    } = _ref65;
     try {
       // Remove isMasterPassword meta if createNew
       if (createNew && !_uiKeyring.keyring.keyring.hasMasterPassword) {
@@ -2851,11 +2830,11 @@ class KoniExtension {
       }
     }
   }
-  keyringMigrateMasterPassword(_ref69) {
+  keyringMigrateMasterPassword(_ref66) {
     let {
       address,
       password
-    } = _ref69;
+    } = _ref66;
     try {
       _uiKeyring.keyring.migrateWithMasterPassword(address, password);
       this.checkLockAfterMigrate();
@@ -2874,10 +2853,10 @@ class KoniExtension {
 
   // Unlock wallet
 
-  keyringUnlock(_ref70) {
+  keyringUnlock(_ref67) {
     let {
       password
-    } = _ref70;
+    } = _ref67;
     try {
       _uiKeyring.keyring.unlockKeyring(password);
       // this.#koniState.initMantaPay(password)
@@ -2899,16 +2878,20 @@ class KoniExtension {
 
   keyringLock() {
     this.#koniState.keyringService.lock();
+    this.#keyringLockSubject.next(true);
     clearTimeout(this.#lockTimeOut);
   }
+  keyringLockSubscribe(cb) {
+    this.#keyringLockSubject.subscribe(cb);
+  }
 
   // Export mnemonic
 
-  keyringExportMnemonic(_ref71) {
+  keyringExportMnemonic(_ref68) {
     let {
       address,
       password
-    } = _ref71;
+    } = _ref68;
     const pair = _uiKeyring.keyring.getPair(address);
     const result = pair.exportMnemonic(password);
     return {
@@ -2918,10 +2901,10 @@ class KoniExtension {
 
   // Reset wallet
 
-  async resetWallet(_ref72) {
+  async resetWallet(_ref69) {
     let {
       resetAll
-    } = _ref72;
+    } = _ref69;
     try {
       await this.#koniState.resetWallet(resetAll);
       return {
@@ -2937,10 +2920,10 @@ class KoniExtension {
   }
 
   /// Signing substrate request
-  signingApprovePasswordV2(_ref73) {
+  signingApprovePasswordV2(_ref70) {
     let {
       id
-    } = _ref73;
+    } = _ref70;
     const queued = this.#koniState.getSignRequest(id);
     (0, _util.assert)(queued, (0, _i18next.t)('Unable to proceed. Please try again'));
     const {
@@ -3019,22 +3002,22 @@ class KoniExtension {
 
   /// Derive account
 
-  derivationCreateMultiple(_ref74) {
+  derivationCreateMultiple(_ref71) {
     let {
       isAllowed,
       items,
       parentAddress
-    } = _ref74;
+    } = _ref71;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
       _uiKeyring.keyring.unlockPair(parentPair.address);
     }
-    const createChild = _ref75 => {
+    const createChild = _ref72 => {
       let {
         name,
         suri
-      } = _ref75;
+      } = _ref72;
       const meta = {
         name: name,
         parentAddress
@@ -3080,10 +3063,10 @@ class KoniExtension {
     }
     return true;
   }
-  derivationCreateV3(_ref76) {
+  derivationCreateV3(_ref73) {
     let {
       address: parentAddress
-    } = _ref76;
+    } = _ref73;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -3118,11 +3101,11 @@ class KoniExtension {
     }
     return true;
   }
-  validateDerivePath(_ref77) {
+  validateDerivePath(_ref74) {
     let {
       parentAddress,
       suri
-    } = _ref77;
+    } = _ref74;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -3155,12 +3138,12 @@ class KoniExtension {
       suri: meta.suri
     };
   }
-  getListDeriveAccounts(_ref78) {
+  getListDeriveAccounts(_ref75) {
     let {
       limit,
       page,
       parentAddress
-    } = _ref78;
+    } = _ref75;
     const parentPair = _uiKeyring.keyring.getPair(parentAddress);
     const isEvm = parentPair.type === 'ethereum';
     if (parentPair.isLocked) {
@@ -3270,10 +3253,10 @@ class KoniExtension {
   getSupportedSmartContractTypes() {
     return this.#koniState.getSupportedSmartContractTypes();
   }
-  getTransaction(_ref79) {
+  getTransaction(_ref76) {
     let {
       id
-    } = _ref79;
+    } = _ref76;
     const {
       transaction,
       ...transactionResult
@@ -3283,8 +3266,8 @@ class KoniExtension {
   subscribeTransactions(id, port) {
     const cb = (0, _subscriptions.createSubscription)(id, port);
     function convertRs(rs) {
-      return Object.fromEntries(Object.entries(rs).map(_ref80 => {
-        let [key, value] = _ref80;
+      return Object.fromEntries(Object.entries(rs).map(_ref77 => {
+        let [key, value] = _ref77;
         const {
           additionalValidator,
           eventsHandler,
@@ -3316,10 +3299,10 @@ class KoniExtension {
     });
     return notificationSubject.value;
   }
-  async reloadCron(_ref81) {
+  async reloadCron(_ref78) {
     let {
       data
-    } = _ref81;
+    } = _ref78;
     if (data === 'nft') {
       return await this.#koniState.reloadNft();
     } else if (data === 'staking') {
@@ -3363,20 +3346,20 @@ class KoniExtension {
 
   // Phishing detect
 
-  async passPhishingPage(_ref82) {
+  async passPhishingPage(_ref79) {
     let {
       url
-    } = _ref82;
+    } = _ref79;
     return await this.#koniState.approvePassPhishingPage(url);
   }
 
   /// Wallet connect
 
   // Connect
-  async connectWalletConnect(_ref83) {
+  async connectWalletConnect(_ref80) {
     let {
       uri
-    } = _ref83;
+    } = _ref80;
     await this.#koniState.walletConnectService.connect(uri);
     return true;
   }
@@ -3389,11 +3372,11 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allConnectWCRequests;
   }
-  async approveWalletConnectSession(_ref84) {
+  async approveWalletConnectSession(_ref81) {
     let {
       accounts: selectedAccounts,
       id
-    } = _ref84;
+    } = _ref81;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
       throw new Error('The proposal has been expired');
@@ -3405,8 +3388,8 @@ class KoniExtension {
     const availableNamespaces = {};
     const namespaces = {};
     const chainInfoMap = this.#koniState.getChainInfoMap();
-    Object.entries(requiredNamespaces).forEach(_ref85 => {
-      let [key, namespace] = _ref85;
+    Object.entries(requiredNamespaces).forEach(_ref82 => {
+      let [key, namespace] = _ref82;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const unSupportChains = namespace.chains.filter(chain => !(0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap));
@@ -3419,8 +3402,8 @@ class KoniExtension {
         throw new Error((0, _utils4.getSdkError)('UNSUPPORTED_NAMESPACE_KEY').message + ' ' + key);
       }
     });
-    Object.entries(optionalNamespaces).forEach(_ref86 => {
-      let [key, namespace] = _ref86;
+    Object.entries(optionalNamespaces).forEach(_ref83 => {
+      let [key, namespace] = _ref83;
       if ((0, _helpers2.isSupportWalletConnectNamespace)(key)) {
         if (namespace.chains) {
           const supportChains = namespace.chains.filter(chain => (0, _helpers2.isSupportWalletConnectChain)(chain, chainInfoMap)) || [];
@@ -3444,8 +3427,8 @@ class KoniExtension {
         }
       }
     });
-    Object.entries(availableNamespaces).forEach(_ref87 => {
-      let [key, namespace] = _ref87;
+    Object.entries(availableNamespaces).forEach(_ref84 => {
+      let [key, namespace] = _ref84;
       if (namespace.chains) {
         const accounts = [];
         const chains = (0, _utils3.uniqueStringArray)(namespace.chains);
@@ -3469,10 +3452,10 @@ class KoniExtension {
     request.resolve();
     return true;
   }
-  async rejectWalletConnectSession(_ref88) {
+  async rejectWalletConnectSession(_ref85) {
     let {
       id
-    } = _ref88;
+    } = _ref85;
     const request = this.#koniState.requestService.getConnectWCRequest(id);
     const wcId = request.request.id;
     if ((0, _helpers2.isProposalExpired)(request.request.params)) {
@@ -3494,10 +3477,10 @@ class KoniExtension {
     });
     return this.#koniState.walletConnectService.sessions;
   }
-  async disconnectWalletConnectSession(_ref89) {
+  async disconnectWalletConnectSession(_ref86) {
     let {
       topic
-    } = _ref89;
+    } = _ref86;
     await this.#koniState.walletConnectService.disconnect(topic);
     return true;
   }
@@ -3510,18 +3493,18 @@ class KoniExtension {
     });
     return this.#koniState.requestService.allNotSupportWCRequests;
   }
-  approveWalletConnectNotSupport(_ref90) {
+  approveWalletConnectNotSupport(_ref87) {
     let {
       id
-    } = _ref90;
+    } = _ref87;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.resolve();
     return true;
   }
-  rejectWalletConnectNotSupport(_ref91) {
+  rejectWalletConnectNotSupport(_ref88) {
     let {
       id
-    } = _ref91;
+    } = _ref88;
     const request = this.#koniState.requestService.getNotSupportWCRequest(id);
     request.reject(new Error('USER_REJECTED'));
     return true;
@@ -3529,11 +3512,11 @@ class KoniExtension {
 
   /// Manta
 
-  async enableMantaPay(_ref92) {
+  async enableMantaPay(_ref89) {
     let {
       address,
       password
-    } = _ref92;
+    } = _ref89;
     // always takes the current account
     function timeout() {
       return new Promise(resolve => setTimeout(resolve, 1500));
@@ -3657,10 +3640,10 @@ class KoniExtension {
 
   /// Metadata
 
-  async findRawMetadata(_ref93) {
+  async findRawMetadata(_ref90) {
     let {
       genesisHash
-    } = _ref93;
+    } = _ref90;
     const {
       metadata,
       specVersion
@@ -3907,18 +3890,18 @@ class KoniExtension {
 
   /* Campaign */
 
-  unlockDotCheckCanMint(_ref94) {
+  unlockDotCheckCanMint(_ref91) {
     let {
       address,
       network,
       slug
-    } = _ref94;
+    } = _ref91;
     return this.#koniState.mintCampaignService.unlockDotCampaign.canMint(address, slug, network);
   }
-  unlockDotSubscribeMintedData(id, port, _ref95) {
+  unlockDotSubscribeMintedData(id, port, _ref92) {
     let {
       transactionId
-    } = _ref95;
+    } = _ref92;
     const cb = (0, _subscriptions.createSubscription)(id, port);
     const subscription = this.#koniState.mintCampaignService.unlockDotCampaign.subscribeMintedNft(transactionId, cb);
     this.createUnsubscriptionHandle(id, subscription.unsubscribe);
@@ -3950,10 +3933,10 @@ class KoniExtension {
     });
     return filterBanner(await this.#koniState.campaignService.getProcessingCampaign());
   }
-  async completeCampaignBanner(_ref96) {
+  async completeCampaignBanner(_ref93) {
     let {
       slug
-    } = _ref96;
+    } = _ref93;
     const campaign = await this.#koniState.dbService.getCampaign(slug);
     if (campaign) {
       await this.#koniState.dbService.upsertCampaign({
@@ -4406,12 +4389,6 @@ class KoniExtension {
         return this.subscribeAssetSetting(id, port);
       case 'pri(assetSetting.update)':
         return await this.updateAssetSetting(request);
-      case 'pri(transfer.checkReferenceCount)':
-        return await this.transferCheckReferenceCount(request);
-      case 'pri(transfer.checkSupporting)':
-        return await this.transferCheckSupporting(request);
-      case 'pri(transfer.getExistentialDeposit)':
-        return this.transferGetExistentialDeposit(request);
       case 'pri(transfer.getMaxTransferable)':
         return this.getMaxTransferable(request);
       case 'pri(transfer.subscribeMaxTransferable)':

package/cjs/packageInfo.js

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

package/cjs/services/balance-service/helpers/subscribe/substrate/index.js

@@ -141,7 +141,7 @@ const subscribeWithSystemAccountPallet = async _ref => {
     const items = balances.map((_balance, index) => {
       const balanceInfo = _balance.toPrimitive();
       const poolMemberInfo = poolMemberInfos[index].toPrimitive();
-      const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getActiveStakeInNominationPool)(poolMemberInfo) : '0';
+      const nominationPoolBalance = poolMemberInfo ? (0, _nominationpoolsPallet._getTotalStakeInNominationPool)(poolMemberInfo) : new _bignumber.default(0);
       const transferableBalance = (0, _systemPallet._getSystemPalletTransferable)(balanceInfo, (0, _utils2._getChainExistentialDeposit)(chainInfo), extrinsicType);
       const totalBalance = (0, _systemPallet._getSystemPalletTotalBalance)(balanceInfo);
       const totalLockedFromTransfer = new _bignumber.default(totalBalance).minus(transferableBalance).plus(nominationPoolBalance);
@@ -176,8 +176,8 @@ const subscribeBridgedBalance = async _ref3 => {
     try {
       const isBridgedToken = (0, _utils2._isBridgedToken)(tokenInfo);
       if (isBridgedToken) {
-        const multiLocation = (0, _utils2._getXcmAssetMultilocation)(tokenInfo);
-        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [multiLocation, address]), balances => {
+        const onChainInfo = (0, _utils2._getTokenOnChainInfo)(tokenInfo);
+        return await substrateApi.query.foreignAssets.account.multi(addresses.map(address => [onChainInfo, address]), balances => {
           const items = balances.map((balance, index) => {
             const bdata = balance === null || balance === void 0 ? void 0 : balance.toHuman();
             let frozen = _util.BN_ZERO;
@@ -354,6 +354,9 @@ const subscribeAssetsAccountPallet = async _ref7 => {
   const unsubList = await Promise.all(Object.values(tokenMap).map(async tokenInfo => {
     try {
       const assetIndex = (0, _utils2._getTokenOnChainAssetId)(tokenInfo);
+      if (assetIndex === '-1') {
+        return undefined;
+      }
 
       // Get Token Balance
       return await substrateApi.query.assets.account.multi(addresses.map(address => [assetIndex, address]), balances => {

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

@@ -45,7 +45,7 @@ const _BALANCE_CHAIN_GROUP = {
   kusama: ['kusama', 'kintsugi', 'kintsugi_test', 'interlay', 'acala', 'statemint', 'karura', 'bifrost'],
   // perhaps there are some runtime updates
   centrifuge: ['centrifuge'],
-  supportBridged: ['rococo_assethub']
+  supportBridged: ['rococo_assethub', 'statemint', 'statemine']
 };
 exports._BALANCE_CHAIN_GROUP = _BALANCE_CHAIN_GROUP;
 const _BALANCE_TOKEN_GROUP = {
@@ -271,7 +271,7 @@ const _DEFAULT_MANTA_ZK_CHAIN = 'calamari';
 // XCM------------------------------------------------------------------------------------------------------------------
 exports._DEFAULT_MANTA_ZK_CHAIN = _DEFAULT_MANTA_ZK_CHAIN;
 const _XCM_CHAIN_GROUP = {
-  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain'],
+  polkadotXcm: ['astar', 'shiden', 'statemine', 'statemint', 'equilibrium_parachain', 'rococo_assethub'],
   xcmPallet: ['polkadot', 'kusama']
   // default is xTokens pallet
 };