@exodus/web3-ethereum 2.5.0 → 2.7.0

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "2.5.0",
+  "version": "2.7.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.19.0",
-    "@exodus/web3-ethereum-utils": "^1.8.0",
-    "@exodus/web3-provider": "^2.17.0",
-    "@exodus/web3-rpc-handlers": "^0.14.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",
     "bn.js": "^5.2.0",
     "eth-rpc-errors": "^4.0.3"
   },
@@ -44,11 +44,12 @@
     "@exodus/assets": "^8.0.72",
     "@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-types": "^1.16.0",
+    "@exodus/web3-validation": "^1.34.0",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
-  }
+  },
+  "gitHead": "88c28467495b5524e3d0d0080e58ea9d5fbe7b11"
 }

package/CHANGELOG.md

@@ -1,153 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to
-[Semantic Versioning](https://semver.org/spec/v2.0.0.html).
-
-## [Unreleased]
-
-## [2.5.0] - 2023-06-07
-
-### Changed
-
-- Use a simplified `getNonce` dependency (doesn't require arguments)
-
-## [2.4.1] - 2023-06-05
-
-### Added
-
-- chore(ethereum): build ethereum dependencies based on hydra modules (#502)
-
-### Fixed
-
-- fix(ethereum): harden typed data validation (#508)
-- fix(ethereum): untangle balance weirdness (#506)
-
-## [2.4.0] - 2023-05-29
-
-### Fixed
-
-- fix(ethereum): TS compilation errors (#498)
-- fix: rename ethereum:provider to eip1193:provider (#499)
-
-## [2.3.0] - 2023-05-18
-
-### Fixed
-
-- fix(web3): resolve error on approving token for swap (#485)
-- fix: rename ethereum:provider to eip1193:provider (#499)
-
-## [2.1.1] - 2023-05-11
-
-### Fixed
-
-- Validation for signing typed data.
-
-### Changed
-
-- Ensure mainnet (`0x1`) is always a first supported chain ID
-
-## [2.0.0] - 2023-05-11
-
-### Changed
-
-- Breaking: accept `getAsset` dependency instead of `asset`.
-- Breaking: make RPC validate parsed requests.
-
-## [1.5.1] - 2023-04-06
-
-### Fixed
-
-- Convert methods in the provider to properties with arrow functions.
-- Convert chain ID from `getDefaultChainId` to lower case
-
-## [1.5.0] - 2023-04-05
-
-### Changed
-
-- Supply simulated changes to the approval function
-
-## [1.4.6] - 2023-03-27
-
-### Fixed
-
-- `eth_getLogs` method validation (allow null in an array)
-
-## [1.4.4] - 2023-03-26
-
-### Fixed
-
-- Don't change the Approve Transaction title if no token symbol found
-- `eth_getLogs` method validation
-
-## [1.4.2] - 2023-03-22
-
-### Fixed
-
-- Returning a possibly mutated object in `validateRequestWithPrefix`
-
-## [1.4.1] - 2023-03-15
-
-### Changed
-
-- Properly check if `getDefaultChainId` is undefined in provider constructor
-
-## [1.4.0] - 2023-03-01
-
-### Changed
-
-- Unpin `ethereum-api` package version
-
-## [1.3.0] - 2023-02-28
-
-### Changed
-
-- Use arrow functions for compatibility with React bundler
-
-## [1.2.0] - 2023-02-27
-
-### Added
-
-- Implement RPC functions
-
-## [1.1.0] - 2023-02-22
-
-### Changed
-
-- Rework simulate transaction api
-- Package structure
-
-## [1.0.0] - 2023-02-20
-
-Initial release.
-
-[unreleased]:
-  https://github.com/ExodusMovement/exodus-web3/compare/db3e8cfd7d2f3cb908bb675cff1ca7981bbd1b09...master
-[1.0.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/c220026347ce27cfc25bacc083d61b1aae5c876b)
-[1.1.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/75254d697e3ffd2d95759e30425c30c7fb7fa654)
-[1.2.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/39137384d78bfa3e008b92e47e106a7be1df071e)
-[1.3.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/91de31ee30652f2f8acc66f6e1d909fd27174a36)
-[1.4.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/bbba5c8aa7d663deec5f649250421777c855341a)
-[1.4.1]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/cd3382acdb92fd0dafbb2f2f49b0cc9a648d6e2c)
-[1.4.2]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/c414d2c359ecbd25fe1b4d244f6fb51f633a4284)
-[1.4.4]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/e48f74f32e040de9e86ef77ea48058d5c0b36c86)
-[1.4.6]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/4d9d6eed59fbe201c1e6f2abb4b50f1f336bc690)
-[1.5.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/4a0c077d0175fe3c6a35e2f9a459f8cad214e8f6)
-[1.5.1]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/0576160a36d260f5f63789ddd28c18c9d8885e7b)
-[2.0.0]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/54f84cf089d1dffd5dafd443fc2aacb8dd0fc962)
-[2.1.1]:
-  (https://github.com/ExodusMovement/exodus-web3/commit/db3e8cfd7d2f3cb908bb675cff1ca7981bbd1b09)