@exodus/web3-ethereum 12.15.0 → 12.17.0

package/lib/rpc-handlers/createEVMDeps.js

@@ -9,7 +9,7 @@ async function getDefaultPurposeForLedger(asset) {
     return purposes[0];
 }
 const createEVMDepsFactory = ({ analytics, blockchainMetadata, }) => {
-    return ({ assetName, origin, getAsset, getAddress: _getAddress, getSupportedChainIds, getPrivateKey, getFeeData: getFeeConfig, getCustomFeeRate, getActiveWalletAccount, simulateEthereumTransactions, getActiveWalletAccountData, transactionSigner, getLedgerDevice, }) => {
+    return ({ assetName, origin, getAsset, getAddress: _getAddress, getSupportedChainIds, getPrivateKey, getFeeData: getFeeConfig, getCustomFeeRate, getActiveWalletAccount, simulateEthereumTransactions, getActiveWalletAccountData, transactionSigner, messageSigner: _messageSigner, getLedgerDevice, onEthWalletWatchAssetRequest: _onEthWalletWatchAssetRequest, }) => {
         const asset = getAsset(assetName);
         const server = getServer(asset);
         const forwardRequest = async ({ method, params }) => {
@@ -90,62 +90,66 @@ const createEVMDepsFactory = ({ analytics, blockchainMetadata, }) => {
             }
             return feeData;
         };
-        const trackWalletWatchAssetUse = async (assetDetails) => {
-            // TODO: do we still need this? If yes, this ...assetDetails expansion is no bueno
-            // why is this not always returning true in browser?
-            analytics.track({
-                event: 'DappWalletWatchAsset',
-                properties: {
-                    ...assetDetails,
-                    dappDomain: origin,
-                },
-            });
-            return true;
-        };
-        const messageSigner = {
-            signMessage: async ({ baseAssetName, walletAccount, message, }) => {
-                const { rawMessage, EIP712Message } = message;
-                if (rawMessage && EIP712Message) {
-                    throw new InvalidInputError("Can't set both rawMessage and EIP712Message");
-                }
-                if (walletAccount.source === 'exodus') {
-                    if (!getPrivateKey) {
-                        throw new Error('`getPrivateKey` should be provided to sign with Exodus accounts.');
+        const trackWalletWatchAssetUse = _onEthWalletWatchAssetRequest
+            ? _onEthWalletWatchAssetRequest
+            : async (assetDetails) => {
+                // TODO: do we still need this? If yes, this ...assetDetails expansion is no bueno
+                // why is this not always returning true in browser?
+                analytics.track({
+                    event: 'DappWalletWatchAsset',
+                    properties: {
+                        ...assetDetails,
+                        dappDomain: origin,
+                    },
+                });
+                return true;
+            };
+        const messageSigner = _messageSigner
+            ? _messageSigner
+            : {
+                signMessage: async ({ baseAssetName, walletAccount, message, }) => {
+                    const { rawMessage, EIP712Message } = message;
+                    if (rawMessage && EIP712Message) {
+                        throw new InvalidInputError("Can't set both rawMessage and EIP712Message");
                     }
-                    const { privateKey } = await getPrivateKey(assetName);
-                    if (rawMessage) {
-                        return hex0xStringToBuffer(signMessage(bufferToHex0xString(rawMessage), privateKey));
+                    if (walletAccount.source === 'exodus') {
+                        if (!getPrivateKey) {
+                            throw new Error('`getPrivateKey` should be provided to sign with Exodus accounts.');
+                        }
+                        const { privateKey } = await getPrivateKey(assetName);
+                        if (rawMessage) {
+                            return hex0xStringToBuffer(signMessage(bufferToHex0xString(rawMessage), privateKey));
+                        }
+                        if (EIP712Message) {
+                            const typedDataVersion = Array.isArray(EIP712Message)
+                                ? SignTypedDataVersion.V1
+                                : SignTypedDataVersion.V4;
+                            return hex0xStringToBuffer(signTypedData(EIP712Message, privateKey, typedDataVersion));
+                        }
                     }
-                    if (EIP712Message) {
-                        const typedDataVersion = Array.isArray(EIP712Message)
-                            ? SignTypedDataVersion.V1
-                            : SignTypedDataVersion.V4;
-                        return hex0xStringToBuffer(signTypedData(EIP712Message, privateKey, typedDataVersion));
+                    else if (getLedgerDevice) {
+                        const device = await getLedgerDevice();
+                        const purpose = await getDefaultPurposeForLedger(asset);
+                        const { derivationPath } = await getAsset(assetName).baseAsset.api.getKeyIdentifier({
+                            compatibilityMode: 'ledger',
+                            purpose,
+                            accountIndex: 0,
+                            chainIndex: 0,
+                            addressIndex: 0,
+                        });
+                        const signedMessage = await device.signMessage({
+                            assetName: baseAssetName,
+                            derivationPath,
+                            message: {
+                                rawMessage,
+                                EIP712Message,
+                            },
+                        });
+                        return Buffer.from(signedMessage);
                     }
-                }
-                else if (getLedgerDevice) {
-                    const device = await getLedgerDevice();
-                    const purpose = await getDefaultPurposeForLedger(asset);
-                    const { derivationPath } = await getAsset(assetName).baseAsset.api.getKeyIdentifier({
-                        compatibilityMode: 'ledger',
-                        purpose,
-                        accountIndex: 0,
-                        chainIndex: 0,
-                        addressIndex: 0,
-                    });
-                    const signedMessage = await device.signMessage({
-                        assetName: baseAssetName,
-                        derivationPath,
-                        message: {
-                            rawMessage,
-                            EIP712Message,
-                        },
-                    });
-                    return Buffer.from(signedMessage);
-                }
-                throw new InvalidInputError();
-            },
-        };
+                    throw new InvalidInputError();
+                },
+            };
         return {
             chainId: 'undefined',
             forwardRequest,

package/lib/rpc-handlers/exposeHandlers.js

@@ -63,7 +63,7 @@ const isValidGasLimitValue = (value) => {
     return proposedGasLimit.lte(maximumBlockGasLimit);
 };
 export function exposeHandlers(rpc, deps) {
-    const { chainId, isTrusted, isAutoApproved, ensureTrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getSupportedChainIds = async () => [], getAddress, getEstimatedGas, getCustomFeeData, getFeeData, getNonce, sendRawTransaction, simulateEthereumTransactions, scanDomains, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = async () => true, getAsset, addEthereumChain, getOrigin, getPathname, getActiveWalletAccountData, transactionSigner, messageSigner, } = deps;
+    const { chainId, isTrusted, isAutoApproved, ensureTrusted, ensureUntrusted, approveConnection, approveMessage, approveTransactions, forwardRequest, getSupportedChainIds = async () => [], getAddress, getEstimatedGas, getCustomFeeData, getFeeData, getNonce, sendRawTransaction, simulateEthereumTransactions, scanDomains, onTransactionsSigned = () => { }, onEthWalletWatchAssetRequest = () => { }, isUnlocked = () => true, ensureUnlocked = async () => true, getAsset, addEthereumChain, getOrigin, getPathname, getActiveWalletAccountData, transactionSigner, messageSigner, } = deps;
     const network = `evm:${chainId}`;
     async function assertTrusted() {
         const trusted = await isTrusted();
@@ -296,4 +296,13 @@ export function exposeHandlers(rpc, deps) {
     exposeEvmFunction('wallet_getSnaps', async () => {
         throw new UnsupportedMethodError();
     });
+    exposeEvmFunction('wallet_revokePermissions', async (permissions) => {
+        const parentCapability = Object.keys(permissions)[0];
+        if (parentCapability !== ETH_ACCOUNTS_PERMISSION) {
+            // `eth_accounts` is currently the only permission.
+            throw new InvalidInputError();
+        }
+        await ensureUntrusted();
+        return null;
+    });
 }

package/lib/rpc-handlers/validator.js

@@ -1533,11 +1533,11 @@ export function validateRequest(value) {
         })()
         if (sub23) passes5++
         const sub24 = (() => {
-          const err40 = validate.errors
-          const res40 = ref18(data.image)
-          const suberr40 = ref18.errors
-          validate.errors = err40
-          if (!res40) return false
+          const err41 = validate.errors
+          const res41 = ref18(data.image)
+          const suberr41 = ref18.errors
+          validate.errors = err41
+          if (!res41) return false
           return true
         })()
         if (sub24) passes5++
@@ -1626,13 +1626,13 @@ export function validateRequest(value) {
         ]
         return false
       }
-      const err41 = validate.errors
-      const res41 = ref17(data.options)
-      const suberr41 = ref17.errors
-      validate.errors = err41
-      if (!res41) {
+      const err42 = validate.errors
+      const res42 = ref17(data.options)
+      const suberr42 = ref17.errors
+      validate.errors = err42
+      if (!res42) {
         validate.errors = [
-          errorMerge(suberr41[0], '#/properties/options/$ref', '#/options'),
+          errorMerge(suberr42[0], '#/properties/options/$ref', '#/options'),
         ]
         return false
       }
@@ -2782,7 +2782,7 @@ export function validateRequest(value) {
             return false
           }
           break
-        case 'wallet_switchEthereumChain':
+        case 'wallet_revokePermissions':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
@@ -2793,8 +2793,8 @@ export function validateRequest(value) {
             return false
           }
           const err38 = validate.errors
-          const res38 = ref14(data.params)
-          const suberr38 = ref14.errors
+          const res38 = ref11(data.params)
+          const suberr38 = ref11.errors
           validate.errors = err38
           if (!res38) {
             validate.errors = [
@@ -2807,7 +2807,7 @@ export function validateRequest(value) {
             return false
           }
           break
-        case 'wallet_addEthereumChain':
+        case 'wallet_switchEthereumChain':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
@@ -2818,8 +2818,8 @@ export function validateRequest(value) {
             return false
           }
           const err39 = validate.errors
-          const res39 = ref15(data.params)
-          const suberr39 = ref15.errors
+          const res39 = ref14(data.params)
+          const suberr39 = ref14.errors
           validate.errors = err39
           if (!res39) {
             validate.errors = [
@@ -2832,7 +2832,7 @@ export function validateRequest(value) {
             return false
           }
           break
-        case 'wallet_watchAsset':
+        case 'wallet_addEthereumChain':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
@@ -2842,14 +2842,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err42 = validate.errors
-          const res42 = ref16(data.params)
-          const suberr42 = ref16.errors
-          validate.errors = err42
-          if (!res42) {
+          const err40 = validate.errors
+          const res40 = ref15(data.params)
+          const suberr40 = ref15.errors
+          validate.errors = err40
+          if (!res40) {
             validate.errors = [
               errorMerge(
-                suberr42[0],
+                suberr40[0],
                 '#/oneOf/47/properties/params/$ref',
                 '#/params',
               ),
@@ -2857,7 +2857,7 @@ export function validateRequest(value) {
             return false
           }
           break
-        case 'web3_clientVersion':
+        case 'wallet_watchAsset':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
@@ -2867,10 +2867,35 @@ export function validateRequest(value) {
             ]
             return false
           }
+          const err43 = validate.errors
+          const res43 = ref16(data.params)
+          const suberr43 = ref16.errors
+          validate.errors = err43
+          if (!res43) {
+            validate.errors = [
+              errorMerge(
+                suberr43[0],
+                '#/oneOf/48/properties/params/$ref',
+                '#/params',
+              ),
+            ]
+            return false
+          }
+          break
+        case 'web3_clientVersion':
+          if (!('params' in data && hasOwn(data, 'params'))) {
+            validate.errors = [
+              {
+                keywordLocation: '#/oneOf/49/required',
+                instanceLocation: '#/params',
+              },
+            ]
+            return false
+          }
           if (!(Array.isArray(data.params) && data.params.length === 0)) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/48/properties/params/const',
+                keywordLocation: '#/oneOf/49/properties/params/const',
                 instanceLocation: '#/params',
               },
             ]
@@ -2881,7 +2906,7 @@ export function validateRequest(value) {
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/49/required',
+                keywordLocation: '#/oneOf/50/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -2890,7 +2915,7 @@ export function validateRequest(value) {
           if (!(Array.isArray(data.params) && data.params.length === 0)) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/49/properties/params/const',
+                keywordLocation: '#/oneOf/50/properties/params/const',
                 instanceLocation: '#/params',
               },
             ]

package/lib/types.d.ts

@@ -40,8 +40,10 @@ export interface CreateEvmDepsParams {
     simulateEthereumTransactions: SimulateTransactionsFn;
     getActiveWalletAccountData: GetActiveWalletAccountData;
     transactionSigner: EVMTransactionSignerModule;
+    messageSigner?: EVMMessageSigner;
     getLedgerDevice?: GetLedgerDevice;
     addEthereumChain?: (param: AddEthereumChainParameter) => Promise<null>;
+    onEthWalletWatchAssetRequest?: (param: EthWalletWatchAsset) => Promise<boolean>;
 }
 export declare type EVMFactory = (params: CreateEvmDepsParams) => EVMDeps;
 export declare type EVMTransactionSignerModule = ITransactionSignerModule<EVMUnsignedTransaction>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "12.15.0",
+  "version": "12.17.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -37,7 +37,7 @@
     "@exodus/web3-constants": "^1.30.0",
     "@exodus/web3-ethereum-utils": "^3.33.0",
     "@exodus/web3-provider": "^3.15.0",
-    "@exodus/web3-rpc-handlers": "^2.23.1",
+    "@exodus/web3-rpc-handlers": "^2.24.0",
     "@exodus/web3-utils": "^1.46.0",
     "bn.js": "^5.2.0",
     "eth-rpc-errors": "^4.0.3"
@@ -46,10 +46,10 @@
     "@exodus/assets": "^8.0.95",
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
-    "@exodus/web3-management": "0.34.0",
+    "@exodus/web3-management": "0.35.0",
     "@exodus/web3-types": "0.0.0",
     "@exodus/web3-validation": "^1.38.0",
     "@wallet-standard/base": "^1.0.1"
   },
-  "gitHead": "00cec7d8f666e71dc97f88e9c019abcce1e81a94"
+  "gitHead": "fd27d08c77e036bc7fc316bd2d9980747122b69a"
 }