@subwallet/extension-base 1.0.2-2 → 1.0.3-0

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "1.0.2-2",
+  "version": "1.0.3-0",
   "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",
@@ -490,6 +495,11 @@
       "require": "./cjs/services/balance-service/index.js",
       "default": "./services/balance-service/index.js"
     },
+    "./services/base/types": {
+      "types": "./services/base/types.d.ts",
+      "require": "./cjs/services/base/types.js",
+      "default": "./services/base/types.js"
+    },
     "./services/chain-service": {
       "types": "./services/chain-service/index.d.ts",
       "require": "./cjs/services/chain-service/index.js",
@@ -1590,6 +1600,11 @@
       "require": "./cjs/utils/keyring.js",
       "default": "./utils/keyring.js"
     },
+    "./utils/promise": {
+      "types": "./utils/promise.d.ts",
+      "require": "./cjs/utils/promise.js",
+      "default": "./utils/promise.js"
+    },
     "./utils/request": {
       "types": "./utils/request.d.ts",
       "require": "./cjs/utils/request.js",
@@ -1599,7 +1614,7 @@
   "dependencies": {
     "@acala-network/api": "^4.1.8-2.3",
     "@acala-network/type-definitions": "^4.1.5",
-    "@apollo/client": "^3.7.3",
+    "@apollo/client": "^3.7.14",
     "@babel/runtime": "^7.20.6",
     "@bifrost-finance/type-definitions": "^1.7.2",
     "@crustio/type-definitions": "^1.3.0",
@@ -1634,7 +1649,7 @@
     "@polkadot/hw-ledger": "^10.1.9",
     "@polkadot/keyring": "^10.2.1",
     "@polkadot/networks": "^10.2.1",
-    "@polkadot/phishing": "^0.20.3",
+    "@polkadot/phishing": "^0.21.1",
     "@polkadot/react-identicon": "^2.9.14",
     "@polkadot/react-qr": "^2.9.14",
     "@polkadot/rpc-provider": "^9.10.3",
@@ -1651,12 +1666,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/extension-base": "^1.0.2-2",
-    "@subwallet/extension-chains": "^1.0.2-2",
-    "@subwallet/extension-dapp": "^1.0.2-2",
-    "@subwallet/extension-inject": "^1.0.2-2",
-    "@subwallet/keyring": "^0.0.4",
+    "@subwallet/chain-list": "^0.1.2",
+    "@subwallet/extension-base": "^1.0.3-0",
+    "@subwallet/extension-chains": "^1.0.3-0",
+    "@subwallet/extension-dapp": "^1.0.3-0",
+    "@subwallet/extension-inject": "^1.0.3-0",
+    "@subwallet/keyring": "^0.0.5",
     "@subwallet/ui-keyring": "^0.0.3",
     "@unique-nft/types": "^0.6.0-4",
     "@zeitgeistpm/type-defs": "^0.10.0",
@@ -1687,10 +1702,10 @@
     "protobufjs": "^7.1.2",
     "rlp": "^3.0.0",
     "rxjs": "^7.8.0",
-    "web3": "^1.8.1",
-    "web3-core": "^1.8.1",
-    "web3-core-helpers": "^1.8.1",
-    "web3-eth-contract": "^1.8.1",
-    "web3-utils": "^1.8.1"
+    "web3": "^1.9.0",
+    "web3-core": "^1.9.0",
+    "web3-core-helpers": "^1.9.0",
+    "web3-eth-contract": "^1.9.0",
+    "web3-utils": "^1.9.0"
   }
 }

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.0.2-2'
+  version: '1.0.3-0'
 };

package/services/base/types.d.ts

@@ -0,0 +1,34 @@
+import { PromiseHandler } from '@subwallet/extension-base/utils/promise';
+export declare enum ServiceStatus {
+    NOT_INITIALIZED = "not_initialized",
+    INITIALIZING = "initializing",
+    INITIALIZED = "initialized",
+    STARTED = "started",
+    STARTING = "starting",
+    STOPPED = "stopped",
+    STOPPING = "stopping"
+}
+export interface CoreServiceInterface {
+    status: ServiceStatus;
+    init: () => Promise<void>;
+    startPromiseHandler: PromiseHandler<void>;
+    start: () => Promise<void>;
+    waitForStarted: () => Promise<void>;
+}
+export interface StoppableServiceInterface extends CoreServiceInterface {
+    stopPromiseHandler: PromiseHandler<void>;
+    stop: () => Promise<void>;
+    waitForStopped: () => Promise<void>;
+}
+export interface PersistDataServiceInterface {
+    loadData: () => Promise<void>;
+    persistData: () => Promise<void>;
+}
+export interface SubscribeServiceInterface {
+    subscribe: () => Promise<void>;
+    unsubscribe: () => Promise<void>;
+}
+export interface CronServiceInterface {
+    startCron: () => Promise<void>;
+    stopCron: () => Promise<void>;
+}

package/services/base/types.js

@@ -0,0 +1,15 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+// 'init' | 'started' | 'starting' | 'stopped' | 'stopping'
+
+export let ServiceStatus;
+(function (ServiceStatus) {
+  ServiceStatus["NOT_INITIALIZED"] = "not_initialized";
+  ServiceStatus["INITIALIZING"] = "initializing";
+  ServiceStatus["INITIALIZED"] = "initialized";
+  ServiceStatus["STARTED"] = "started";
+  ServiceStatus["STARTING"] = "starting";
+  ServiceStatus["STOPPED"] = "stopped";
+  ServiceStatus["STOPPING"] = "stopping";
+})(ServiceStatus || (ServiceStatus = {}));

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