@subwallet/extension-base 1.1.62-0 → 1.1.64-0

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

@@ -3052,7 +3052,10 @@ class KoniExtension {
     let registry = new _types4.TypeRegistry();
     let isEvm = false;
     if ((0, _Extension.isJsonPayload)(payload)) {
-      // Get the metadata for the genesisHash
+      /**
+       *  Get the metadata for the genesisHash
+       *  @todo: need to handle case metadata store in db
+      */
       const currentMetadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
 
       // set the registry before calling the sign function
@@ -3061,12 +3064,23 @@ class KoniExtension {
         registry.register(currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.types);
       }
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      if (chainInfo && (_constants2._API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _constants2._API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug))) {
-        const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
-        if (!isChainActive) {
-          reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
-          return false;
-        } else {
+      if (!currentMetadata) {
+        /*
+        * Some networks must have metadata to signing,
+        * so if the chain not active (cannot use metadata from api), it must be rejected
+        *  */
+        if (chainInfo && (_constants2._API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _constants2._API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug)) // The special case for chains that need metadata to signing
+        ) {
+          // For case the chain does not have any provider
+          if (!Object.keys(chainInfo.providers).length) {
+            reject(new Error('{{chain}} network does not have any provider to connect, please update metadata from dApp'.replaceAll('{{chain}}', chainInfo.name)));
+            return false;
+          }
+          const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
+          if (!isChainActive) {
+            reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
+            return false;
+          }
           registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
         }
       }

package/cjs/packageInfo.js

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

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

@@ -725,21 +725,25 @@ class ChainService {
     }
     this.lockChainInfoMap = true;
     const initPromises = chainSlugs.map(async chainSlug => {
-      var _chainStateMap$chainS;
-      const chainInfo = chainInfoMap[chainSlug];
-      const currentState = (_chainStateMap$chainS = chainStateMap[chainSlug]) === null || _chainStateMap$chainS === void 0 ? void 0 : _chainStateMap$chainS.active;
-      if (!currentState) {
-        this.dbService.updateChainStore({
-          ...chainInfo,
-          active: true,
-          currentProvider: chainStateMap[chainSlug].currentProvider,
-          manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
-        }).catch(console.error);
-        chainStateMap[chainSlug].active = true;
-        await this.initApiForChain(chainInfo);
-        this.eventService.emit('chain.updateState', chainSlug);
-        needUpdate = true;
-      }
+      // Add try catch to prevent one chain error stop the whole process
+      try {
+        var _chainStateMap$chainS;
+        const chainInfo = chainInfoMap[chainSlug];
+        const currentState = (_chainStateMap$chainS = chainStateMap[chainSlug]) === null || _chainStateMap$chainS === void 0 ? void 0 : _chainStateMap$chainS.active;
+        if (!currentState) {
+          // Enable chain success then update chain state
+          await this.initApiForChain(chainInfo);
+          this.dbService.updateChainStore({
+            ...chainInfo,
+            active: true,
+            currentProvider: chainStateMap[chainSlug].currentProvider,
+            manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
+          }).catch(console.error);
+          chainStateMap[chainSlug].active = true;
+          this.eventService.emit('chain.updateState', chainSlug);
+          needUpdate = true;
+        }
+      } catch (e) {}
     });
     await Promise.all(initPromises);
     this.lockChainInfoMap = false;

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

@@ -617,7 +617,9 @@ function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
           providerKey
         } = randomizeProvider(currentChainInfo.providers);
         currentChainState.currentProvider = providerKey;
-        needUpdateChainApiList.push(currentChainInfo);
+        if (currentChainState.active) {
+          needUpdateChainApiList.push(currentChainInfo);
+        }
       }
       needUpdate = true;
     }

