@subwallet/extension-base 1.2.15-0 → 1.2.17-0

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

@@ -28,7 +28,7 @@ const filterChainInfoMap = (data, ignoredChains) => {
     return !info.bitcoinInfo && !ignoredChains.includes(slug);
   }));
 };
-const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet'];
+const ignoredList = ['bevm', 'bevmTest', 'bevm_testnet', 'layerEdge_testnet', 'merlinEvm', 'botanixEvmTest', 'syscoin_evm', 'syscoin_evm_testnet', 'rollux_evm', 'rollux_testnet', 'boolAlpha', 'boolBeta_testnet', 'core', 'satoshivm', 'satoshivm_testnet'];
 const filterAssetInfoMap = (chainInfo, assets) => {
   return Object.fromEntries(Object.entries(assets).filter(_ref2 => {
     let [, info] = _ref2;
@@ -254,7 +254,7 @@ class ChainService {
     });
   }
   getSupportedSmartContractTypes() {
-    return [_types._AssetType.ERC20, _types._AssetType.ERC721, _types._AssetType.PSP22, _types._AssetType.PSP34, _types._AssetType.GRC20, _types._AssetType.GRC721];
+    return [_types._AssetType.ERC20, _types._AssetType.ERC721, _types._AssetType.PSP22, _types._AssetType.PSP34, _types._AssetType.GRC20, _types._AssetType.GRC721, _types._AssetType.VFT];
   }
   getActiveChainInfoMap() {
     const result = {};
@@ -1479,7 +1479,7 @@ class ChainService {
   async getSmartContractTokenInfo(contractAddress, tokenType, originChain, contractCaller) {
     if ([_types._AssetType.ERC721, _types._AssetType.ERC20].includes(tokenType)) {
       return await this.evmChainHandler.getEvmContractTokenInfo(contractAddress, tokenType, originChain);
-    } else if ([_types._AssetType.PSP34, _types._AssetType.PSP22, _types._AssetType.GRC20].includes(tokenType)) {
+    } else if ([_types._AssetType.PSP34, _types._AssetType.PSP22, _types._AssetType.GRC20, _types._AssetType.VFT].includes(tokenType)) {
       return await this.substrateChainHandler.getSubstrateContractTokenInfo(contractAddress, tokenType, originChain, contractCaller);
     }
     return {
@@ -1698,6 +1698,9 @@ class ChainService {
       this.deleteCustomAssets(customToken);
     }
   }
+
+  /* Metadata */
+
   getMetadata(chain) {
     return this.dbService.stores.metadata.getMetadata(chain);
   }
@@ -1707,6 +1710,48 @@ class ChainService {
   getMetadataByHash(hash) {
     return this.dbService.stores.metadata.getMetadataByGenesisHash(hash);
   }
+  getExtraInfo(chain) {
+    var _chainInfo$substrateI2, _chainInfo$substrateI3, _chainInfo$substrateI4, _chainInfo$substrateI5, _chainInfo$substrateI6, _chainInfo$substrateI7;
+    const chainInfo = this.getChainInfoByKey(chain);
+    return {
+      decimals: (_chainInfo$substrateI2 = (_chainInfo$substrateI3 = chainInfo.substrateInfo) === null || _chainInfo$substrateI3 === void 0 ? void 0 : _chainInfo$substrateI3.decimals) !== null && _chainInfo$substrateI2 !== void 0 ? _chainInfo$substrateI2 : 0,
+      tokenSymbol: (_chainInfo$substrateI4 = (_chainInfo$substrateI5 = chainInfo.substrateInfo) === null || _chainInfo$substrateI5 === void 0 ? void 0 : _chainInfo$substrateI5.symbol) !== null && _chainInfo$substrateI4 !== void 0 ? _chainInfo$substrateI4 : 'Unit',
+      base58Prefix: (_chainInfo$substrateI6 = (_chainInfo$substrateI7 = chainInfo.substrateInfo) === null || _chainInfo$substrateI7 === void 0 ? void 0 : _chainInfo$substrateI7.addressPrefix) !== null && _chainInfo$substrateI6 !== void 0 ? _chainInfo$substrateI6 : 42
+    };
+  }
+  async calculateMetadataHash(chain) {
+    const metadata = await this.getMetadata(chain);
+    if (!metadata || !metadata.hexV15) {
+      return undefined;
+    }
+    const extraInfo = this.getExtraInfo(chain);
+    const specVersion = parseInt(metadata.specVersion);
+    const specName = metadata.specName;
+    const hexV15 = metadata.hexV15;
+    return (0, _utils2.calculateMetadataHash)({
+      ...extraInfo,
+      specVersion,
+      specName
+    }, hexV15);
+  }
+  async shortenMetadata(chain, txBlob) {
+    const metadata = await this.getMetadata(chain);
+    if (!metadata || !metadata.hexV15) {
+      return undefined;
+    }
+    const extraInfo = this.getExtraInfo(chain);
+    const specVersion = parseInt(metadata.specVersion);
+    const specName = metadata.specName;
+    const hexV15 = metadata.hexV15;
+    return (0, _utils2.getShortMetadata)(txBlob, {
+      ...extraInfo,
+      specVersion,
+      specName
+    }, hexV15);
+  }
+
+  /* Metadata */
+
   getSubscanChainMap(reverse) {
     const result = {};
     const chainInfoMap = this.getChainInfoMap();

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

@@ -18,7 +18,7 @@ exports._ChainConnectionStatus = _ChainConnectionStatus;
 })(_ChainConnectionStatus || (exports._ChainConnectionStatus = _ChainConnectionStatus = {}));
 const _CUSTOM_PREFIX = 'custom-';
 exports._CUSTOM_PREFIX = _CUSTOM_PREFIX;
-const _FUNGIBLE_CONTRACT_STANDARDS = [_types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.GRC20];
+const _FUNGIBLE_CONTRACT_STANDARDS = [_types._AssetType.ERC20, _types._AssetType.PSP22, _types._AssetType.GRC20, _types._AssetType.VFT];
 exports._FUNGIBLE_CONTRACT_STANDARDS = _FUNGIBLE_CONTRACT_STANDARDS;
 const _NFT_CONTRACT_STANDARDS = [_types._AssetType.PSP34, _types._AssetType.ERC721];
 exports._NFT_CONTRACT_STANDARDS = _NFT_CONTRACT_STANDARDS;

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

@@ -38,6 +38,7 @@ var _exportNames = {
   _isChainSupportEvmERC20: true,
   _isChainSupportWasmPSP22: true,
   _isChainSupportGRC20: true,
+  _isChainSupportVFT: true,
   _isSupportOrdinal: true,
   _getNftTypesSupportedByChain: true,
   _getTokenTypesSupportedByChain: true,
@@ -131,6 +132,7 @@ exports._isChainSupportEvmNft = _isChainSupportEvmNft;
 exports._isChainSupportGRC20 = _isChainSupportGRC20;
 exports._isChainSupportNativeNft = _isChainSupportNativeNft;
 exports._isChainSupportSubstrateStaking = _isChainSupportSubstrateStaking;
+exports._isChainSupportVFT = _isChainSupportVFT;
 exports._isChainSupportWasmNft = _isChainSupportWasmNft;
 exports._isChainSupportWasmPSP22 = _isChainSupportWasmPSP22;
 exports._isChainTestNet = _isChainTestNet;
@@ -357,6 +359,10 @@ function _isChainSupportGRC20(chainInfo) {
   var _chainInfo$substrateI12, _chainInfo$substrateI13;
   return ((_chainInfo$substrateI12 = chainInfo.substrateInfo) === null || _chainInfo$substrateI12 === void 0 ? void 0 : (_chainInfo$substrateI13 = _chainInfo$substrateI12.supportSmartContract) === null || _chainInfo$substrateI13 === void 0 ? void 0 : _chainInfo$substrateI13.includes(_types._AssetType.GRC20)) || false;
 }
+function _isChainSupportVFT(chainInfo) {
+  var _chainInfo$substrateI14, _chainInfo$substrateI15;
+  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : (_chainInfo$substrateI15 = _chainInfo$substrateI14.supportSmartContract) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.includes(_types._AssetType.VFT)) || false;
+}
 const _isSupportOrdinal = chain => {
   const chains = ['polkadot', 'astar', 'bifrost_dot', 'moonbeam'];
   return chains.includes(chain);
@@ -384,7 +390,7 @@ function _getTokenTypesSupportedByChain(chainInfo) {
   const result = [];
   if (chainInfo.substrateInfo && chainInfo.substrateInfo.supportSmartContract) {
     chainInfo.substrateInfo.supportSmartContract.forEach(assetType => {
-      if ([_types._AssetType.PSP22, _types._AssetType.GRC20].includes(assetType)) {
+      if ([_types._AssetType.PSP22, _types._AssetType.GRC20, _types._AssetType.VFT].includes(assetType)) {
         result.push(assetType);
       }
     });
@@ -441,7 +447,7 @@ function _isAssetSmartContractNft(assetInfo) {
   return [_types._AssetType.PSP34, _types._AssetType.ERC721].includes(assetInfo.assetType);
 }
 function _isTokenGearSmartContract(tokenInfo) {
-  return [_types._AssetType.GRC20, _types._AssetType.GRC721].includes(tokenInfo.assetType);
+  return [_types._AssetType.GRC20, _types._AssetType.GRC721, _types._AssetType.VFT].includes(tokenInfo.assetType);
 }
 function _parseAssetRefKey(originTokenSlug, destinationTokenSlug) {
   return `${originTokenSlug}___${destinationTokenSlug}`;
@@ -473,12 +479,12 @@ function _isRelayChain(chainInfo) {
   return _isSubstrateRelayChain(chainInfo) || _isPureEvmChain(chainInfo);
 }
 function _isSubstrateRelayChain(chainInfo) {
-  var _chainInfo$substrateI14;
-  return ((_chainInfo$substrateI14 = chainInfo.substrateInfo) === null || _chainInfo$substrateI14 === void 0 ? void 0 : _chainInfo$substrateI14.chainType) === _types._SubstrateChainType.RELAYCHAIN;
+  var _chainInfo$substrateI16;
+  return ((_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.chainType) === _types._SubstrateChainType.RELAYCHAIN;
 }
 function _isSubstrateParaChain(chainInfo) {
-  var _chainInfo$substrateI15;
-  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI15 = chainInfo.substrateInfo) === null || _chainInfo$substrateI15 === void 0 ? void 0 : _chainInfo$substrateI15.chainType) === _types._SubstrateChainType.PARACHAIN;
+  var _chainInfo$substrateI17;
+  return chainInfo.substrateInfo !== null && chainInfo.substrateInfo.paraId !== null && ((_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.chainType) === _types._SubstrateChainType.PARACHAIN;
 }
 function _getEvmAbiExplorer(chainInfo) {
   var _chainInfo$evmInfo4;
@@ -523,8 +529,8 @@ function _getBlockExplorerFromChain(chainInfo) {
     var _chainInfo$evmInfo5;
     blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$evmInfo5 = chainInfo.evmInfo) === null || _chainInfo$evmInfo5 === void 0 ? void 0 : _chainInfo$evmInfo5.blockExplorer;
   } else {
-    var _chainInfo$substrateI16;
-    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI16 = chainInfo.substrateInfo) === null || _chainInfo$substrateI16 === void 0 ? void 0 : _chainInfo$substrateI16.blockExplorer;
+    var _chainInfo$substrateI18;
+    blockExplorer = chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.blockExplorer;
   }
   if (!blockExplorer) {
     return undefined;
@@ -551,8 +557,8 @@ const _isAssetAutoEnable = chainAsset => {
 };
 exports._isAssetAutoEnable = _isAssetAutoEnable;
 function _getCrowdloanUrlFromChain(chainInfo) {
-  var _chainInfo$substrateI17;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI17 = chainInfo.substrateInfo) === null || _chainInfo$substrateI17 === void 0 ? void 0 : _chainInfo$substrateI17.crowdloanUrl) || '';
+  var _chainInfo$substrateI19;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI19 = chainInfo.substrateInfo) === null || _chainInfo$substrateI19 === void 0 ? void 0 : _chainInfo$substrateI19.crowdloanUrl) || '';
 }
 function _isCustomProvider(providerKey) {
   return providerKey.startsWith(_types2._CUSTOM_PREFIX);
@@ -590,8 +596,8 @@ function _isMantaZkAsset(chainAsset) {
   return _constants._MANTA_ZK_CHAIN_GROUP.includes(chainAsset.originChain) && chainAsset.symbol.startsWith(_constants._ZK_ASSET_PREFIX);
 }
 function _getChainExistentialDeposit(chainInfo) {
-  var _chainInfo$substrateI18;
-  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI18 = chainInfo.substrateInfo) === null || _chainInfo$substrateI18 === void 0 ? void 0 : _chainInfo$substrateI18.existentialDeposit) || '0';
+  var _chainInfo$substrateI20;
+  return (chainInfo === null || chainInfo === void 0 ? void 0 : (_chainInfo$substrateI20 = chainInfo.substrateInfo) === null || _chainInfo$substrateI20 === void 0 ? void 0 : _chainInfo$substrateI20.existentialDeposit) || '0';
 }
 function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {

package/cjs/services/earning-service/handlers/native-staking/relay-chain.js

@@ -320,11 +320,20 @@ class RelayNativeStakingPoolHandler extends _base.default {
     const topValidatorList = (0, _utils.getRelayTopValidatorByPoints)(validatorPointsMap);
     const validators = _validators;
     const blockedValidatorList = (0, _utils.getRelayBlockedValidatorList)(validators);
+    const waitingValidatorList = (0, _utils.getRelayWaitingValidatorList)(validators);
+    const _waitingValidatorLedger = await chainApi.api.query.staking.ledger.multi(waitingValidatorList);
+    const waitingValidatorLedger = {};
+    if (_waitingValidatorLedger) {
+      waitingValidatorList.forEach((validator, i) => {
+        const validatorLedger = _waitingValidatorLedger[i].toPrimitive();
+        waitingValidatorLedger[validator] = new _bignumber.default(validatorLedger.total).toFixed();
+      });
+    }
     const unlimitedNominatorRewarded = chainApi.api.consts.staking.maxExposurePageSize !== undefined;
     const maxNominatorRewarded = (chainApi.api.consts.staking.maxNominatorRewardedPerValidator || 0).toString();
     const bnTotalEraStake = new _util.BN(_totalEraStake.toString());
     const minBond = _minBond.toPrimitive();
-    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
+    const [totalStakeMap, allValidatorAddresses, validatorInfoList] = this.parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorLedger, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded);
     const extraInfoMap = {};
     await Promise.all(allValidatorAddresses.map(async address => {
       // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -359,11 +368,15 @@ class RelayNativeStakingPoolHandler extends _base.default {
       const validatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals).toNumber();
       return (0, _utils.calculateTernoaValidatorReturn)(rewardPerValidator.toNumber(), validatorStake, commission);
     } else {
-      const bnValidatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals);
-      return (0, _utils.calculateValidatorStakedReturn)(totalApy, bnValidatorStake, bnAvgStake, commission);
+      if (!totalStakeMap[validator.address]) {
+        return totalApy;
+      } else {
+        const bnValidatorStake = (0, _utils3.applyDecimal)(totalStakeMap[validator.address], decimals);
+        return (0, _utils.calculateValidatorStakedReturn)(totalApy, bnValidatorStake, bnAvgStake, commission);
+      }
     }
   }
-  parseEraStakerData(_eraStakers, blockedValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
+  parseEraStakerData(_eraStakers, blockedValidatorList, waitingValidatorList, topValidatorList, validatorPointsMap, minBond, maxNominatorRewarded, unlimitedNominatorRewarded) {
     const totalStakeMap = {};
     const allValidatorAddresses = [];
     const validatorInfoList = [];
@@ -413,6 +426,27 @@ class RelayNativeStakingPoolHandler extends _base.default {
         });
       }
     }
+    for (const waitingValidator of Object.keys(waitingValidatorList)) {
+      if (!allValidatorAddresses.includes(waitingValidator)) {
+        allValidatorAddresses.push(waitingValidator);
+        validatorInfoList.push({
+          address: waitingValidator,
+          totalStake: waitingValidatorList[waitingValidator],
+          ownStake: waitingValidatorList[waitingValidator],
+          otherStake: '0',
+          nominatorCount: 0,
+          // to be added later
+          commission: 0,
+          expectedReturn: 0,
+          blocked: false,
+          isVerified: false,
+          minBond: minBond.toString(),
+          isCrowded: false,
+          eraRewardPoint: '0',
+          topQuartile: false
+        });
+      }
+    }
     return [totalStakeMap, allValidatorAddresses, validatorInfoList];
   }
   /* Get pool targets */

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

@@ -144,6 +144,9 @@ class EarningService {
           if (event.type === 'account.remove') {
             removedAddresses.push(event.data[0]);
           }
+          if (event.type === 'account.add') {
+            delayReload = true;
+          }
           if (event.type === 'chain.updateState') {
             const chainState = this.state.getChainStateByKey(event.data[0]);
             if (chainState && !(0, _utils._isChainEnabled)(chainState)) {

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

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Base = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/Base"));
+var _utils = require("@subwallet/extension-base/utils");
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
@@ -13,6 +14,21 @@ class ClearMetadataDatabase extends _Base.default {
   async run() {
     // Clear all old metadata data
     await this.state.dbService.stores.metadata.clear();
+    const activeChains = this.state.chainService.getActiveChains();
+    const chainInfoMap = this.state.chainService.getChainInfoMap();
+    const reloadChains = activeChains.filter(chain => {
+      var _chainInfoMap$chain$s;
+      return !!((_chainInfoMap$chain$s = chainInfoMap[chain].substrateInfo) !== null && _chainInfoMap$chain$s !== void 0 && _chainInfoMap$chain$s.genesisHash);
+    });
+    for (const chain of reloadChains) {
+      const substrateApi = this.state.chainService.getSubstrateApi(chain);
+      const callback = substrateApi => {
+        (0, _utils.cacheMetadata)(chain, substrateApi, this.state.chainService);
+      };
+      Promise.race([substrateApi.isReady, (0, _utils.waitTimeout)(2000)]).finally(() => {
+        substrateApi === null || substrateApi === void 0 ? void 0 : substrateApi.connect(callback);
+      });
+    }
     return Promise.resolve();
   }
 }

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

@@ -5,14 +5,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.EVERYTIME = void 0;
-var _AutoEnableSomeTokens = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/AutoEnableSomeTokens"));
-var _ReloadMetadata = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/databases/ReloadMetadata"));
-var _DeleteEarningData = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/DeleteEarningData"));
-var _MigrateRemoveGenesisHash = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateRemoveGenesisHash"));
-var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("@subwallet/extension-base/services/migration-service/scripts/MigrateTransactionHistoryBySymbol"));
+var _AutoEnableSomeTokens = _interopRequireDefault(require("./databases/AutoEnableSomeTokens"));
 var _ClearMetadataDatabase = _interopRequireDefault(require("./databases/ClearMetadataDatabase"));
 var _MigrateAssetSetting = _interopRequireDefault(require("./databases/MigrateAssetSetting"));
 var _MigrateEarningVersion = _interopRequireDefault(require("./databases/MigrateEarningVersion"));
+var _ReloadMetadata = _interopRequireDefault(require("./databases/ReloadMetadata"));
 var _MigrateEthProvider = _interopRequireDefault(require("./providers/MigrateEthProvider"));
 var _MigratePioneerProvider = _interopRequireDefault(require("./providers/MigratePioneerProvider"));
 var _MigrateProvidersV1M1P = _interopRequireDefault(require("./providers/MigrateProvidersV1M1P24"));
@@ -20,6 +17,7 @@ var _MigratePolygonUSDCProvider = _interopRequireDefault(require("./tokens/Migra
 var _AutoEnableChainsTokens = _interopRequireDefault(require("./AutoEnableChainsTokens"));
 var _DeleteChain = _interopRequireDefault(require("./DeleteChain"));
 var _DeleteChainStaking = _interopRequireDefault(require("./DeleteChainStaking"));
+var _DeleteEarningData = _interopRequireDefault(require("./DeleteEarningData"));
 var _EnableVaraChain = _interopRequireDefault(require("./EnableVaraChain"));
 var _MigrateAuthUrls = _interopRequireDefault(require("./MigrateAuthUrls"));
 var _MigrateAutoLock = _interopRequireDefault(require("./MigrateAutoLock"));
@@ -28,9 +26,11 @@ var _MigrateImportedToken = _interopRequireDefault(require("./MigrateImportedTok
 var _MigrateLedgerAccount = _interopRequireDefault(require("./MigrateLedgerAccount"));
 var _MigrateLedgerAccountV = _interopRequireDefault(require("./MigrateLedgerAccountV2"));
 var _MigrateNetworkSettings = _interopRequireDefault(require("./MigrateNetworkSettings"));
+var _MigrateRemoveGenesisHash = _interopRequireDefault(require("./MigrateRemoveGenesisHash"));
 var _MigrateSettings = _interopRequireDefault(require("./MigrateSettings"));
 var _MigrateTokenDecimals = _interopRequireDefault(require("./MigrateTokenDecimals"));
 var _MigrateTransactionHistory = _interopRequireDefault(require("./MigrateTransactionHistory"));
+var _MigrateTransactionHistoryBySymbol = _interopRequireDefault(require("./MigrateTransactionHistoryBySymbol"));
 var _MigrateWalletReference = _interopRequireDefault(require("./MigrateWalletReference"));
 // Copyright 2019-2022 @subwallet/extension-koni authors & contributors
 // SPDX-License-Identifier: Apache-2.0
@@ -64,8 +64,8 @@ var _default = {
   '1.1.69-03': _MigrateAssetSetting.default,
   '1.1.69-02': _MigrateTransactionHistoryBySymbol.default,
   '1.2.69-01': _MigrateRemoveGenesisHash.default,
-  '1.2.1-01': _ClearMetadataDatabase.default,
-  '1.2.13-01': _ReloadMetadata.default
+  '1.2.13-01': _ReloadMetadata.default,
+  '1.2.14-01': _ClearMetadataDatabase.default
   // [`${EVERYTIME}-1.1.42-02`]: MigrateTransactionHistoryBySymbol
   // [`${EVERYTIME}-1`]: AutoEnableChainsTokens
 };

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

@@ -1047,20 +1047,25 @@ class TransactionService {
     const signerOption = {
       signer: {
         signPayload: async payload => {
-          const signing = await this.state.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload);
+          const {
+            signature,
+            signedTransaction
+          } = await this.state.requestService.signInternalTransaction(id, address, url || _constants2.EXTENSION_REQUEST_URL, payload);
           return {
             id: new Date().getTime(),
-            signature: signing.signature
+            signature,
+            signedTransaction
           };
         }
-      }
+      },
+      withSignedTransaction: true
     };
     if ((0, _utils3._isRuntimeUpdated)(signedExtensions)) {
-      try {
-        const metadataHash = await (0, _utils3.getMetadataHash)(chain);
+      const metadataHash = await this.state.chainService.calculateMetadataHash(chain);
+      if (metadataHash) {
         signerOption.mode = 1;
-        signerOption.metadataHash = `0x${metadataHash}`;
-      } catch (e) {}
+        signerOption.metadataHash = metadataHash;
+      }
     }
     extrinsic.signAsync(address, signerOption).then(async rs => {
       // Emit signed event

package/cjs/utils/gear/combine.js

@@ -0,0 +1,28 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.GEAR_DEFAULT_ADDRESS = exports.DEFAULT_GEAR_ADDRESS = void 0;
+exports.getGRC20ContractPromise = getGRC20ContractPromise;
+exports.getVFTContractPromise = getVFTContractPromise;
+var _grc = require("./grc20");
+var _vft = require("./vft");
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const DEFAULT_GEAR_ADDRESS = {
+  ALICE: '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
+  BOB: '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'
+};
+exports.DEFAULT_GEAR_ADDRESS = DEFAULT_GEAR_ADDRESS;
+const GEAR_DEFAULT_ADDRESS = '5EYCAe5ijiYfAXEth5DGRKiKuVjTXQKr877tUPz6eLz2t9aG';
+exports.GEAR_DEFAULT_ADDRESS = GEAR_DEFAULT_ADDRESS;
+function getGRC20ContractPromise(apiPromise, contractAddress) {
+  const gearApi = apiPromise;
+  return new _grc.GRC20(gearApi, contractAddress);
+}
+function getVFTContractPromise(apiPromise, contractAddress) {
+  const gearApi = apiPromise;
+  return new _vft.VFT(gearApi, contractAddress);
+}

package/cjs/utils/gear/grc20.js

@@ -3,21 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GRC20 = exports.DEFAULT_GEAR_ADDRESS = void 0;
-exports.getGRC20ContractPromise = getGRC20ContractPromise;
+exports.Grc20Service = exports.GRC20 = void 0;
 var _api = require("@gear-js/api");
 var _sailsJs = require("sails-js");
 var _types = require("@polkadot/types");
-// Copyright 2019-2022 @subwallet/extension-base
+// Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// https://github.com/breathx/gear-erc20/blob/master/js/src/lib.ts
-
-const DEFAULT_GEAR_ADDRESS = {
-  ALICE: '5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY',
-  BOB: '5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty'
-};
-exports.DEFAULT_GEAR_ADDRESS = DEFAULT_GEAR_ADDRESS;
 class GRC20 {
   constructor(api) {
     let programId = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '0x';
@@ -32,6 +24,7 @@ class GRC20 {
       types
     });
     this.registry.register(types);
+    this.service = new Grc20Service(this);
   }
   newCtorFromCode(code, name, symbol, decimals) {
     const builder = new _sailsJs.TransactionBuilder(this.api, this.registry, 'upload_program', ['New', name, symbol, decimals], '(String, String, String, u8)', 'String', code);
@@ -43,99 +36,113 @@ class GRC20 {
     this.programId = builder.programId;
     return builder;
   }
+}
+exports.GRC20 = GRC20;
+class Grc20Service {
+  constructor(_program) {
+    this._program = _program;
+  }
   approve(spender, value) {
-    return new _sailsJs.TransactionBuilder(this.api, this.registry, 'send_message', ['Approve', spender, value], '(String, ActorId, U256)', 'bool', this.programId);
+    if (!this._program.programId) {
+      throw new Error('Program ID is not set');
+    }
+    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Approve', spender, value], '(String, ActorId, U256)', 'bool', this._program.programId);
   }
   fromTransfer(from, to, value) {
-    return new _sailsJs.TransactionBuilder(this.api, this.registry, 'send_message', ['FromTransfer', from, to, value], '(String, ActorId, ActorId, U256)', 'bool', this.programId);
+    if (!this._program.programId) {
+      throw new Error('Program ID is not set');
+    }
+    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['FromTransfer', from, to, value], '(String, ActorId, ActorId, U256)', 'bool', this._program.programId);
   }
   setBalance(newBalance) {
-    return new _sailsJs.TransactionBuilder(this.api, this.registry, 'send_message', ['SetBalance', newBalance], '(String, U256)', 'bool', this.programId);
+    if (!this._program.programId) {
+      throw new Error('Program ID is not set');
+    }
+    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['SetBalance', newBalance], '(String, U256)', 'bool', this._program.programId);
   }
   transfer(to, value) {
-    return new _sailsJs.TransactionBuilder(this.api, this.registry, 'send_message', ['Transfer', to, value], '(String, ActorId, U256)', 'bool', this.programId);
+    if (!this._program.programId) {
+      throw new Error('Program ID is not set');
+    }
+    return new _sailsJs.TransactionBuilder(this._program.api, this._program.registry, 'send_message', ['Transfer', to, value], '(String, ActorId, U256)', 'bool', this._program.programId);
   }
   async allowance(owner, spender, originAddress, value, atBlock) {
-    const payload = this.registry.createType('(String, ActorId, ActorId)', ['Allowance', owner, spender]).toU8a();
-    const reply = await this.api.message.calculateReply({
-      destination: this.programId,
+    const payload = this._program.registry.createType('(String, ActorId, ActorId)', ['Allowance', owner, spender]).toHex();
+    const reply = await this._program.api.message.calculateReply({
+      destination: this._program.programId,
       origin: (0, _api.decodeAddress)(originAddress),
       payload,
       value: value || 0,
-      gasLimit: this.api.blockGasLimit.toBigInt(),
+      gasLimit: this._program.api.blockGasLimit.toBigInt(),
       at: atBlock
     });
-    const result = this.registry.createType('(String, U256)', reply.payload);
+    const result = this._program.registry.createType('(String, U256)', reply.payload);
     return result[1].toBigInt();
   }
   async balanceOf(owner, originAddress, value, atBlock) {
-    const payload = this.registry.createType('(String, ActorId)', ['BalanceOf', owner]).toU8a();
-    const reply = await this.api.message.calculateReply({
-      destination: this.programId,
+    const payload = this._program.registry.createType('(String, ActorId)', ['BalanceOf', owner]).toHex();
+    const reply = await this._program.api.message.calculateReply({
+      destination: this._program.programId,
       origin: (0, _api.decodeAddress)(originAddress),
       payload,
       value: value || 0,
-      gasLimit: this.api.blockGasLimit.toBigInt(),
+      gasLimit: this._program.api.blockGasLimit.toBigInt(),
       at: atBlock
     });
-    const result = this.registry.createType('(String, U256)', reply.payload);
+    const result = this._program.registry.createType('(String, U256)', reply.payload);
     return result[1].toBigInt();
   }
   async decimals(originAddress, value, atBlock) {
-    const payload = this.registry.createType('String', 'Decimals').toU8a();
-    const reply = await this.api.message.calculateReply({
-      destination: this.programId,
+    const payload = this._program.registry.createType('String', 'Decimals').toHex();
+    const reply = await this._program.api.message.calculateReply({
+      destination: this._program.programId,
       origin: (0, _api.decodeAddress)(originAddress),
       payload,
       value: value || 0,
-      gasLimit: this.api.blockGasLimit.toBigInt(),
+      gasLimit: this._program.api.blockGasLimit.toBigInt(),
       at: atBlock
     });
-    const result = this.registry.createType('(String, u8)', reply.payload);
+    const result = this._program.registry.createType('(String, u8)', reply.payload);
     return result[1].toNumber();
   }
   async name(originAddress, value, atBlock) {
-    const payload = this.registry.createType('String', 'Name').toU8a();
-    const reply = await this.api.message.calculateReply({
-      destination: this.programId,
+    const payload = this._program.registry.createType('String', 'Name').toHex();
+    const reply = await this._program.api.message.calculateReply({
+      destination: this._program.programId,
       origin: (0, _api.decodeAddress)(originAddress),
       payload,
       value: value || 0,
-      gasLimit: this.api.blockGasLimit.toBigInt(),
+      gasLimit: this._program.api.blockGasLimit.toBigInt(),
       at: atBlock
     });
-    const result = this.registry.createType('(String, String)', reply.payload);
+    const result = this._program.registry.createType('(String, String)', reply.payload);
     return result[1].toString();
   }
   async symbol(originAddress, value, atBlock) {
-    const payload = this.registry.createType('String', 'Symbol').toU8a();
-    const reply = await this.api.message.calculateReply({
-      destination: this.programId,
+    const payload = this._program.registry.createType('String', 'Symbol').toHex();
+    const reply = await this._program.api.message.calculateReply({
+      destination: this._program.programId,
       origin: (0, _api.decodeAddress)(originAddress),
       payload,
       value: value || 0,
-      gasLimit: this.api.blockGasLimit.toBigInt(),
+      gasLimit: this._program.api.blockGasLimit.toBigInt(),
       at: atBlock
     });
-    const result = this.registry.createType('(String, String)', reply.payload);
+    const result = this._program.registry.createType('(String, String)', reply.payload);
     return result[1].toString();
   }
   async totalSupply(originAddress, value, atBlock) {
-    const payload = this.registry.createType('String', 'TotalSupply').toU8a();
-    const reply = await this.api.message.calculateReply({
-      destination: this.programId,
+    const payload = this._program.registry.createType('String', 'TotalSupply').toHex();
+    const reply = await this._program.api.message.calculateReply({
+      destination: this._program.programId,
       origin: (0, _api.decodeAddress)(originAddress),
       payload,
       value: value || 0,
-      gasLimit: this.api.blockGasLimit.toBigInt(),
+      gasLimit: this._program.api.blockGasLimit.toBigInt(),
       at: atBlock
     });
-    const result = this.registry.createType('(String, U256)', reply.payload);
+    const result = this._program.registry.createType('(String, U256)', reply.payload);
     return result[1].toBigInt();
   }
 }
-exports.GRC20 = GRC20;
-function getGRC20ContractPromise(apiPromise, contractAddress) {
-  const gearApi = apiPromise;
-  return new GRC20(gearApi, contractAddress);
-}
+exports.Grc20Service = Grc20Service;

package/cjs/utils/gear/index.js

@@ -3,6 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+var _combine = require("./combine");
+Object.keys(_combine).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _combine[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _combine[key];
+    }
+  });
+});
 var _grc = require("./grc20");
 Object.keys(_grc).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
@@ -13,4 +24,15 @@ Object.keys(_grc).forEach(function (key) {
       return _grc[key];
     }
   });
+});
+var _vft = require("./vft");
+Object.keys(_vft).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _vft[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _vft[key];
+    }
+  });
 });