@subwallet/extension-base 1.0.2-2 → 1.0.2-3

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) {