@exodus/web3-ethereum 2.7.0 → 2.8.0

package/lib/provider/provider.d.ts

@@ -9,7 +9,7 @@ interface EthereumProviderEvents {
 }
 export declare class EthereumProvider extends BaseProvider<EthereumProviderEvents> {
     #private;
-    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, }: Deps);
+    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, walletProviderManager, }: Deps);
     protected _callRpcMethod<Params, Response>(method: string, params: Params): Promise<Response>;
     isConnected(): boolean;
     request: (args: RequestArguments) => Promise<unknown>;

package/lib/provider/provider.js

@@ -5,18 +5,20 @@ export class EthereumProvider extends BaseProvider {
     #storage;
     #supportedChainIds = [];
     #getDefaultChainId;
+    #walletProviderManager;
     #initializePromise = null;
     #initialized = false;
     #isConnected = false;
     #chainId = null;
     #accounts = [];
     #selectedAddress = null;
-    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, }) {
+    constructor({ accountsObservable, storage, supportedChainIds, transport, getDefaultChainId, walletProviderManager, }) {
         if (!supportedChainIds?.length) {
             throw new Error('At least one supported chain must be provided');
         }
         super({ transport });
         this.#storage = createStorageWrapper(storage);
+        this.#walletProviderManager = walletProviderManager;
         this.#supportedChainIds = supportedChainIds
             .map((chainId) => chainId.toLowerCase())
             .sort();
@@ -105,7 +107,12 @@ export class EthereumProvider extends BaseProvider {
     };
     #requestAccounts = async () => {
         const permissions = { eth_accounts: {} };
-        await this._callRpcMethod('wallet_requestPermissions', [permissions]);
+        const availableWallets = [];
+        this.#walletProviderManager.getWalletProviders().forEach(({ name }) => {
+            availableWallets.push(name);
+        });
+        const { selectedWallet } = await this._callRpcMethod('wallet_requestPermissions', [permissions, availableWallets]);
+        this.#walletProviderManager.setDefaultWalletProvider(selectedWallet);
         const accounts = await this._callRpcMethod('eth_accounts', []);
         this.#handleAccountsChanged(accounts);
         if (!(await this.#storage.getChainId())) {

package/lib/provider/types.d.ts

@@ -1,5 +1,5 @@
 import type { Deps as BaseProviderDeps } from '@exodus/web3-provider';
-import type { Observable, Storage } from '@exodus/web3-types';
+import type { Observable, Storage, WalletProviderManager } from '@exodus/web3-types';
 export declare type ChainId = string;
 export interface ProviderConnectInfo {
     chainId: ChainId;
@@ -35,10 +35,11 @@ export declare type Deps = BaseProviderDeps & {
     storage: Storage;
     supportedChainIds: string[];
     getDefaultChainId?: () => Promise<string | null>;
+    walletProviderManager: WalletProviderManager;
 };
 export interface ProviderStorage {
     getChainId: () => Promise<ChainId | null>;
     setChainId: (chainId: ChainId) => Promise<void>;
     clearChainId: () => Promise<void>;
 }
-export {};
+export { WalletProviderManager };

package/lib/rpc-handlers/exposeHandlers.js

@@ -186,8 +186,9 @@ export function exposeHandlers(rpc, deps) {
         }
         return permissions;
     });
-    exposeEvmFunction('wallet_requestPermissions', async (requestedPermissions) => {
+    exposeEvmFunction('wallet_requestPermissions', async (requestedPermissions, availableWallets) => {
         const parentCapability = Object.keys(requestedPermissions)[0];
+        let selectedWallet = null;
         if (parentCapability !== ETH_ACCOUNTS_PERMISSION) {
             // `eth_accounts` is currently the only permission.
             // See: https://docs.metamask.io/guide/rpc-api.html#restricted-methods.
@@ -199,13 +200,19 @@ export function exposeHandlers(rpc, deps) {
         }
         const trusted = await isTrusted();
         if (!trusted) {
-            const approved = await approveConnection(network);
-            if (!approved) {
+            const response = (await approveConnection(network, availableWallets));
+            if (!response.approved) {
                 throw new UserRejectedRequestError();
             }
-            await ensureTrusted();
+            selectedWallet = response.selectedWallet;
+            if (response.selectedWallet === 'exodus') {
+                await ensureTrusted();
+            }
         }
-        return [{ parentCapability: ETH_ACCOUNTS_PERMISSION }];
+        return {
+            walletPermissions: [{ parentCapability: ETH_ACCOUNTS_PERMISSION }],
+            selectedWallet,
+        };
     });
     exposeEvmFunction('wallet_watchAsset', async (assetDetails) => {
         await assertTrusted();

package/lib/rpc-handlers/validator.js

@@ -913,6 +913,12 @@ export function validateRequest(value) {
         validate.errors = [{ keywordLocation: '#/type', instanceLocation: '#' }]
         return false
       }
+      if (data.length > 2) {
+        validate.errors = [
+          { keywordLocation: '#/maxItems', instanceLocation: '#' },
+        ]
+        return false
+      }
       if (data.length < 1) {
         validate.errors = [
           { keywordLocation: '#/minItems', instanceLocation: '#' },
@@ -929,7 +935,46 @@ export function validateRequest(value) {
           return false
         }
       }
-      if (data.length > 1) {
+      if (1 in data && hasOwn(data, 1)) {
+        if (!Array.isArray(data[1])) {
+          validate.errors = [
+            { keywordLocation: '#/1/type', instanceLocation: '#/1' },
+          ]
+          return false
+        }
+        for (let l = 0; l < data[1].length; l++) {
+          if (l in data[1] && hasOwn(data[1], l)) {
+            if (!(typeof data[1][l] === 'string')) {
+              validate.errors = [
+                {
+                  keywordLocation: '#/1/items/type',
+                  instanceLocation: '#/1/' + l,
+                },
+              ]
+              return false
+            }
+            if (data[1][l].length > 20 && stringLength(data[1][l]) > 20) {
+              validate.errors = [
+                {
+                  keywordLocation: '#/1/items/maxLength',
+                  instanceLocation: '#/1/' + l,
+                },
+              ]
+              return false
+            }
+            if (!format3.test(data[1][l])) {
+              validate.errors = [
+                {
+                  keywordLocation: '#/1/items/format',
+                  instanceLocation: '#/1/' + l,
+                },
+              ]
+              return false
+            }
+          }
+        }
+      }
+      if (data.length > 2) {
         validate.errors = [
           { keywordLocation: '#/items', instanceLocation: '#' },
         ]

package/lib/types.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" resolution-mode="require"/>
 import type { EthTransaction, EthTransactionHash, EthWalletWatchAsset } from '@exodus/web3-ethereum-utils';
 import type { CommonDeps } from '@exodus/web3-rpc-handlers';
-import type { IAnalyticsModule, IActiveWalletAccountAtom, IAssetsModule, IBlockchainMetadataModule, IFeeDataModule, IWalletModule, IWalletAccountsModule } from '@exodus/web3-types';
+import type { IAnalyticsModule, IActiveWalletAccountAtom, IAssetsModule, IBlockchainMetadataModule, IFeeDataModule, IWalletModule, IWalletAccountsModule, ApproveConnectionResponse } from '@exodus/web3-types';
 /**
  * EVM-compatible chains.
  */
@@ -38,3 +38,4 @@ export declare type EVMDeps = {
 export declare type Dependencies = {
     evms: EVMDeps[];
 } & CommonDeps;
+export { ApproveConnectionResponse };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -33,10 +33,10 @@
   "dependencies": {
     "@exodus/currency": "^2.1.2",
     "@exodus/ethereum-api": "^6.0.0",
-    "@exodus/web3-constants": "^1.20.0",
-    "@exodus/web3-ethereum-utils": "^1.10.0",
-    "@exodus/web3-provider": "^2.18.0",
-    "@exodus/web3-rpc-handlers": "^0.15.0",
+    "@exodus/web3-constants": "^1.21.0",
+    "@exodus/web3-ethereum-utils": "^1.11.0",
+    "@exodus/web3-provider": "^2.19.0",
+    "@exodus/web3-rpc-handlers": "^0.16.0",
     "bn.js": "^5.2.0",
     "eth-rpc-errors": "^4.0.3"
   },
@@ -44,12 +44,12 @@
     "@exodus/assets": "^8.0.72",
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
-    "@exodus/web3-types": "^1.16.0",
+    "@exodus/web3-types": "^1.17.0",
     "@exodus/web3-validation": "^1.34.0",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "88c28467495b5524e3d0d0080e58ea9d5fbe7b11"
+  "gitHead": "a9cd4485d1f90608ba4e38dd0d9bd237768d6009"
 }