@subwallet/extension-base 1.2.24-0 → 1.2.24-2

package/services/chain-service/handler/SubstrateApi.js

@@ -7,16 +7,13 @@ import { GearApi } from '@gear-js/api';
 import { rpc as oakRpc, types as oakTypes } from '@oak-foundation/types';
 import { _API_OPTIONS_CHAIN_GROUP, API_AUTO_CONNECT_MS, API_CONNECT_TIMEOUT } from '@subwallet/extension-base/services/chain-service/constants';
 import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/chain-service/handler/light-client';
-import { DEFAULT_AUX } from '@subwallet/extension-base/services/chain-service/handler/SubstrateChainHandler';
 import { _ChainConnectionStatus } from '@subwallet/extension-base/services/chain-service/types';
 import { createPromiseHandler } from '@subwallet/extension-base/utils/promise';
 import { goldbergRpc, goldbergTypes, spec as availSpec } from 'avail-js-sdk';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, combineLatest, map, Observable } from 'rxjs';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { typesBundle as _typesBundle } from '@polkadot/apps-config/api';
 import { TypeRegistry } from '@polkadot/types/create';
-import { formatBalance } from '@polkadot/util';
-import { defaults as addressDefaults } from '@polkadot/util-crypto/address/defaults';
 const typesBundle = {
   ..._typesBundle
 };
@@ -56,6 +53,11 @@ export class SubstrateApi {
       this.connectionStatusSubject.next(status);
     }
   }
+
+  // apiDefaultTx?: SubmittableExtrinsicFunction;
+  // apiDefaultTxSudo?: SubmittableExtrinsicFunction;
+  // defaultFormatBalance?: _SubstrateDefaultFormatBalance;
+
   specName = '';
   specVersion = '';
   systemChain = '';
@@ -224,43 +226,134 @@ export class SubstrateApi {
     console.warn(`${this.chainSlug} connection got error`, e);
   }
   async fillApiInfo() {
-    var _api$rpc$system, _api$rpc$system2, _api$rpc$system3;
-    const {
-      api,
-      registry
-    } = this;
-    const DEFAULT_DECIMALS = registry.createType('u32', 12);
-    const DEFAULT_SS58 = registry.createType('u32', addressDefaults.prefix);
+    // const { registry } = this;
+    // const DEFAULT_DECIMALS = registry.createType('u32', 12);
+    // const DEFAULT_SS58 = registry.createType('u32', addressDefaults.prefix);
+
     this.specName = this.api.runtimeVersion.specName.toString();
     this.specVersion = this.api.runtimeVersion.specVersion.toString();
-    const [systemChain, systemName, systemVersion] = await Promise.all([(_api$rpc$system = api.rpc.system) === null || _api$rpc$system === void 0 ? void 0 : _api$rpc$system.chain(), (_api$rpc$system2 = api.rpc.system) === null || _api$rpc$system2 === void 0 ? void 0 : _api$rpc$system2.name(), (_api$rpc$system3 = api.rpc.system) === null || _api$rpc$system3 === void 0 ? void 0 : _api$rpc$system3.version()]);
+    const [systemChain, systemName, systemVersion] = await Promise.all([this.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'chain'
+    }), this.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'name'
+    }), this.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'version'
+    })]);
     this.systemChain = systemChain.toString();
     this.systemName = systemName.toString();
     this.systemVersion = systemVersion.toString();
-    const properties = registry.createType('ChainProperties', {
-      ss58Format: api.registry.chainSS58,
-      tokenDecimals: api.registry.chainDecimals,
-      tokenSymbol: api.registry.chainTokens
-    });
-    const ss58Format = properties.ss58Format.unwrapOr(DEFAULT_SS58).toNumber();
-    const tokenSymbol = properties.tokenSymbol.unwrapOr([formatBalance.getDefaults().unit, ...DEFAULT_AUX]);
-    const tokenDecimals = properties.tokenDecimals.unwrapOr([DEFAULT_DECIMALS]);
-    registry.setChainProperties(registry.createType('ChainProperties', {
-      ss58Format,
-      tokenDecimals,
-      tokenSymbol
-    }));
+
+    // const [ss58Format, tokenDecimals, tokenSymbol] = await Promise.all([
+    //   this.makeRpcQuery<number | undefined>({ section: 'registry', module: 'chainSS58' }),
+    //   this.makeRpcQuery<number[]>({ section: 'registry', module: 'chainDecimals' }),
+    //   this.makeRpcQuery<string[]>({ section: 'registry', module: 'chainTokens' })
+    // ]);
+    //
+    // const properties = registry.createType('ChainProperties', {
+    //   ss58Format,
+    //   tokenDecimals,
+    //   tokenSymbol
+    // });
+    // const ss58Format = properties.ss58Format.unwrapOr(DEFAULT_SS58).toNumber();
+    // const tokenSymbol = properties.tokenSymbol.unwrapOr([formatBalance.getDefaults().unit, ...DEFAULT_AUX]);
+    // const tokenDecimals = properties.tokenDecimals.unwrapOr([DEFAULT_DECIMALS]);
+    //
+    // registry.setChainProperties(registry.createType('ChainProperties', { ss58Format, tokenDecimals, tokenSymbol }));
 
     // first set up the UI helpers