package/cjs/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -14,10 +14,7 @@ class MigrateTransactionHistoryBySymbol extends _Base.default {
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'moonbeam-LOCAL-xcaUSD': 'moonbeam-LOCAL-xcaSEED',
-        'calamari-LOCAL-AUSD': 'calamari-LOCAL-aSEED',
-        'moonriver-LOCAL-xcaSeed': 'moonriver-LOCAL-xcaSEED',
-        'bifrost-LOCAL-KUSD': 'bifrost-LOCAL-aSEED'
+        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async (_ref, i) => {

package/cjs/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -13,10 +13,7 @@ class MigrateAssetSetting extends _Base.default {
   async run() {
     try {
       const changeSlugsMap = {
-        'moonbeam-LOCAL-xcaUSD': 'moonbeam-LOCAL-xcaSEED',
-        'calamari-LOCAL-AUSD': 'calamari-LOCAL-aSEED',
-        'moonriver-LOCAL-xcaSeed': 'moonriver-LOCAL-xcaSEED',
-        'bifrost-LOCAL-KUSD': 'bifrost-LOCAL-aSEED'
+        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/cjs/services/migration-service/scripts/index.js

@@ -56,8 +56,8 @@ var _default = {
   '1.1.28-01': _MigrateEarningVersion.default,
   '1.1.41-01': _DeleteChainStaking.default,
   '1.1.46-01': _AutoEnableSomeTokens.default,
-  '1.1.53-01': _MigrateAssetSetting.default,
-  '1.1.53-02': _MigrateTransactionHistoryBySymbol.default
+  '1.1.62-01': _MigrateAssetSetting.default,
+  '1.1.62-02': _MigrateTransactionHistoryBySymbol.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

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

@@ -891,7 +891,7 @@ class TransactionService {
         maxFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.maxFeePerGas).toString(16)),
         maxPriorityFeePerGas: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.maxPriorityFeePerGas).toString(16)),
         gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.gas).toString(16)),
-        to: transaction.to !== undefined ? transaction.to : '',
+        to: transaction.to,
         value: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.value).toString(16)),
         data: transaction.data,
         chainId: (0, _utils._getEvmChainId)(chainInfo),
@@ -903,7 +903,7 @@ class TransactionService {
         nonce: (_transaction$nonce2 = transaction.nonce) !== null && _transaction$nonce2 !== void 0 ? _transaction$nonce2 : 0,
         gasPrice: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.gasPrice).toString(16)),
         gasLimit: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.gas).toString(16)),
-        to: transaction.to !== undefined ? transaction.to : '',
+        to: transaction.to,
         value: (0, _ethereumjsUtil.addHexPrefix)((0, _utils4.anyNumberToBN)(transaction.value).toString(16)),
         data: transaction.data,
         chainId: (0, _utils._getEvmChainId)(chainInfo),
