@subwallet/extension-base 1.1.51-2 → 1.1.53-0

package/services/wallet-connect-service/index.js

@@ -10,10 +10,12 @@ import SignClient from '@walletconnect/sign-client';
 import { getInternalError, getSdkError } from '@walletconnect/utils';
 import { BehaviorSubject } from 'rxjs';
 import PolkadotRequestHandler from "./handler/PolkadotRequestHandler.js";
-import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
+import { ALL_WALLET_CONNECT_EVENT, DEFAULT_WALLET_CONNECT_OPTIONS, WALLET_CONNECT_EIP155_NAMESPACE, WALLET_CONNECT_SUPPORTED_METHODS } from "./constants.js";
 import { convertConnectRequest, convertNotSupportRequest, isSupportWalletConnectChain } from "./helpers.js";
 import { EIP155_SIGNING_METHODS, POLKADOT_SIGNING_METHODS } from "./types.js";
 const storage = SWStorage.instance;
+const methodDOTRequire = [POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_MESSAGE, POLKADOT_SIGNING_METHODS.POLKADOT_SIGN_TRANSACTION];
+const methodEVMRequire = [EIP155_SIGNING_METHODS.PERSONAL_SIGN, EIP155_SIGNING_METHODS.ETH_SIGN, EIP155_SIGNING_METHODS.ETH_SEND_TRANSACTION];
 var _requestService = /*#__PURE__*/_classPrivateFieldLooseKey("requestService");
 var _polkadotRequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("polkadotRequestHandler");
 var _eip155RequestHandler = /*#__PURE__*/_classPrivateFieldLooseKey("eip155RequestHandler");
@@ -117,6 +119,12 @@ export default class WalletConnectService {
   async approveSession(result) {
     var _classPrivateFieldLoo4;
     _classPrivateFieldLooseBase(this, _checkClient)[_checkClient]();
+    Object.entries(result.namespaces).forEach(([namespace, {
+      methods
+    }]) => {
+      methods = [...methods, ...this.findMethodsMissing(WALLET_CONNECT_EIP155_NAMESPACE === namespace ? methodEVMRequire : methodDOTRequire, methods)];
+      result.namespaces[namespace].methods = methods;
+    });
     await ((_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(this, _client)[_client]) === null || _classPrivateFieldLoo4 === void 0 ? void 0 : _classPrivateFieldLoo4.approve(result));
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
@@ -185,6 +193,16 @@ export default class WalletConnectService {
     }));
     _classPrivateFieldLooseBase(this, _updateSessions)[_updateSessions]();
   }
+  findMethodsMissing(methodRequire, methods) {
+    const methodMap = methods.reduce((obj, m) => ({
+      ...obj,
+      [m]: m
+    }), {});
+    return methodEVMRequire.reduce((methods, m) => {
+      !methodMap[m] && methods.push(m);
+      return methods;
+    }, []);
+  }
 }
 function _get_haveData() {
   const sessionStorage = storage.getItem('wc@2:client:0.3//session');

package/types/{balance.d.ts → balance/index.d.ts}

@@ -1,4 +1,7 @@
+import { _ChainAsset, _ChainInfo } from '@subwallet/chain-list/types';
 import { APIItemState } from '@subwallet/extension-base/background/KoniTypes';
+import { _EvmApi } from '@subwallet/extension-base/services/chain-service/types';
+import { ApiPromise } from '@polkadot/api';
 import { BN } from '@polkadot/util';
 export interface TokenBalanceRaw {
     reserved: BN;
@@ -37,3 +40,16 @@ export interface BalanceJson {
     reset?: boolean;
     details: BalanceMap;
 }
+export interface SubscribeBasePalletBalance {
+    addresses: string[];
+    assetMap: Record<string, _ChainAsset>;
+    chainInfo: _ChainInfo;
+    callback: (rs: BalanceItem[]) => void;
+}
+export interface SubscribeSubstratePalletBalance extends SubscribeBasePalletBalance {
+    substrateApi: ApiPromise;
+    includeNativeToken?: boolean;
+}
+export interface SubscribeEvmPalletBalance extends SubscribeBasePalletBalance {
+    evmApi: _EvmApi;
+}

package/types/index.js

@@ -1,7 +1,7 @@
 // Copyright 2019-2022 @subwallet/extension-base authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-export * from "./balance.js";
+export * from "./balance/index.js";
 export * from "./buy.js";
 export * from "./campaigns/index.js";
 export * from "./fee/index.js";

package/utils/asset.d.ts

@@ -0,0 +1,2 @@
+import { _AssetType, _ChainAsset } from '@subwallet/chain-list/types';
+export declare const filterAssetsByChainAndType: (chainAssetMap: Record<string, _ChainAsset>, chain: string, assetTypes: _AssetType[]) => Record<string, _ChainAsset>;

package/utils/asset.js

@@ -0,0 +1,12 @@
+// Copyright 2019-2022 @subwallet/extension-base
+// SPDX-License-Identifier: Apache-2.0
+
+export const filterAssetsByChainAndType = (chainAssetMap, chain, assetTypes) => {
+  const result = {};
+  Object.values(chainAssetMap).forEach(assetInfo => {
+    if (assetTypes.includes(assetInfo.assetType) && assetInfo.originChain === chain) {
+      result[assetInfo.slug] = assetInfo;
+    }
+  });
+  return result;
+};

package/utils/eth/parseTransaction/index.js

@@ -87,8 +87,8 @@ const parseResult = (type, input, name) => {
     };
   } else {
     return {
-      type: types,
       name: genName(name),
+      type: types,
       value: genInput(input)
     };
   }

package/utils/index.d.ts

@@ -42,6 +42,7 @@ export declare const swParseIPFSUrl: (input: string) => string | undefined;
 export declare function wait(milliseconds: number): Promise<void>;
 export * from './account';
 export * from './array';
+export * from './asset';
 export * from './environment';
 export * from './eth';
 export * from './number';

package/utils/index.js

@@ -344,6 +344,7 @@ export function wait(milliseconds) {
 }
 export * from "./account.js";
 export * from "./array.js";
+export * from "./asset.js";
 export * from "./environment.js";
 export * from "./eth.js";
 export * from "./number.js";