-    this.defaultFormatBalance = {
-      decimals: tokenDecimals.map(b => {
-        return b.toNumber();
-      }),
-      unit: tokenSymbol[0].toString()
-    };
-    const defaultSection = Object.keys(api.tx)[0];
-    const defaultMethod = Object.keys(api.tx[defaultSection])[0];
-    this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
-    this.apiDefaultTxSudo = api.tx.system && api.tx.system.setCode || this.apiDefaultTx;
+    // this.defaultFormatBalance = {
+    //   decimals: tokenDecimals.map((b: BN) => {
+    //     return b.toNumber();
+    //   }),
+    //   unit: tokenSymbol[0].toString()
+    // };
+    //
+    // const defaultSection = Object.keys(api.tx)[0];
+    // const defaultMethod = Object.keys(api.tx[defaultSection])[0];
+
+    // this.apiDefaultTx = api.tx[defaultSection][defaultMethod];
+    // this.apiDefaultTxSudo = (api.tx.system && api.tx.system.setCode) || this.apiDefaultTx;
+  }
+
+  async makeRpcQuery({
+    args,
+    method,
+    module,
+    section
+  }) {
+    const isGetterCall = section === 'genesisHash' || section === 'extrinsicVersion' || section === 'runtimeVersion' || section === 'runtimeMetadata' || section === 'registry';
+    const isRuntimeConstQuery = section === 'consts' && !!method && !!module && !args;
+    const isRpcQuery = section === 'rpc' && !!method && !!module && !args;
+    const isStateQuery = section === 'query' && method && module;
+    if (isGetterCall) {
+      if (section === 'genesisHash') {
+        return this.api[section].toHex();
+      } else if (section === 'extrinsicVersion') {
+        return this.api[section];
+      } else if (section === 'runtimeVersion') {
+        return this.api[section].toPrimitive();
+      } else if (section === 'runtimeMetadata') {
+        return this.api[section].toHex();
+      } else if (section === 'registry') {
+        return this.api[section];
+      }
+    }
+    if (isRuntimeConstQuery) {
+      if (!this.api[section][module]) {
+        return undefined;
+      }
+      return this.api[section][module][method].toPrimitive();
+    }
+    if (isRpcQuery) {
+      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      if (!this.api[section][module]) {
+        return undefined;
+      }
+
+      // @ts-ignore
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call,@typescript-eslint/no-unsafe-member-access
+      return (await this.api[section][module][method]()).toPrimitive(); // todo: improve this
+    }
+
+    if (isStateQuery) {
+      if (!this.api[section][module]) {
+        return undefined;
+      }
+      if (args) {
+        return (await this.api[section][module][method](...args)).toPrimitive();
+      } else {
+        return (await this.api[section][module][method]()).toPrimitive();
+      }
+    }
+    return Promise.reject(new Error('Cannot handle query'));
+  }
+  subscribeDataWithMulti(params, callback) {
+    const apiRx = this.api.rx;
+    const observables = {};
+    params.forEach(queryParams => {
+      const {
+        args,
+        method,
+        module,
+        section
+      } = queryParams;
+      const key = `${section}_${module}_${method}`;
+      if (!this.api[section][module] || !this.api[section][module][method]) {
+        // if method not found, returns an empty observable
+        observables[key] = new Observable(subscriber => {
+          subscriber.next([]);
+        });
+      } else {
+        observables[key] = apiRx[section][module][method].multi(args).pipe(map(codecs => codecs.map(codec => codec.toPrimitive())));
+      }
+    });
+    return combineLatest(observables).subscribe(callback);
   }
 }

