@exodus/web3-ethereum 2.4.1 → 2.6.0

package/lib/rpc-handlers/createEvmDeps.js

@@ -41,16 +41,13 @@ const createEvmDepsFactory = ({ analytics, activeWalletAccountAtom, assetsModule
             });
             return privateKey;
         };
-        const getNonce = async (account) => {
-            // Shouldn't we retrieve the nonce for a given account?
-            // We are relying on the assumption here that "account"
-            // is always equal to the activeWalletAccount.
+        const getNonce = async () => {
             const [baseAssetTxLog, blockchainNonce] = await Promise.all([
                 blockchainMetadata.getTxLog({
                     assetName,
                     walletAccount: await activeWalletAccountAtom.get(),
                 }),
-                apiGetNonce({ asset, address: account }),
+                apiGetNonce({ asset, address: await getAddress() }),
             ]);
             const walletNonce = Array.from(baseAssetTxLog)
                 .filter((tx) => tx.sent && !tx.dropped && tx.data.nonce != null)

package/lib/rpc-handlers/exposeHandlers.js

@@ -59,7 +59,7 @@ export function exposeHandlers(rpc, deps) {
     async function prepareTransaction(transaction) {
         const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } = await getFeeData();
         const preparedTransaction = { ...transaction };
-        preparedTransaction.nonce = await getNonce(transaction.from);
+        preparedTransaction.nonce = await getNonce();
         if (!transaction.value) {
             preparedTransaction.value = '0x0';
         }

package/lib/rpc-handlers/parseAndValidateTypedData.js

@@ -25,8 +25,18 @@ export function parseAndValidateTypedData(typedData, { chainId: activeChainId })
         throw new InvalidInputError();
     }
     const allowedFieldsSet = new Set(parsedTypedData.types[parsedTypedData.primaryType].map(({ name }) => name));
+    // Handle cases where the message includes fields that doesn't belong to the primary type.
+    const isFieldExempted = (field) => {
+        // Handle OpenSea case. See: https://github.com/status-im/status-mobile/issues/13769
+        if (field === 'totalOriginalConsiderationItems' &&
+            parsedTypedData.primaryType === 'OrderComponents' &&
+            parsedTypedData.message['consideration']) {
+            return true;
+        }
+        return false;
+    };
     for (const field in parsedTypedData.message) {
-        if (!allowedFieldsSet.has(field)) {
+        if (!allowedFieldsSet.has(field) && !isFieldExempted(field)) {
             throw new InvalidInputError(`field '${field}' is not defined in the primary type definition`);
         }
     }

package/lib/rpc-handlers/validator.js

@@ -325,19 +325,22 @@ export function validateRequest(value) {
         }
       }
       if ('gasPrice' in data && hasOwn(data, 'gasPrice')) {
-        if (!(typeof data.gasPrice === 'string')) {
-          validate.errors = [
-            {
-              keywordLocation: '#/properties/gasPrice/type',
-              instanceLocation: '#/gasPrice',
-            },
-          ]
-          return false
-        }
-        if (!format4.test(data.gasPrice)) {
+        let passes2 = 0
+        const sub17 = (() => {
+          if (!(typeof data.gasPrice === 'string')) return false
+          if (!format4.test(data.gasPrice)) return false
+          return true
+        })()
+        if (sub17) passes2++
+        const sub18 = (() => {
+          if (!(data.gasPrice === null)) return false
+          return true
+        })()
+        if (sub18) passes2++
+        if (passes2 !== 1) {
           validate.errors = [
             {
-              keywordLocation: '#/properties/gasPrice/format',
+              keywordLocation: '#/properties/gasPrice/oneOf',
               instanceLocation: '#/gasPrice',
             },
           ]
@@ -388,19 +391,19 @@ export function validateRequest(value) {
         'maxPriorityFeePerGas' in data &&
         hasOwn(data, 'maxPriorityFeePerGas')
       ) {
-        let passes2 = 0
-        const sub17 = (() => {
+        let passes3 = 0
+        const sub19 = (() => {
           if (!(typeof data.maxPriorityFeePerGas === 'string')) return false
           if (!format1.test(data.maxPriorityFeePerGas)) return false
           return true
         })()
-        if (sub17) passes2++
-        const sub18 = (() => {
+        if (sub19) passes3++
+        const sub20 = (() => {
           if (!(data.maxPriorityFeePerGas === null)) return false
           return true
         })()
-        if (sub18) passes2++
-        if (passes2 !== 1) {
+        if (sub20) passes3++
+        if (passes3 !== 1) {
           validate.errors = [
             {
               keywordLocation: '#/properties/maxPriorityFeePerGas/oneOf',
@@ -411,19 +414,19 @@ export function validateRequest(value) {
         }
       }
       if ('maxFeePerGas' in data && hasOwn(data, 'maxFeePerGas')) {
-        let passes3 = 0
-        const sub19 = (() => {
+        let passes4 = 0
+        const sub21 = (() => {
           if (!(typeof data.maxFeePerGas === 'string')) return false
           if (!format1.test(data.maxFeePerGas)) return false
           return true
         })()
-        if (sub19) passes3++
-        const sub20 = (() => {
+        if (sub21) passes4++
+        const sub22 = (() => {
           if (!(data.maxFeePerGas === null)) return false
           return true
         })()
-        if (sub20) passes3++
-        if (passes3 !== 1) {
+        if (sub22) passes4++
+        if (passes4 !== 1) {
           validate.errors = [
             {
               keywordLocation: '#/properties/maxFeePerGas/oneOf',
@@ -1031,14 +1034,14 @@ export function validateRequest(value) {
         }
       }
       if ('image' in data && hasOwn(data, 'image')) {
-        let passes4 = 0
-        const sub21 = (() => {
+        let passes5 = 0
+        const sub23 = (() => {
           if (!(typeof data.image === 'string')) return false
           if (!format6.test(data.image)) return false
           return true
         })()
-        if (sub21) passes4++
-        const sub22 = (() => {
+        if (sub23) passes5++
+        const sub24 = (() => {
           const err38 = validate.errors
           const res38 = ref16(data.image)
           const suberr38 = ref16.errors
@@ -1046,8 +1049,8 @@ export function validateRequest(value) {
           if (!res38) return false
           return true
         })()
-        if (sub22) passes4++
-        if (passes4 !== 1) {
+        if (sub24) passes5++
+        if (passes5 !== 1) {
           validate.errors = [
             {
               keywordLocation: '#/properties/image/oneOf',

package/lib/types.d.ts

@@ -31,7 +31,7 @@ export declare type EVMDeps = {
     sendRawTransaction: (rawTransaction: string) => Promise<EthTransactionHash>;
     getEstimatedGas: (transaction: EthTransaction) => Promise<string>;
     getFeeData: () => Promise<FeeData>;
-    getNonce: (account: string) => Promise<string>;
+    getNonce: () => Promise<string>;
     forwardRequest: (args: EthRequestArguments) => Promise<unknown>;
     onEthWalletWatchAssetRequest?: (assetDetails: EthWalletWatchAsset) => Promise<boolean>;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "2.4.1",
+  "version": "2.6.0",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -34,7 +34,7 @@
     "@exodus/currency": "^2.1.2",
     "@exodus/ethereum-api": "^6.0.0",
     "@exodus/web3-constants": "^1.19.0",
-    "@exodus/web3-ethereum-utils": "^1.8.0",
+    "@exodus/web3-ethereum-utils": "^1.9.0",
     "@exodus/web3-provider": "^2.17.0",
     "@exodus/web3-rpc-handlers": "^0.14.0",
     "bn.js": "^5.2.0",
@@ -45,11 +45,11 @@
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
     "@exodus/web3-types": "^1.15.0",
-    "@exodus/web3-validation": "^1.33.0",
+    "@exodus/web3-validation": "^1.34.0",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "6516ee0735272140b1c48527bf98ed3b7bc54499"
+  "gitHead": "5782440c25f9464da940fb715cd7b102b03cf9c9"
 }