@subwallet/extension-base 1.0.2-1 → 1.0.2-1b

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.2-1",
+  "version": "1.0.2-1b",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -369,6 +369,11 @@
       "require": "./cjs/koni/api/tokens/wasm/index.js",
       "default": "./koni/api/tokens/wasm/index.js"
     },
+    "./koni/api/tokens/wasm/utils": {
+      "types": "./koni/api/tokens/wasm/utils.d.ts",
+      "require": "./cjs/koni/api/tokens/wasm/utils.js",
+      "default": "./koni/api/tokens/wasm/utils.js"
+    },
     "./koni/api/xcm": {
       "types": "./koni/api/xcm/index.d.ts",
       "require": "./cjs/koni/api/xcm/index.js",
@@ -1651,12 +1656,12 @@
     "@sora-substrate/type-definitions": "^1.12.4",
     "@subsocial/types": "^0.6.8",
     "@substrate/connect": "^0.7.18",
-    "@subwallet/chain-list": "^0.0.27",
+    "@subwallet/chain-list": "^0.0.30",
     "@subwallet/extension-base": "^1.0.2-1",
     "@subwallet/extension-chains": "^1.0.2-1",
     "@subwallet/extension-dapp": "^1.0.2-1",
     "@subwallet/extension-inject": "^1.0.2-1",
-    "@subwallet/keyring": "^0.0.4",
+    "@subwallet/keyring": "^0.0.5",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-4",
     "@zeitgeistpm/type-defs": "^0.10.0",
@@ -1693,4 +1698,4 @@
     "web3-eth-contract": "^1.8.1",
     "web3-utils": "^1.8.1"
   }
-}
+}

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

@@ -4,11 +4,12 @@
 import { options as acalaOptions } from '@acala-network/api';
 import { rpc as oakRpc, types as oakTypes } from '@oak-foundation/types';
 import { _AssetType } from '@subwallet/chain-list/types';
+import { getDefaultWeightV2 } from '@subwallet/extension-base/koni/api/tokens/wasm/utils';
 import { getSubstrateConnectProvider } from '@subwallet/extension-base/services/chain-service/handler/light-client';
 import { ApiPromise, WsProvider } from '@polkadot/api';
 import { ContractPromise } from '@polkadot/api-contract';
 import { TypeRegistry } from '@polkadot/types/create';
-import { formatBalance, isTestChain, objectSpread, stringify } from '@polkadot/util';
+import { BN, formatBalance, isTestChain, objectSpread, stringify } from '@polkadot/util';
 import { logger as createLogger } from '@polkadot/util/logger';
 import { defaults as addressDefaults } from '@polkadot/util-crypto/address/defaults';
 import { _API_OPTIONS_CHAIN_GROUP, API_AUTO_CONNECT_MS, API_MAX_RETRY } from "../constants.js";
@@ -87,13 +88,13 @@ export class SubstrateChainHandler {
       if (tokenType === _AssetType.PSP22) {
         tokenContract = new ContractPromise(substrateApi.api, _PSP22_ABI, contractAddress);
         const [nameResp, symbolResp, decimalsResp] = await Promise.all([tokenContract.query['psp22Metadata::tokenName'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         }),
         // read-only operation so no gas limit
         tokenContract.query['psp22Metadata::tokenSymbol'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         }), tokenContract.query['psp22Metadata::tokenDecimals'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         })]);
         if (!(nameResp.result.isOk && symbolResp.result.isOk && decimalsResp.result.isOk) || !nameResp.output || !decimalsResp.output || !symbolResp.output) {
           this.logger.error('Error response while validating WASM contract');
@@ -104,18 +105,22 @@ export class SubstrateChainHandler {
             contractError: true
           };
         } else {
-          var _symbolResp$output, _decimalsResp$output, _symbolResp$output2;
-          name = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
-          decimals = parseInt((_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman());
-          symbol = (_symbolResp$output2 = symbolResp.output) === null || _symbolResp$output2 === void 0 ? void 0 : _symbolResp$output2.toHuman();
+          var _symbolResp$output, _decimalsResp$output, _nameResp$output;
+          const symbolObj = (_symbolResp$output = symbolResp.output) === null || _symbolResp$output === void 0 ? void 0 : _symbolResp$output.toHuman();
+          const decimalsObj = (_decimalsResp$output = decimalsResp.output) === null || _decimalsResp$output === void 0 ? void 0 : _decimalsResp$output.toHuman();
+          const nameObj = (_nameResp$output = nameResp.output) === null || _nameResp$output === void 0 ? void 0 : _nameResp$output.toHuman();
+          name = nameResp.output ? nameObj.Ok || nameObj.ok : '';
+          decimals = decimalsResp.output ? new BN(decimalsObj.Ok || decimalsObj.ok).toNumber() : 0;
+          symbol = decimalsResp.output ? symbolObj.Ok || symbolObj.ok : '';
           if (name === '' || symbol === '') {
             contractError = true;
           }
+          console.log('validate PSP22', name, symbol, decimals);
         }
       } else {
         tokenContract = new ContractPromise(substrateApi.api, _PSP34_ABI, contractAddress);
         const collectionIdResp = await tokenContract.query['psp34::collectionId'](contractCaller || contractAddress, {
-          gasLimit: -1
+          gasLimit: getDefaultWeightV2(substrateApi.api)
         }); // read-only operation so no gas limit
 
         if (!collectionIdResp.result.isOk || !collectionIdResp.output) {

package/services/chain-service/handler/light-client/index.d.ts

@@ -1,4 +1,20 @@
-import { ProviderInterface } from '@polkadot/rpc-provider/types';
+import { ScProvider } from '@polkadot/rpc-provider';
+import { ProviderInterface, ProviderInterfaceCallback, ProviderInterfaceEmitCb, ProviderInterfaceEmitted } from '@polkadot/rpc-provider/types';
 export declare const relayChainSpecs: Record<string, string>;
 export declare const paraChainSpecs: Record<string, string>;
+export declare class ProviderPlaceholder implements ProviderInterface {
+    private readonly providerPromise;
+    private provider?;
+    constructor(providerPromise: Promise<ScProvider>);
+    get hasSubscriptions(): boolean;
+    get isClonable(): boolean;
+    get isConnected(): boolean;
+    clone(): ProviderInterface;
+    connect(): Promise<void>;
+    disconnect(): Promise<void>;
+    on(type: ProviderInterfaceEmitted, sub: ProviderInterfaceEmitCb): () => void;
+    send<T = any>(method: string, params: unknown[], isCacheable?: boolean): Promise<T>;
+    subscribe(type: string, method: string, params: unknown[], cb: ProviderInterfaceCallback): Promise<number | string>;
+    unsubscribe(type: string, method: string, id: number | string): Promise<boolean>;
+}
 export declare function getSubstrateConnectProvider(specLink: string): ProviderInterface;

package/services/chain-service/handler/light-client/index.js

@@ -16,7 +16,7 @@ export const paraChainSpecs = {
   'kusama/tinkernet': `${sourceFolderUrl}kusama/tinkernet.json`,
   'polkadot/astar': `${sourceFolderUrl}polkadot/astar.json`
 };
-class ProviderPlaceholder {
+export class ProviderPlaceholder {
   constructor(providerPromise) {
     this.providerPromise = providerPromise;
     providerPromise.then(provider => {