package/services/chain-service/handler/SubstrateChainHandler.d.ts

@@ -1,7 +1,6 @@
 import { _AssetType } from '@subwallet/chain-list/types';
 import { ChainService } from '@subwallet/extension-base/services/chain-service';
 import { AbstractChainHandler } from '@subwallet/extension-base/services/chain-service/handler/AbstractChainHandler';
-import { SubstrateApi } from '@subwallet/extension-base/services/chain-service/handler/SubstrateApi';
 import { _ApiOptions, _SubstrateChainSpec } from '@subwallet/extension-base/services/chain-service/handler/types';
 import { _SmartContractTokenInfo, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 export declare const DEFAULT_AUX: string[];
@@ -9,9 +8,9 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     private substrateApiMap;
     private logger;
     constructor(parent?: ChainService);
-    getSubstrateApiMap(): Record<string, SubstrateApi>;
-    getSubstrateApiByChain(chainSlug: string): SubstrateApi;
-    getApiByChain(chain: string): SubstrateApi;
+    getSubstrateApiMap(): Record<string, _SubstrateApi>;
+    getSubstrateApiByChain(chainSlug: string): _SubstrateApi;
+    getApiByChain(chain: string): _SubstrateApi;
     wakeUp(): Promise<void>;
     sleep(): Promise<void>;
     recoverApi(chainSlug: string): Promise<void>;
@@ -21,7 +20,7 @@ export declare class SubstrateChainHandler extends AbstractChainHandler {
     private getGrc20TokenInfo;
     private getVftTokenInfo;
     getSubstrateContractTokenInfo(contractAddress: string, tokenType: _AssetType, originChain: string, contractCaller?: string): Promise<_SmartContractTokenInfo>;
-    setSubstrateApi(chainSlug: string, substrateApi: SubstrateApi): void;
+    setSubstrateApi(chainSlug: string, substrateApi: _SubstrateApi): void;
     destroySubstrateApi(chainSlug: string): void;
-    initApi(chainSlug: string, apiUrl: string, { externalApiPromise, onUpdateStatus, providerName }?: Omit<_ApiOptions, 'metadata'>): Promise<SubstrateApi>;
+    initApi(chainSlug: string, apiUrl: string, { externalApiPromise, onUpdateStatus, providerName }?: Omit<_ApiOptions, 'metadata'>): Promise<_SubstrateApi>;
 }

package/services/chain-service/handler/SubstrateChainHandler.js

@@ -62,12 +62,13 @@ export class SubstrateChainHandler extends AbstractChainHandler {
     }
   }
   async getChainSpec(substrateApi) {
-    var _substrateApi$api$gen, _substrateApi$api, _substrateApi$api$con, _substrateApi$api$con2, _substrateApi$api$con3;
     const result = {
       addressPrefix: -1,
       decimals: 0,
       existentialDeposit: '',
-      genesisHash: (_substrateApi$api$gen = substrateApi.api.genesisHash) === null || _substrateApi$api$gen === void 0 ? void 0 : _substrateApi$api$gen.toHex(),
+      genesisHash: await substrateApi.makeRpcQuery({
+        section: 'genesisHash'
+      }),
       name: '',
       symbol: '',
       paraId: null
@@ -75,17 +76,33 @@ export class SubstrateChainHandler extends AbstractChainHandler {
     const {
       chainDecimals,
       chainTokens
-    } = substrateApi.api.registry;
-    if (substrateApi.api.query.parachainInfo) {
-      result.paraId = (await substrateApi.api.query.parachainInfo.parachainId()).toPrimitive();
-    }
+    } = await substrateApi.makeRpcQuery({
+      section: 'registry'
+    });
+    result.paraId = await substrateApi.makeRpcQuery({
+      section: 'query',
+      module: 'parachainInfo',
+      method: 'parachainId'
+    });
 
     // get first token by default, might change
-    result.name = (await substrateApi.api.rpc.system.chain()).toPrimitive();
+    result.name = await substrateApi.makeRpcQuery({
+      section: 'rpc',
+      module: 'system',
+      method: 'chain'
+    });
     result.symbol = chainTokens[0];
     result.decimals = chainDecimals[0];
-    result.addressPrefix = (_substrateApi$api = substrateApi.api) === null || _substrateApi$api === void 0 ? void 0 : (_substrateApi$api$con = _substrateApi$api.consts) === null || _substrateApi$api$con === void 0 ? void 0 : (_substrateApi$api$con2 = _substrateApi$api$con.system) === null || _substrateApi$api$con2 === void 0 ? void 0 : (_substrateApi$api$con3 = _substrateApi$api$con2.ss58Prefix) === null || _substrateApi$api$con3 === void 0 ? void 0 : _substrateApi$api$con3.toPrimitive();
-    result.existentialDeposit = substrateApi.api.consts.balances.existentialDeposit.toString();
+    result.addressPrefix = await substrateApi.makeRpcQuery({
+      section: 'consts',
+      module: 'system',
+      method: 'ss58Prefix'
+    });
+    result.existentialDeposit = await substrateApi.makeRpcQuery({
+      section: 'consts',
+      module: 'balances',
+      method: 'existentialDeposit'
+    });
     return result;
   }
   async getPsp22TokenInfo(apiPromise, contractAddress, contractCaller) {

package/services/chain-service/index.d.ts

@@ -2,7 +2,7 @@
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _MultiChainAsset } from '@subwallet/chain-list/types';
 import { AssetSetting, ValidateNetworkResponse } from '@subwallet/extension-base/background/KoniTypes';
 import { MantaPrivateHandler } from '@subwallet/extension-base/services/chain-service/handler/manta/MantaPrivateHandler';
-import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
+import { _ChainApiStatus, _ChainConnectionStatus, _ChainState, _NetworkUpsertParams, _SubstrateApi, _ValidateCustomAssetRequest, _ValidateCustomAssetResponse } from '@subwallet/extension-base/services/chain-service/types';
 import { EventService } from '@subwallet/extension-base/services/event-service';
 import { IMetadataItem } from '@subwallet/extension-base/services/storage-service/databases';
 import DatabaseService from '@subwallet/extension-base/services/storage-service/DatabaseService';
@@ -38,8 +38,8 @@ export declare class ChainService {
     get swapRefMap(): Record<string, _AssetRef>;
     getEvmApi(slug: string): import("./handler/EvmApi").EvmApi;
     getEvmApiMap(): Record<string, import("./handler/EvmApi").EvmApi>;
-    getSubstrateApiMap(): Record<string, import("./handler/SubstrateApi").SubstrateApi>;
-    getSubstrateApi(slug: string): import("./handler/SubstrateApi").SubstrateApi;
+    getSubstrateApiMap(): Record<string, _SubstrateApi>;
+    getSubstrateApi(slug: string): _SubstrateApi;
     getChainCurrentProviderByKey(slug: string): {
         endpoint: string;
         providerName: string;

package/services/chain-service/types.d.ts

@@ -1,11 +1,13 @@
+import type { ApiInterfaceRx } from '@polkadot/api/types';
 import { _AssetRef, _AssetType, _ChainAsset, _ChainInfo, _CrowdloanFund } from '@subwallet/chain-list/types';
 import { _CHAIN_VALIDATION_ERROR } from '@subwallet/extension-base/services/chain-service/handler/types';
-import { BehaviorSubject } from 'rxjs';
+import { BehaviorSubject, Subscription } from 'rxjs';
 import Web3 from 'web3';
 import { ApiPromise } from '@polkadot/api';
+import { Getters } from '@polkadot/api/base/Getters';
 import { SubmittableExtrinsicFunction } from '@polkadot/api/promise/types';
-import { ChainProperties, ChainType } from '@polkadot/types/interfaces';
-import { Registry } from '@polkadot/types/types';
+import { ChainProperties, ChainType, RuntimeVersion } from '@polkadot/types/interfaces';
+import { AnyJson, Registry } from '@polkadot/types/types';
 export interface _DataMap {
     chainInfoMap: Record<string, _ChainInfo>;
     chainStateMap: Record<string, _ChainState>;
@@ -68,7 +70,7 @@ export interface _SubstrateApiState {
     apiDefaultTxSudo?: SubmittableExtrinsicFunction;
     defaultFormatBalance?: _SubstrateDefaultFormatBalance;
 }
-export interface _SubstrateApi extends _SubstrateApiState, _ChainBaseApi {
+export interface _SubstrateApi extends _SubstrateApiState, _ChainBaseApi, _SubstrateApiAdapter {
     api: ApiPromise;
     isReady: Promise<_SubstrateApi>;
     connect: (_callbackUpdateMetadata?: (substrateApi: _SubstrateApi) => void) => void;
@@ -77,7 +79,22 @@ export interface _SubstrateApi extends _SubstrateApiState, _ChainBaseApi {
     systemChain: string;
     systemName: string;
     systemVersion: string;
-    registry: Registry;
+    registry?: Registry;
+    useLightClient: boolean;
+}
+export interface _SubstrateAdapterQueryArgs {
+    section: keyof Getters<'promise'>;
+    module?: string;
+    method?: string;
+    args?: unknown[];
+}
+export interface _SubstrateAdapterSubscriptionArgs extends Omit<Required<_SubstrateAdapterQueryArgs>, 'section'> {
+    section: keyof Pick<ApiInterfaceRx, 'query'>;
+    isMultiQuery?: boolean;
+}
+export interface _SubstrateApiAdapter {
+    makeRpcQuery<T extends AnyJson | `0x${string}` | Registry | RuntimeVersion>(params: _SubstrateAdapterQueryArgs): Promise<T>;
+    subscribeDataWithMulti(params: _SubstrateAdapterSubscriptionArgs[], callback: (rs: Record<string, AnyJson[]>) => void): Subscription;
 }
 export interface _EvmApi extends _ChainBaseApi {
     api: Web3;

package/services/chain-service/utils/index.d.ts

@@ -91,6 +91,7 @@ export declare const findChainInfoByHalfGenesisHash: (chainMap: Record<string, _
 export declare const findChainInfoByChainId: (chainMap: Record<string, _ChainInfo>, chainId?: number) => _ChainInfo | null;
 export declare function _isMantaZkAsset(chainAsset: _ChainAsset): boolean;
 export declare function _getChainExistentialDeposit(chainInfo: _ChainInfo): string;
+export declare function _getAssetExistentialDeposit(chainAsset: _ChainAsset): string;
 export declare function randomizeProvider(providers: Record<string, string>, excludedKeys?: string[]): {
     providerKey: string;
     providerValue: string;

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

@@ -417,6 +417,9 @@ export function _getChainExistentialDeposit(chainInfo) {
   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';
 }
+export function _getAssetExistentialDeposit(chainAsset) {
+  return (chainAsset === null || chainAsset === void 0 ? void 0 : chainAsset.minAmount) || '0';
+}
 export function randomizeProvider(providers, excludedKeys) {
   if (Object.keys(providers).length === 0) {
     return {

package/services/earning-service/handlers/nomination-pool/index.d.ts

@@ -1,6 +1,6 @@
 import { TransactionError } from '@subwallet/extension-base/background/errors/TransactionError';
 import { ExtrinsicType, UnstakingInfo } from '@subwallet/extension-base/background/KoniTypes';
-import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/core/substrate/nominationpools-pallet';
+import { PalletNominationPoolsPoolMember } from '@subwallet/extension-base/core/substrate/types';
 import KoniState from '@subwallet/extension-base/koni/background/handlers/State';
 import { _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { BaseYieldPositionInfo, EarningRewardHistoryItem, EarningRewardItem, HandleYieldStepData, NominationPoolInfo, OptimalYieldPath, OptimalYieldPathParams, StakeCancelWithdrawalParams, SubmitJoinNominationPool, SubmitYieldJoinData, TransactionData, YieldPoolInfo, YieldPoolMethodInfo, YieldPoolType, YieldPositionInfo, YieldStepBaseInfo, YieldTokenBaseInfo } from '@subwallet/extension-base/types';

package/types/balance/index.d.ts

@@ -1,7 +1,6 @@
 import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { _BalanceMetadata, APIItemState, ExtrinsicType } from '@subwallet/extension-base/background/KoniTypes';
-import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
-import { ApiPromise } from '@polkadot/api';
+import { _EvmApi, _SubstrateApi } from '@subwallet/extension-base/services/chain-service/types';
 import { BN } from '@polkadot/util';
 export interface TokenBalanceRaw {
     reserved: BN;
@@ -43,7 +42,7 @@ export interface SubscribeBasePalletBalance {
     extrinsicType?: ExtrinsicType;
 }
 export interface SubscribeSubstratePalletBalance extends SubscribeBasePalletBalance {
-    substrateApi: ApiPromise;
+    substrateApi: _SubstrateApi;
     includeNativeToken?: boolean;
 }
 export interface SubscribeEvmPalletBalance extends SubscribeBasePalletBalance {