@subwallet/extension-base 0.4.5-0 → 0.4.6-0

package/background/KoniTypes.d.ts

@@ -1,7 +1,9 @@
 import { AuthUrls, Resolver } from '@subwallet/extension-base/background/handlers/State';
-import { AccountJson, AuthorizeRequest, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
+import { AccountAuthType, AccountJson, AuthorizeRequest, RequestAccountList, RequestAccountSubscribe, RequestAuthorizeReject, RequestAuthorizeSubscribe, RequestAuthorizeTab, RequestCurrentAccountAddress, ResponseAuthorizeList, ResponseJsonGetAccountInfo, SeedLengths } from '@subwallet/extension-base/background/types';
 import { InjectedAccount, MetadataDefBase } from '@subwallet/extension-inject/types';
 import Web3 from 'web3';
+import { RequestArguments, TransactionConfig } from 'web3-core';
+import { JsonRpcPayload, JsonRpcResponse } from 'web3-core-helpers';
 import { ApiPromise } from '@polkadot/api';
 import { SubmittableExtrinsicFunction } from '@polkadot/api/promise/types';
 import { KeyringPair$Json } from '@polkadot/keyring/types';
@@ -30,6 +32,7 @@ export interface AuthRequestV2 extends Resolver<ResultResolver> {
     idStr: string;
     request: RequestAuthorizeTab;
     url: string;
+    accountAuthType: AccountAuthType;
 }
 export interface RequestAuthorizeApproveV2 {
     id: string;
@@ -244,6 +247,7 @@ export interface NetworkJson {
     dependencies?: string[];
     getStakingOnChain?: boolean;
     apiStatus?: NETWORK_STATUS;
+    requestId?: string;
 }
 export interface DonateInfo {
     key: string;
@@ -295,6 +299,7 @@ export declare type TokenInfo = {
 export interface AccountsWithCurrentAddress {
     accounts: AccountJson[];
     currentAddress?: string;
+    currentGenesisHash?: string | null;
     isShowBalance?: boolean;
     allAccountLogo?: string;
 }
@@ -303,6 +308,7 @@ export interface OptionInputAddress {
 }
 export interface CurrentAccountInfo {
     address: string;
+    currentGenesisHash: string | null;
 }
 export interface RequestSettingsType {
     isShowBalance: boolean;
@@ -641,6 +647,90 @@ export interface CrossChainRelation {
     type: ChainRelationType;
     relationMap: Record<string, ChainRelationInfo>;
 }
+export declare type RequestEvmEvents = null;
+export declare type EvmEventType = 'connect' | 'disconnect' | 'accountsChanged' | 'chainChanged' | 'message' | 'data' | 'reconnect' | 'error';
+export declare type EvmAccountsChangedPayload = string[];
+export declare type EvmChainChangedPayload = string;
+export declare type EvmConnectPayload = {
+    chainId: EvmChainChangedPayload;
+};
+export declare type EvmDisconnectPayload = unknown;
+export interface EvmEvent {
+    type: EvmEventType;
+    payload: EvmAccountsChangedPayload | EvmChainChangedPayload | EvmConnectPayload | EvmDisconnectPayload;
+}
+export interface EvmAppState {
+    networkKey?: string;
+    chainId?: string;
+    isConnected?: boolean;
+    web3?: Web3;
+    listenEvents?: string[];
+}
+export declare type RequestEvmProviderSend = JsonRpcPayload;
+export interface ResponseEvmProviderSend {
+    error: (Error | null);
+    result?: JsonRpcResponse;
+}
+export interface EvmProviderRpcErrorInterface extends Error {
+    message: string;
+    code: number;
+    data?: unknown;
+}
+export declare type EvmRpcErrorHelperMap = Record<'USER_REJECTED_REQUEST' | 'UNAUTHORIZED' | 'UNSUPPORTED_METHOD' | 'DISCONNECTED' | 'CHAIN_DISCONNECTED' | 'INVALID_PARAMS' | 'INTERNAL_ERROR', [number, string]>;
+export interface EvmSendTransactionParams {
+    from: string;
+    to?: string;
+    value?: string | number;
+    gasLimit?: string | number;
+    maxPriorityFeePerGas?: string | number;
+    maxFeePerGas?: string | number;
+    gasPrice?: string | number;
+    data?: string;
+}
+export interface SwitchNetworkRequest {
+    networkKey: string;
+    address?: string;
+}
+export interface EvmSignatureRequest {
+    address: string;
+    type: string;
+    payload: unknown;
+}
+export interface ConfirmationsQueueItemOptions {
+    requiredPassword?: boolean;
+    address?: string;
+    networkKey?: string;
+}
+export interface ConfirmationsQueueItem<T> extends ConfirmationsQueueItemOptions {
+    id: string;
+    url: string;
+    payload: T;
+    payloadJson: string;
+}
+export interface ConfirmationResult<T> {
+    id: string;
+    isApproved: boolean;
+    url?: string;
+    payload?: T;
+    password?: string;
+}
+export interface EvmSendTransactionRequest extends TransactionConfig {
+    estimateGas: string;
+}
+export interface ConfirmationDefinitions {
+    addNetworkRequest: [ConfirmationsQueueItem<NetworkJson>, ConfirmationResult<NetworkJson>];
+    switchNetworkRequest: [ConfirmationsQueueItem<SwitchNetworkRequest>, ConfirmationResult<boolean>];
+    evmSignatureRequest: [ConfirmationsQueueItem<EvmSignatureRequest>, ConfirmationResult<string>];
+    evmSendTransactionRequest: [ConfirmationsQueueItem<EvmSendTransactionRequest>, ConfirmationResult<boolean>];
+}
+export declare type ConfirmationType = keyof ConfirmationDefinitions;
+export declare type ConfirmationsQueue = {
+    [ConfirmationType in keyof ConfirmationDefinitions]: Record<string, ConfirmationDefinitions[ConfirmationType][0]>;
+};
+export declare type RequestConfirmationsSubscribe = null;
+export declare type RequestConfirmationComplete = {
+    [ConfirmationType in keyof ConfirmationDefinitions]?: ConfirmationDefinitions[ConfirmationType][1];
+};
 export interface KoniRequestSignatures {
     'pri(networkMap.recoverDotSama)': [string, boolean];
     'pri(substrateNft.submitTransaction)': [SubstrateNftSubmitTransaction, NftTransactionResponse, NftTransactionResponse];
@@ -707,10 +797,10 @@ export interface KoniRequestSignatures {
     'pri(accounts.saveRecent)': [RequestSaveRecentAccount, SingleAddress];
     'pri(accounts.triggerSubscription)': [null, boolean];
     'pri(currentAccount.saveAddress)': [RequestCurrentAccountAddress, boolean, CurrentAccountInfo];
-    'pri(currentAccount.changeBalancesVisibility)': [null, boolean, ResponseSettingsType];
-    'pri(currentAccount.subscribeSettings)': [null, ResponseSettingsType, ResponseSettingsType];
-    'pri(currentAccount.saveAccountAllLogo)': [string, boolean, ResponseSettingsType];
-    'pri(currentAccount.saveTheme)': [ThemeTypes, boolean, ResponseSettingsType];
+    'pri(settings.changeBalancesVisibility)': [null, boolean, ResponseSettingsType];
+    'pri(settings.subscribe)': [null, ResponseSettingsType, ResponseSettingsType];
+    'pri(settings.saveAccountAllLogo)': [string, boolean, ResponseSettingsType];
+    'pri(settings.saveTheme)': [ThemeTypes, boolean, ResponseSettingsType];
     'pri(chainRegistry.getSubscription)': [null, Record<string, ChainRegistry>, Record<string, ChainRegistry>];
     'pri(transaction.history.getSubscription)': [null, Record<string, TransactionHistoryItemType[]>, Record<string, TransactionHistoryItemType[]>];
     'pri(transaction.history.add)': [RequestTransactionHistoryAdd, boolean, TransactionHistoryItemType[]];
@@ -719,8 +809,13 @@ export interface KoniRequestSignatures {
     'pri(transfer.getExistentialDeposit)': [RequestTransferExistentialDeposit, string];
     'pri(subscription.cancel)': [string, boolean];
     'pri(freeBalance.subscribe)': [RequestFreeBalance, string, string];
+    'pri(confirmations.subscribe)': [RequestConfirmationsSubscribe, ConfirmationsQueue, ConfirmationsQueue];
+    'pri(confirmations.complete)': [RequestConfirmationComplete, boolean];
     'pub(utils.getRandom)': [RandomTestRequest, number];
     'pub(accounts.listV2)': [RequestAccountList, InjectedAccount[]];
     'pub(accounts.subscribeV2)': [RequestAccountSubscribe, boolean, InjectedAccount[]];
+    'evm(events.subscribe)': [RequestEvmEvents, boolean, EvmEvent];
+    'evm(request)': [RequestArguments, unknown];
+    'evm(provider.send)': [RequestEvmProviderSend, string | number, ResponseEvmProviderSend];
 }
 export {};

package/background/handlers/State.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="chrome" />
 import type { MetadataDef, ProviderMeta } from '@subwallet/extension-inject/types';
 import type { JsonRpcResponse, ProviderInterface, ProviderInterfaceCallback } from '@polkadot/rpc-provider/types';
-import type { AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning, SigningRequest } from '../types';
+import type { AccountAuthType, AccountJson, AuthorizeRequest, MetadataRequest, RequestAuthorizeTab, RequestRpcSend, RequestRpcSubscribe, RequestRpcUnsubscribe, RequestSign, ResponseRpcListProviders, ResponseSigning, SigningRequest } from '../types';
 import { BehaviorSubject } from 'rxjs';
 export interface Resolver<T> {
     reject: (error: Error) => void;
@@ -20,6 +20,7 @@ export interface AuthUrlInfo {
     isAllowed: boolean;
     origin: string;
     url: string;
+    accountAuthType?: AccountAuthType;
     isAllowedMap: Record<string, boolean>;
 }
 interface MetaRequest extends Resolver<boolean> {
@@ -56,6 +57,7 @@ export default class State {
     get allMetaRequests(): MetadataRequest[];
     get allSignRequests(): SigningRequest[];
     get authUrls(): AuthUrls;
+    protected getPopup(): number[];
     protected popupClose(): void;
     protected popupOpen(): void;
     private authComplete;

package/background/handlers/State.js

@@ -12,8 +12,6 @@ const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
   focused: true,
   height: 621,
-  left: 150,
-  top: 150,
   type: 'popup',
   url: NOTIFICATION_URL,
   width: 460
@@ -157,6 +155,10 @@ export default class State {
     return this.#authUrls;
   }
 
+  getPopup() {
+    return this.#windows;
+  }
+
   popupClose() {
     this.#windows.forEach(id => withErrorLog(() => chrome.windows.remove(id)));
     this.#windows = [];

package/background/types.d.ts

@@ -38,9 +38,6 @@ export interface AccountsWithCurrentAddress {
     accounts: AccountJson[];
     currentAddress?: string;
 }
-export interface CurrentAccountInfo {
-    address: string;
-}
 export declare type AccountWithChildren = AccountJson & {
     children?: AccountWithChildren[];
 };
@@ -138,8 +135,12 @@ export interface TransportRequestMessage<TMessageType extends MessageTypes> {
     origin: 'page' | 'extension' | string;
     request: RequestTypes[TMessageType];
 }
+export declare type AccountAuthType = 'substrate' | 'evm' | 'both';
 export interface RequestAuthorizeTab {
     origin: string;
+    accountAuthType?: AccountAuthType;
+    allowedAccounts?: string[];
+    reConfirm?: boolean;
 }
 export interface RequestAuthorizeApprove {
     id: string;
@@ -226,8 +227,11 @@ export interface RequestAccountBatchExport {
 }
 export interface RequestAccountList {
     anyType?: boolean;
+    accountAuthType?: AccountAuthType;
+}
+export interface RequestAccountSubscribe {
+    accountAuthType?: AccountAuthType;
 }
-export declare type RequestAccountSubscribe = null;
 export interface RequestRpcSend {
     method: string;
     params: unknown[];

package/cjs/background/handlers/State.js

@@ -29,8 +29,6 @@ const NOTIFICATION_URL = chrome.extension.getURL('notification.html');
 const POPUP_WINDOW_OPTS = {
   focused: true,
   height: 621,
-  left: 150,
-  top: 150,
   type: 'popup',
   url: NOTIFICATION_URL,
   width: 460
@@ -192,6 +190,10 @@ class State {
     return this.#authUrls;
   }
 
+  getPopup() {
+    return this.#windows;
+  }
+
   popupClose() {
     this.#windows.forEach(id => (0, _helpers.withErrorLog)(() => chrome.windows.remove(id)));
     this.#windows = [];

package/cjs/packageInfo.js

@@ -11,6 +11,6 @@ const packageInfo = {
   name: '@subwallet/extension-base',
   path: typeof __dirname === 'string' ? __dirname : 'auto',
   type: 'cjs',
-  version: '0.4.5-0'
+  version: '0.4.6-0'
 };
 exports.packageInfo = packageInfo;

package/cjs/page/Accounts.js

@@ -16,12 +16,15 @@ class Accounts {
 
   get(anyType) {
     return sendRequest('pub(accounts.listV2)', {
-      anyType
+      anyType,
+      accountAuthType: 'substrate'
     });
   }
 
   subscribe(cb) {
-    sendRequest('pub(accounts.subscribeV2)', null, cb).catch(error => console.error(error));
+    sendRequest('pub(accounts.subscribeV2)', {
+      accountAuthType: 'substrate'
+    }, cb).catch(error => console.error(error));
     return () => {// FIXME we need the ability to unsubscribe
     };
   }

package/package.json

@@ -17,7 +17,7 @@
     "./cjs/detectPackage.js"
   ],
   "type": "module",
-  "version": "0.4.5-0",
+  "version": "0.4.6-0",
   "main": "./cjs/index.js",
   "module": "./index.js",
   "types": "./index.d.ts",
@@ -199,12 +199,14 @@
     "@polkadot/ui-settings": "^0.89.1",
     "@polkadot/util": "^8.3.1",
     "@polkadot/util-crypto": "^8.3.1",
-    "@subwallet/extension-chains": "^0.4.5-0",
-    "@subwallet/extension-dapp": "^0.4.5-0",
-    "@subwallet/extension-inject": "^0.4.5-0",
+    "@subwallet/extension-chains": "^0.4.6-0",
+    "@subwallet/extension-dapp": "^0.4.6-0",
+    "@subwallet/extension-inject": "^0.4.6-0",
     "ethereumjs-tx": "^2.1.2",
     "eventemitter3": "^4.0.7",
     "rxjs": "^7.5.1",
-    "web3": "^1.7.1"
+    "web3": "^1.7.3",
+    "web3-core": "^1.7.3",
+    "web3-core-helpers": "^1.7.3"
   }
 }

package/packageInfo.js

@@ -5,5 +5,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: '0.4.5-0'
+  version: '0.4.6-0'
 };

package/page/Accounts.js

@@ -9,12 +9,15 @@ export default class Accounts {
 
   get(anyType) {
     return sendRequest('pub(accounts.listV2)', {
-      anyType
+      anyType,
+      accountAuthType: 'substrate'
     });
   }
 
   subscribe(cb) {
-    sendRequest('pub(accounts.subscribeV2)', null, cb).catch(error => console.error(error));
+    sendRequest('pub(accounts.subscribeV2)', {
+      accountAuthType: 'substrate'
+    }, cb).catch(error => console.error(error));
     return () => {// FIXME we need the ability to unsubscribe
     };
   }