@@ -978,7 +978,7 @@ class TransactionService {
       maxFeePerGas: (0, _utils4.anyNumberToBN)(payload.maxFeePerGas).toNumber(),
       maxPriorityFeePerGas: (0, _utils4.anyNumberToBN)(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: (0, _utils4.anyNumberToBN)(payload.gas).toNumber(),
-      to: payload.to !== undefined ? payload.to : '',
+      to: payload.to,
       value: (0, _utils4.anyNumberToBN)(payload.value).toNumber(),
       data: payload.data,
       chainId: payload.chainId

package/cjs/services/transaction-service/utils.js

@@ -33,6 +33,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('explorer.polimec.org')) {
     return 'account';
   }
+  if (explorerLink.includes('invarch.statescan.io')) {
+    return '#/accounts';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {
@@ -42,6 +45,9 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
     return 'transaction';
   }
+  if (['invarch'].includes(chainInfo.slug)) {
+    return '#/extrinsics';
+  }
   return 'extrinsic';
 }
 function getExplorerLink(chainInfo, value, type) {

package/cjs/utils/eth/parseTransaction/index.js

@@ -100,7 +100,7 @@ const parseResult = (type, input, name) => {
   }
 };
 const isContractAddress = async (address, evmApi) => {
-  if (!evmApi) {
+  if (!evmApi || !address) {
     return false;
   } else {
     const code = await evmApi.api.eth.getCode(address);

package/koni/background/handlers/Extension.js

@@ -2969,7 +2969,10 @@ export default class KoniExtension {
     let registry = new TypeRegistry();
     let isEvm = false;
     if (isJsonPayload(payload)) {
-      // Get the metadata for the genesisHash
+      /**
+       *  Get the metadata for the genesisHash
+       *  @todo: need to handle case metadata store in db
+      */
       const currentMetadata = this.#koniState.knownMetadata.find(meta => meta.genesisHash === payload.genesisHash);
 
       // set the registry before calling the sign function
@@ -2978,12 +2981,23 @@ export default class KoniExtension {
         registry.register(currentMetadata === null || currentMetadata === void 0 ? void 0 : currentMetadata.types);
       }
       const [, chainInfo] = this.#koniState.findNetworkKeyByGenesisHash(payload.genesisHash);
-      if (chainInfo && (_API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug))) {
-        const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
-        if (!isChainActive) {
-          reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
-          return false;
-        } else {
+      if (!currentMetadata) {
+        /*
+        * Some networks must have metadata to signing,
+        * so if the chain not active (cannot use metadata from api), it must be rejected
+        *  */
+        if (chainInfo && (_API_OPTIONS_CHAIN_GROUP.avail.includes(chainInfo.slug) || _API_OPTIONS_CHAIN_GROUP.goldberg.includes(chainInfo.slug)) // The special case for chains that need metadata to signing
+        ) {
+          // For case the chain does not have any provider
+          if (!Object.keys(chainInfo.providers).length) {
+            reject(new Error('{{chain}} network does not have any provider to connect, please update metadata from dApp'.replaceAll('{{chain}}', chainInfo.name)));
+            return false;
+          }
+          const isChainActive = this.#koniState.getChainStateByKey(chainInfo.slug).active;
+          if (!isChainActive) {
+            reject(new Error('Please activate {{chain}} network before signing'.replaceAll('{{chain}}', chainInfo.name)));
+            return false;
+          }
           registry = this.#koniState.getSubstrateApi(chainInfo.slug).api.registry;
         }
       }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.1.62-0",
+  "version": "1.1.64-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -1869,11 +1869,11 @@
     "@reduxjs/toolkit": "^1.9.1",
     "@sora-substrate/type-definitions": "^1.17.7",
     "@substrate/connect": "^0.8.9",
-    "@subwallet/chain-list": "0.2.59",
-    "@subwallet/extension-base": "^1.1.62-0",
-    "@subwallet/extension-chains": "^1.1.62-0",
-    "@subwallet/extension-dapp": "^1.1.62-0",
-    "@subwallet/extension-inject": "^1.1.62-0",
+    "@subwallet/chain-list": "0.2.60",
+    "@subwallet/extension-base": "^1.1.64-0",
+    "@subwallet/extension-chains": "^1.1.64-0",
+    "@subwallet/extension-dapp": "^1.1.64-0",
+    "@subwallet/extension-inject": "^1.1.64-0",
     "@subwallet/keyring": "^0.1.5",
     "@subwallet/ui-keyring": "^0.1.5",
     "@walletconnect/sign-client": "^2.8.4",

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.1.62-0'
+  version: '1.1.64-0'
 };

package/services/chain-service/index.js

@@ -703,21 +703,25 @@ export class ChainService {
     }
     this.lockChainInfoMap = true;
     const initPromises = chainSlugs.map(async chainSlug => {
-      var _chainStateMap$chainS;
-      const chainInfo = chainInfoMap[chainSlug];
-      const currentState = (_chainStateMap$chainS = chainStateMap[chainSlug]) === null || _chainStateMap$chainS === void 0 ? void 0 : _chainStateMap$chainS.active;
-      if (!currentState) {
-        this.dbService.updateChainStore({
-          ...chainInfo,
-          active: true,
-          currentProvider: chainStateMap[chainSlug].currentProvider,
-          manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
-        }).catch(console.error);
-        chainStateMap[chainSlug].active = true;
-        await this.initApiForChain(chainInfo);
-        this.eventService.emit('chain.updateState', chainSlug);
-        needUpdate = true;
-      }
+      // Add try catch to prevent one chain error stop the whole process
+      try {
+        var _chainStateMap$chainS;
+        const chainInfo = chainInfoMap[chainSlug];
+        const currentState = (_chainStateMap$chainS = chainStateMap[chainSlug]) === null || _chainStateMap$chainS === void 0 ? void 0 : _chainStateMap$chainS.active;
+        if (!currentState) {
+          // Enable chain success then update chain state
+          await this.initApiForChain(chainInfo);
+          this.dbService.updateChainStore({
+            ...chainInfo,
+            active: true,
+            currentProvider: chainStateMap[chainSlug].currentProvider,
+            manualTurnOff: !!chainStateMap[chainSlug].manualTurnOff
+          }).catch(console.error);
+          chainStateMap[chainSlug].active = true;
+          this.eventService.emit('chain.updateState', chainSlug);
+          needUpdate = true;
+        }
+      } catch (e) {}
     });
     await Promise.all(initPromises);
     this.lockChainInfoMap = false;

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

@@ -448,7 +448,9 @@ export function updateLatestChainInfo(currentDataMap, latestChainInfoList) {
           providerKey
         } = randomizeProvider(currentChainInfo.providers);
         currentChainState.currentProvider = providerKey;
-        needUpdateChainApiList.push(currentChainInfo);
+        if (currentChainState.active) {
+          needUpdateChainApiList.push(currentChainInfo);
+        }
       }
       needUpdate = true;
     }

package/services/migration-service/scripts/MigrateTransactionHistoryBySymbol.js

@@ -7,10 +7,7 @@ export default class MigrateTransactionHistoryBySymbol extends BaseMigrationJob
     const state = this.state;
     try {
       const changeSlugsMap = {
-        'moonbeam-LOCAL-xcaUSD': 'moonbeam-LOCAL-xcaSEED',
-        'calamari-LOCAL-AUSD': 'calamari-LOCAL-aSEED',
-        'moonriver-LOCAL-xcaSeed': 'moonriver-LOCAL-xcaSEED',
-        'bifrost-LOCAL-KUSD': 'bifrost-LOCAL-aSEED'
+        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
       };
       const allTxs = [];
       await Promise.all(Object.entries(changeSlugsMap).map(async ([oldSlug, newSlug], i) => {

package/services/migration-service/scripts/databases/MigrateAssetSetting.js

@@ -6,10 +6,7 @@ export default class MigrateAssetSetting extends BaseMigrationJob {
   async run() {
     try {
       const changeSlugsMap = {
-        'moonbeam-LOCAL-xcaUSD': 'moonbeam-LOCAL-xcaSEED',
-        'calamari-LOCAL-AUSD': 'calamari-LOCAL-aSEED',
-        'moonriver-LOCAL-xcaSeed': 'moonriver-LOCAL-xcaSEED',
-        'bifrost-LOCAL-KUSD': 'bifrost-LOCAL-aSEED'
+        'commune-NATIVE-C': 'commune-NATIVE-COMAI'
       };
       const assetSetting = await this.state.chainService.getAssetSettings();
       const migratedAssetSetting = {};

package/services/migration-service/scripts/index.js

@@ -48,8 +48,8 @@ export default {
   '1.1.28-01': MigrateEarningVersion,
   '1.1.41-01': DeleteChainStaking,
   '1.1.46-01': AutoEnableSomeTokens,
-  '1.1.53-01': MigrateAssetSetting,
-  '1.1.53-02': MigrateTransactionHistoryBySymbol
+  '1.1.62-01': MigrateAssetSetting,
+  '1.1.62-02': MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

package/services/transaction-service/index.js

@@ -878,7 +878,7 @@ export default class TransactionService {
         maxFeePerGas: addHexPrefix(anyNumberToBN(transaction.maxFeePerGas).toString(16)),
         maxPriorityFeePerGas: addHexPrefix(anyNumberToBN(transaction.maxPriorityFeePerGas).toString(16)),
         gasLimit: addHexPrefix(anyNumberToBN(transaction.gas).toString(16)),
-        to: transaction.to !== undefined ? transaction.to : '',
+        to: transaction.to,
         value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
         data: transaction.data,
         chainId: _getEvmChainId(chainInfo),
@@ -890,7 +890,7 @@ export default class TransactionService {
         nonce: (_transaction$nonce2 = transaction.nonce) !== null && _transaction$nonce2 !== void 0 ? _transaction$nonce2 : 0,
         gasPrice: addHexPrefix(anyNumberToBN(transaction.gasPrice).toString(16)),
         gasLimit: addHexPrefix(anyNumberToBN(transaction.gas).toString(16)),
-        to: transaction.to !== undefined ? transaction.to : '',
+        to: transaction.to,
         value: addHexPrefix(anyNumberToBN(transaction.value).toString(16)),
         data: transaction.data,
         chainId: _getEvmChainId(chainInfo),
@@ -964,7 +964,7 @@ export default class TransactionService {
       maxFeePerGas: anyNumberToBN(payload.maxFeePerGas).toNumber(),
       maxPriorityFeePerGas: anyNumberToBN(payload.maxPriorityFeePerGas).toNumber(),
       gasLimit: anyNumberToBN(payload.gas).toNumber(),
-      to: payload.to !== undefined ? payload.to : '',
+      to: payload.to,
       value: anyNumberToBN(payload.value).toNumber(),
       data: payload.data,
       chainId: payload.chainId

package/services/transaction-service/utils.js

@@ -25,6 +25,9 @@ function getBlockExplorerAccountRoute(explorerLink) {
   if (explorerLink.includes('explorer.polimec.org')) {
     return 'account';
   }
+  if (explorerLink.includes('invarch.statescan.io')) {
+    return '#/accounts';
+  }
   return 'address';
 }
 function getBlockExplorerTxRoute(chainInfo) {
@@ -34,6 +37,9 @@ function getBlockExplorerTxRoute(chainInfo) {
   if (['aventus', 'deeper_network'].includes(chainInfo.slug)) {
     return 'transaction';
   }
+  if (['invarch'].includes(chainInfo.slug)) {
+    return '#/extrinsics';
+  }
   return 'extrinsic';
 }
 export function getExplorerLink(chainInfo, value, type) {

package/signers/types.d.ts

@@ -6,7 +6,7 @@ export interface QrState {
     isEthereum: boolean;
 }
 export interface Web3TransactionBase {
-    to: string;
+    to?: string;
     gasPrice: number;
     maxFeePerGas: number;
     maxPriorityFeePerGas: number;

package/utils/eth/parseTransaction/index.js

@@ -94,7 +94,7 @@ const parseResult = (type, input, name) => {
   }
 };
 export const isContractAddress = async (address, evmApi) => {
-  if (!evmApi) {
+  if (!evmApi || !address) {
     return false;
   } else {
     const code = await evmApi.api.eth.getCode(address);