@exodus/web3-ethereum 1.4.4 → 1.4.6

package/lib/rpc-handlers/validator.js

@@ -13,7 +13,9 @@ export function validateRequest(value) {
       /~\//.test(s) ? `${s}`.replace(/~/g, '~0').replace(/\//g, '~1') : s
     const pattern1 = new RegExp('^[a-z]+([A-Z][a-z]+)*[A-Z]?$', 'u')
     const format1 = new RegExp('^0x[a-f0-9]*$', 'i')
+    const format2 = new RegExp('^0x[a-f0-9]{40}$', 'i')
     const pattern2 = new RegExp('^[a-z]+$', 'u')
+    const format3 = new RegExp('^(?!_)(\\n|\\r|.)*$', '')
     const unique = (array) => {
       if (array.length < 2) return true
       if (array.length === 2) return !deepEqual(array[0], array[1])
@@ -113,36 +115,64 @@ export function validateRequest(value) {
                     return false
                   return true
                 })()
-                if (!(sub4 || sub5)) return false
+                const sub6 = (() => {
+                  const err0 = validate.errors
+                  const res0 = validate(data[i][key1])
+                  const suberr0 = validate.errors
+                  validate.errors = err0
+                  if (!res0) return false
+                  return true
+                })()
+                const sub7 = (() => {
+                  if (!(typeof data[i][key1] === 'string')) return false
+                  if (!format2.test(data[i][key1])) return false
+                  return true
+                })()
+                if (!(sub4 || sub5 || sub6 || sub7)) return false
               }
             }
             return true
           })()
-          const sub6 = (() => {
+          const sub8 = (() => {
             if (!(typeof data[i] === 'string')) return false
             if (!format1.test(data[i])) return false
             return true
           })()
-          const sub7 = (() => {
+          const sub9 = (() => {
             if (!(typeof data[i] === 'string')) return false
             if (!pattern2.test(data[i])) return false
             return true
           })()
-          const sub8 = (() => {
+          const sub10 = (() => {
+            if (!(data[i] === null)) return false
+            return true
+          })()
+          const sub11 = (() => {
             if (!Array.isArray(data[i])) return false
             if (data[i].length < 1) return false
             for (let j = 0; j < data[i].length; j++) {
               if (j in data[i] && hasOwn(data[i], j)) {
-                if (!(typeof data[i][j] === 'number')) return false
+                const sub12 = (() => {
+                  if (!(typeof data[i][j] === 'number')) return false
+                  return true
+                })()
+                const sub13 = (() => {
+                  if (!(typeof data[i][j] === 'string')) return false
+                  if (data[i][j].length > 100 && stringLength(data[i][j]) > 100)
+                    return false
+                  if (!format3.test(data[i][j])) return false
+                  return true
+                })()
+                if (!(sub12 || sub13)) return false
               }
             }
             return true
           })()
-          const sub9 = (() => {
+          const sub14 = (() => {
             if (!(Array.isArray(data[i]) && data[i].length === 0)) return false
             return true
           })()
-          if (!(sub2 || sub3 || sub6 || sub7 || sub8 || sub9)) {
+          if (!(sub2 || sub3 || sub8 || sub9 || sub10 || sub11 || sub14)) {
             validate.errors = [
               { keywordLocation: '#/items/anyOf', instanceLocation: '#/' + i },
             ]
@@ -166,7 +196,7 @@ export function validateRequest(value) {
       keywordLocation: `${schemaBase}${keywordLocation.slice(1)}`,
       instanceLocation: `${dataBase}${instanceLocation.slice(1)}`,
     })
-    const format2 = new RegExp('^0x[0-9a-f]+$', 'i')
+    const format4 = new RegExp('^0x[0-9a-f]+$', 'i')
     const ref2 = function validate(data) {
       validate.errors = null
       if (!Array.isArray(data)) {
@@ -186,7 +216,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format2.test(data[0])) {
+        if (!format4.test(data[0])) {
           validate.errors = [
             { keywordLocation: '#/0/format', instanceLocation: '#/0' },
           ]
@@ -201,7 +231,6 @@ export function validateRequest(value) {
       }
       return true
     }
-    const format3 = new RegExp('^0x[a-f0-9]{40}$', 'i')
     const ref4 = function validate(data) {
       validate.errors = null
       if (!(typeof data === 'object' && data && !Array.isArray(data))) {
@@ -216,17 +245,17 @@ export function validateRequest(value) {
       }
       if ('chainId' in data && hasOwn(data, 'chainId')) {
         let passes1 = 0
-        const sub10 = (() => {
+        const sub15 = (() => {
           if (!(typeof data.chainId === 'string')) return false
-          if (!format2.test(data.chainId)) return false
+          if (!format4.test(data.chainId)) return false
           return true
         })()
-        if (sub10) passes1++
-        const sub11 = (() => {
+        if (sub15) passes1++
+        const sub16 = (() => {
           if (!(typeof data.chainId === 'number')) return false
           return true
         })()
-        if (sub11) passes1++
+        if (sub16) passes1++
         if (passes1 !== 1) {
           validate.errors = [
             {
@@ -246,7 +275,7 @@ export function validateRequest(value) {
         ]
         return false
       }
-      if (!format3.test(data.from)) {
+      if (!format2.test(data.from)) {
         validate.errors = [
           {
             keywordLocation: '#/properties/from/format',
@@ -265,7 +294,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format3.test(data.to)) {
+        if (!format2.test(data.to)) {
           validate.errors = [
             {
               keywordLocation: '#/properties/to/format',
@@ -285,7 +314,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format2.test(data.gas)) {
+        if (!format4.test(data.gas)) {
           validate.errors = [
             {
               keywordLocation: '#/properties/gas/format',
@@ -305,7 +334,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format2.test(data.gasPrice)) {
+        if (!format4.test(data.gasPrice)) {
           validate.errors = [
             {
               keywordLocation: '#/properties/gasPrice/format',
@@ -360,17 +389,17 @@ export function validateRequest(value) {
         hasOwn(data, 'maxPriorityFeePerGas')
       ) {
         let passes2 = 0
-        const sub12 = (() => {
+        const sub17 = (() => {
           if (!(typeof data.maxPriorityFeePerGas === 'string')) return false
           if (!format1.test(data.maxPriorityFeePerGas)) return false
           return true
         })()
-        if (sub12) passes2++
-        const sub13 = (() => {
+        if (sub17) passes2++
+        const sub18 = (() => {
           if (!(data.maxPriorityFeePerGas === null)) return false
           return true
         })()
-        if (sub13) passes2++
+        if (sub18) passes2++
         if (passes2 !== 1) {
           validate.errors = [
             {
@@ -383,17 +412,17 @@ export function validateRequest(value) {
       }
       if ('maxFeePerGas' in data && hasOwn(data, 'maxFeePerGas')) {
         let passes3 = 0
-        const sub14 = (() => {
+        const sub19 = (() => {
           if (!(typeof data.maxFeePerGas === 'string')) return false
           if (!format1.test(data.maxFeePerGas)) return false
           return true
         })()
-        if (sub14) passes3++
-        const sub15 = (() => {
+        if (sub19) passes3++
+        const sub20 = (() => {
           if (!(data.maxFeePerGas === null)) return false
           return true
         })()
-        if (sub15) passes3++
+        if (sub20) passes3++
         if (passes3 !== 1) {
           validate.errors = [
             {
@@ -433,12 +462,12 @@ export function validateRequest(value) {
         return false
       }
       if (0 in data && hasOwn(data, 0)) {
-        const err22 = validate.errors
-        const res22 = ref4(data[0])
-        const suberr22 = ref4.errors
-        validate.errors = err22
-        if (!res22) {
-          validate.errors = [errorMerge(suberr22[0], '#/0/$ref', '#/0')]
+        const err23 = validate.errors
+        const res23 = ref4(data[0])
+        const suberr23 = ref4.errors
+        validate.errors = err23
+        if (!res23) {
+          validate.errors = [errorMerge(suberr23[0], '#/0/$ref', '#/0')]
           return false
         }
       }
@@ -469,7 +498,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format3.test(data[0])) {
+        if (!format2.test(data[0])) {
           validate.errors = [
             { keywordLocation: '#/0/format', instanceLocation: '#/0' },
           ]
@@ -483,7 +512,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format2.test(data[1])) {
+        if (!format4.test(data[1])) {
           validate.errors = [
             { keywordLocation: '#/1/format', instanceLocation: '#/1' },
           ]
@@ -511,12 +540,12 @@ export function validateRequest(value) {
         return false
       }
       if (0 in data && hasOwn(data, 0)) {
-        const err25 = validate.errors
-        const res25 = ref4(data[0])
-        const suberr25 = ref4.errors
-        validate.errors = err25
-        if (!res25) {
-          validate.errors = [errorMerge(suberr25[0], '#/0/$ref', '#/0')]
+        const err26 = validate.errors
+        const res26 = ref4(data[0])
+        const suberr26 = ref4.errors
+        validate.errors = err26
+        if (!res26) {
+          validate.errors = [errorMerge(suberr26[0], '#/0/$ref', '#/0')]
           return false
         }
       }
@@ -528,7 +557,6 @@ export function validateRequest(value) {
       }
       return true
     }
-    const format4 = new RegExp('^(?!_)(\\n|\\r|.)*$', '')
     const ref7 = function validate(data) {
       validate.errors = null
       if (!Array.isArray(data)) {
@@ -548,7 +576,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format3.test(data[0])) {
+        if (!format2.test(data[0])) {
           validate.errors = [
             { keywordLocation: '#/0/format', instanceLocation: '#/0' },
           ]
@@ -568,7 +596,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format4.test(data[1])) {
+        if (!format3.test(data[1])) {
           validate.errors = [
             { keywordLocation: '#/1/format', instanceLocation: '#/1' },
           ]
@@ -702,7 +730,7 @@ export function validateRequest(value) {
             ]
             return false
           }
-          if (!format4.test(data[k].value)) {
+          if (!format3.test(data[k].value)) {
             validate.errors = [
               {
                 keywordLocation: '#/items/properties/value/format',
@@ -739,12 +767,12 @@ export function validateRequest(value) {
         return false
       }
       if (0 in data && hasOwn(data, 0)) {
-        const err28 = validate.errors
-        const res28 = ref9(data[0])
-        const suberr28 = ref9.errors
-        validate.errors = err28
-        if (!res28) {
-          validate.errors = [errorMerge(suberr28[0], '#/0/$ref', '#/0')]
+        const err29 = validate.errors
+        const res29 = ref9(data[0])
+        const suberr29 = ref9.errors
+        validate.errors = err29
+        if (!res29) {
+          validate.errors = [errorMerge(suberr29[0], '#/0/$ref', '#/0')]
           return false
         }
       }
@@ -755,7 +783,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format3.test(data[1])) {
+        if (!format2.test(data[1])) {
           validate.errors = [
             { keywordLocation: '#/1/format', instanceLocation: '#/1' },
           ]
@@ -795,7 +823,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format4.test(data[0])) {
+        if (!format3.test(data[0])) {
           validate.errors = [
             { keywordLocation: '#/0/format', instanceLocation: '#/0' },
           ]
@@ -809,7 +837,7 @@ export function validateRequest(value) {
           ]
           return false
         }
-        if (!format3.test(data[1])) {
+        if (!format2.test(data[1])) {
           validate.errors = [
             { keywordLocation: '#/1/format', instanceLocation: '#/1' },
           ]
@@ -848,14 +876,14 @@ export function validateRequest(value) {
         return false
       }
       if ('eth_accounts' in data && hasOwn(data, 'eth_accounts')) {
-        const err34 = validate.errors
-        const res34 = ref13(data.eth_accounts)
-        const suberr34 = ref13.errors
-        validate.errors = err34
-        if (!res34) {
+        const err35 = validate.errors
+        const res35 = ref13(data.eth_accounts)
+        const suberr35 = ref13.errors
+        validate.errors = err35
+        if (!res35) {
           validate.errors = [
             errorMerge(
-              suberr34[0],
+              suberr35[0],
               '#/properties/eth_accounts/$ref',
               '#/eth_accounts',
             ),
@@ -889,12 +917,12 @@ export function validateRequest(value) {
         return false
       }
       if (0 in data && hasOwn(data, 0)) {
-        const err35 = validate.errors
-        const res35 = ref12(data[0])
-        const suberr35 = ref12.errors
-        validate.errors = err35
-        if (!res35) {
-          validate.errors = [errorMerge(suberr35[0], '#/0/$ref', '#/0')]
+        const err36 = validate.errors
+        const res36 = ref12(data[0])
+        const suberr36 = ref12.errors
+        validate.errors = err36
+        if (!res36) {
+          validate.errors = [errorMerge(suberr36[0], '#/0/$ref', '#/0')]
           return false
         }
       }
@@ -953,7 +981,7 @@ export function validateRequest(value) {
         ]
         return false
       }
-      if (!format3.test(data.address)) {
+      if (!format2.test(data.address)) {
         validate.errors = [
           {
             keywordLocation: '#/properties/address/format',
@@ -1004,21 +1032,21 @@ export function validateRequest(value) {
       }
       if ('image' in data && hasOwn(data, 'image')) {
         let passes4 = 0
-        const sub16 = (() => {
+        const sub21 = (() => {
           if (!(typeof data.image === 'string')) return false
           if (!format6.test(data.image)) return false
           return true
         })()
-        if (sub16) passes4++
-        const sub17 = (() => {
-          const err37 = validate.errors
-          const res37 = ref16(data.image)
-          const suberr37 = ref16.errors
-          validate.errors = err37
-          if (!res37) return false
+        if (sub21) passes4++
+        const sub22 = (() => {
+          const err38 = validate.errors
+          const res38 = ref16(data.image)
+          const suberr38 = ref16.errors
+          validate.errors = err38
+          if (!res38) return false
           return true
         })()
-        if (sub17) passes4++
+        if (sub22) passes4++
         if (passes4 !== 1) {
           validate.errors = [
             {
@@ -1092,13 +1120,13 @@ export function validateRequest(value) {
         ]
         return false
       }
-      const err38 = validate.errors
-      const res38 = ref15(data.options)
-      const suberr38 = ref15.errors
-      validate.errors = err38
-      if (!res38) {
+      const err39 = validate.errors
+      const res39 = ref15(data.options)
+      const suberr39 = ref15.errors
+      validate.errors = err39
+      if (!res39) {
         validate.errors = [
-          errorMerge(suberr38[0], '#/properties/options/$ref', '#/options'),
+          errorMerge(suberr39[0], '#/properties/options/$ref', '#/options'),
         ]
         return false
       }
@@ -1258,14 +1286,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err0 = validate.errors
-          const res0 = ref1(data.params)
-          const suberr0 = ref1.errors
-          validate.errors = err0
-          if (!res0) {
+          const err1 = validate.errors
+          const res1 = ref1(data.params)
+          const suberr1 = ref1.errors
+          validate.errors = err1
+          if (!res1) {
             validate.errors = [
               errorMerge(
-                suberr0[0],
+                suberr1[0],
                 '#/oneOf/3/properties/params/$ref',
                 '#/params',
               ),
@@ -1303,14 +1331,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err1 = validate.errors
-          const res1 = ref1(data.params)
-          const suberr1 = ref1.errors
-          validate.errors = err1
-          if (!res1) {
+          const err2 = validate.errors
+          const res2 = ref1(data.params)
+          const suberr2 = ref1.errors
+          validate.errors = err2
+          if (!res2) {
             validate.errors = [
               errorMerge(
-                suberr1[0],
+                suberr2[0],
                 '#/oneOf/5/properties/params/$ref',
                 '#/params',
               ),
@@ -1328,14 +1356,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err2 = validate.errors
-          const res2 = ref1(data.params)
-          const suberr2 = ref1.errors
-          validate.errors = err2
-          if (!res2) {
+          const err3 = validate.errors
+          const res3 = ref1(data.params)
+          const suberr3 = ref1.errors
+          validate.errors = err3
+          if (!res3) {
             validate.errors = [
               errorMerge(
-                suberr2[0],
+                suberr3[0],
                 '#/oneOf/6/properties/params/$ref',
                 '#/params',
               ),
@@ -1353,14 +1381,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err3 = validate.errors
-          const res3 = ref1(data.params)
-          const suberr3 = ref1.errors
-          validate.errors = err3
-          if (!res3) {
+          const err4 = validate.errors
+          const res4 = ref1(data.params)
+          const suberr4 = ref1.errors
+          validate.errors = err4
+          if (!res4) {
             validate.errors = [
               errorMerge(
-                suberr3[0],
+                suberr4[0],
                 '#/oneOf/7/properties/params/$ref',
                 '#/params',
               ),
@@ -1398,31 +1426,6 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err4 = validate.errors
-          const res4 = ref1(data.params)
-          const suberr4 = ref1.errors
-          validate.errors = err4
-          if (!res4) {
-            validate.errors = [
-              errorMerge(
-                suberr4[0],
-                '#/oneOf/9/properties/params/$ref',
-                '#/params',
-              ),
-            ]
-            return false
-          }
-          break
-        case 'eth_getBlockByHash':
-          if (!('params' in data && hasOwn(data, 'params'))) {
-            validate.errors = [
-              {
-                keywordLocation: '#/oneOf/10/required',
-                instanceLocation: '#/params',
-              },
-            ]
-            return false
-          }
           const err5 = validate.errors
           const res5 = ref1(data.params)
           const suberr5 = ref1.errors
@@ -1431,18 +1434,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr5[0],
-                '#/oneOf/10/properties/params/$ref',
+                '#/oneOf/9/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getBlockByNumber':
+        case 'eth_getBlockByHash':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/11/required',
+                keywordLocation: '#/oneOf/10/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1456,18 +1459,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr6[0],
-                '#/oneOf/11/properties/params/$ref',
+                '#/oneOf/10/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getBlockTransactionCountByHash':
+        case 'eth_getBlockByNumber':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/12/required',
+                keywordLocation: '#/oneOf/11/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1481,18 +1484,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr7[0],
-                '#/oneOf/12/properties/params/$ref',
+                '#/oneOf/11/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getBlockTransactionCountByNumber':
+        case 'eth_getBlockTransactionCountByHash':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/13/required',
+                keywordLocation: '#/oneOf/12/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1506,18 +1509,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr8[0],
-                '#/oneOf/13/properties/params/$ref',
+                '#/oneOf/12/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getCode':
+        case 'eth_getBlockTransactionCountByNumber':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/14/required',
+                keywordLocation: '#/oneOf/13/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1531,63 +1534,63 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr9[0],
-                '#/oneOf/14/properties/params/$ref',
+                '#/oneOf/13/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getCompilers':
+        case 'eth_getCode':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/15/required',
+                keywordLocation: '#/oneOf/14/required',
                 instanceLocation: '#/params',
               },
             ]
             return false
           }
-          if (!(Array.isArray(data.params) && data.params.length === 0)) {
+          const err10 = validate.errors
+          const res10 = ref1(data.params)
+          const suberr10 = ref1.errors
+          validate.errors = err10
+          if (!res10) {
             validate.errors = [
-              {
-                keywordLocation: '#/oneOf/15/properties/params/const',
-                instanceLocation: '#/params',
-              },
+              errorMerge(
+                suberr10[0],
+                '#/oneOf/14/properties/params/$ref',
+                '#/params',
+              ),
             ]
             return false
           }
           break
-        case 'eth_getLogs':
+        case 'eth_getCompilers':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/16/required',
+                keywordLocation: '#/oneOf/15/required',
                 instanceLocation: '#/params',
               },
             ]
             return false
           }
-          const err10 = validate.errors
-          const res10 = ref1(data.params)
-          const suberr10 = ref1.errors
-          validate.errors = err10
-          if (!res10) {
+          if (!(Array.isArray(data.params) && data.params.length === 0)) {
             validate.errors = [
-              errorMerge(
-                suberr10[0],
-                '#/oneOf/16/properties/params/$ref',
-                '#/params',
-              ),
+              {
+                keywordLocation: '#/oneOf/15/properties/params/const',
+                instanceLocation: '#/params',
+              },
             ]
             return false
           }
           break
-        case 'eth_getProof':
+        case 'eth_getLogs':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/17/required',
+                keywordLocation: '#/oneOf/16/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1601,18 +1604,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr11[0],
-                '#/oneOf/17/properties/params/$ref',
+                '#/oneOf/16/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getStorageAt':
+        case 'eth_getProof':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/18/required',
+                keywordLocation: '#/oneOf/17/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1626,18 +1629,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr12[0],
-                '#/oneOf/18/properties/params/$ref',
+                '#/oneOf/17/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getTransactionByBlockHashAndIndex':
+        case 'eth_getStorageAt':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/19/required',
+                keywordLocation: '#/oneOf/18/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1651,18 +1654,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr13[0],
-                '#/oneOf/19/properties/params/$ref',
+                '#/oneOf/18/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getTransactionByBlockNumberAndIndex':
+        case 'eth_getTransactionByBlockHashAndIndex':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/20/required',
+                keywordLocation: '#/oneOf/19/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1676,18 +1679,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr14[0],
-                '#/oneOf/20/properties/params/$ref',
+                '#/oneOf/19/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getTransactionByHash':
+        case 'eth_getTransactionByBlockNumberAndIndex':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/21/required',
+                keywordLocation: '#/oneOf/20/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1701,18 +1704,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr15[0],
-                '#/oneOf/21/properties/params/$ref',
+                '#/oneOf/20/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getTransactionCount':
+        case 'eth_getTransactionByHash':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/22/required',
+                keywordLocation: '#/oneOf/21/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1726,18 +1729,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr16[0],
-                '#/oneOf/22/properties/params/$ref',
+                '#/oneOf/21/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getTransactionReceipt':
+        case 'eth_getTransactionCount':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/23/required',
+                keywordLocation: '#/oneOf/22/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1751,18 +1754,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr17[0],
-                '#/oneOf/23/properties/params/$ref',
+                '#/oneOf/22/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getUncleCountByBlockHash':
+        case 'eth_getTransactionReceipt':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/24/required',
+                keywordLocation: '#/oneOf/23/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1776,18 +1779,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr18[0],
-                '#/oneOf/24/properties/params/$ref',
+                '#/oneOf/23/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getUncleByBlockHashAndIndex':
+        case 'eth_getUncleCountByBlockHash':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/25/required',
+                keywordLocation: '#/oneOf/24/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1801,18 +1804,18 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr19[0],
-                '#/oneOf/25/properties/params/$ref',
+                '#/oneOf/24/properties/params/$ref',
                 '#/params',
               ),
             ]
             return false
           }
           break
-        case 'eth_getUncleByBlockNumberAndIndex':
+        case 'eth_getUncleByBlockHashAndIndex':
           if (!('params' in data && hasOwn(data, 'params'))) {
             validate.errors = [
               {
-                keywordLocation: '#/oneOf/26/required',
+                keywordLocation: '#/oneOf/25/required',
                 instanceLocation: '#/params',
               },
             ]
@@ -1826,6 +1829,31 @@ export function validateRequest(value) {
             validate.errors = [
               errorMerge(
                 suberr20[0],
+                '#/oneOf/25/properties/params/$ref',
+                '#/params',
+              ),
+            ]
+            return false
+          }
+          break
+        case 'eth_getUncleByBlockNumberAndIndex':
+          if (!('params' in data && hasOwn(data, 'params'))) {
+            validate.errors = [
+              {
+                keywordLocation: '#/oneOf/26/required',
+                instanceLocation: '#/params',
+              },
+            ]
+            return false
+          }
+          const err21 = validate.errors
+          const res21 = ref1(data.params)
+          const suberr21 = ref1.errors
+          validate.errors = err21
+          if (!res21) {
+            validate.errors = [
+              errorMerge(
+                suberr21[0],
                 '#/oneOf/26/properties/params/$ref',
                 '#/params',
               ),
@@ -1923,14 +1951,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err21 = validate.errors
-          const res21 = ref2(data.params)
-          const suberr21 = ref2.errors
-          validate.errors = err21
-          if (!res21) {
+          const err22 = validate.errors
+          const res22 = ref2(data.params)
+          const suberr22 = ref2.errors
+          validate.errors = err22
+          if (!res22) {
             validate.errors = [
               errorMerge(
-                suberr21[0],
+                suberr22[0],
                 '#/oneOf/31/properties/params/$ref',
                 '#/params',
               ),
@@ -1948,14 +1976,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err23 = validate.errors
-          const res23 = ref3(data.params)
-          const suberr23 = ref3.errors
-          validate.errors = err23
-          if (!res23) {
+          const err24 = validate.errors
+          const res24 = ref3(data.params)
+          const suberr24 = ref3.errors
+          validate.errors = err24
+          if (!res24) {
             validate.errors = [
               errorMerge(
-                suberr23[0],
+                suberr24[0],
                 '#/oneOf/32/properties/params/$ref',
                 '#/params',
               ),
@@ -1973,14 +2001,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err24 = validate.errors
-          const res24 = ref5(data.params)
-          const suberr24 = ref5.errors
-          validate.errors = err24
-          if (!res24) {
+          const err25 = validate.errors
+          const res25 = ref5(data.params)
+          const suberr25 = ref5.errors
+          validate.errors = err25
+          if (!res25) {
             validate.errors = [
               errorMerge(
-                suberr24[0],
+                suberr25[0],
                 '#/oneOf/33/properties/params/$ref',
                 '#/params',
               ),
@@ -1998,14 +2026,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err26 = validate.errors
-          const res26 = ref6(data.params)
-          const suberr26 = ref6.errors
-          validate.errors = err26
-          if (!res26) {
+          const err27 = validate.errors
+          const res27 = ref6(data.params)
+          const suberr27 = ref6.errors
+          validate.errors = err27
+          if (!res27) {
             validate.errors = [
               errorMerge(
-                suberr26[0],
+                suberr27[0],
                 '#/oneOf/34/properties/params/$ref',
                 '#/params',
               ),
@@ -2023,14 +2051,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err27 = validate.errors
-          const res27 = ref7(data.params)
-          const suberr27 = ref7.errors
-          validate.errors = err27
-          if (!res27) {
+          const err28 = validate.errors
+          const res28 = ref7(data.params)
+          const suberr28 = ref7.errors
+          validate.errors = err28
+          if (!res28) {
             validate.errors = [
               errorMerge(
-                suberr27[0],
+                suberr28[0],
                 '#/oneOf/35/properties/params/$ref',
                 '#/params',
               ),
@@ -2048,14 +2076,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err29 = validate.errors
-          const res29 = ref8(data.params)
-          const suberr29 = ref8.errors
-          validate.errors = err29
-          if (!res29) {
+          const err30 = validate.errors
+          const res30 = ref8(data.params)
+          const suberr30 = ref8.errors
+          validate.errors = err30
+          if (!res30) {
             validate.errors = [
               errorMerge(
-                suberr29[0],
+                suberr30[0],
                 '#/oneOf/36/properties/params/$ref',
                 '#/params',
               ),
@@ -2073,14 +2101,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err30 = validate.errors
-          const res30 = ref7(data.params)
-          const suberr30 = ref7.errors
-          validate.errors = err30
-          if (!res30) {
+          const err31 = validate.errors
+          const res31 = ref7(data.params)
+          const suberr31 = ref7.errors
+          validate.errors = err31
+          if (!res31) {
             validate.errors = [
               errorMerge(
-                suberr30[0],
+                suberr31[0],
                 '#/oneOf/37/properties/params/$ref',
                 '#/params',
               ),
@@ -2098,14 +2126,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err31 = validate.errors
-          const res31 = ref7(data.params)
-          const suberr31 = ref7.errors
-          validate.errors = err31
-          if (!res31) {
+          const err32 = validate.errors
+          const res32 = ref7(data.params)
+          const suberr32 = ref7.errors
+          validate.errors = err32
+          if (!res32) {
             validate.errors = [
               errorMerge(
-                suberr31[0],
+                suberr32[0],
                 '#/oneOf/38/properties/params/$ref',
                 '#/params',
               ),
@@ -2123,14 +2151,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err32 = validate.errors
-          const res32 = ref1(data.params)
-          const suberr32 = ref1.errors
-          validate.errors = err32
-          if (!res32) {
+          const err33 = validate.errors
+          const res33 = ref1(data.params)
+          const suberr33 = ref1.errors
+          validate.errors = err33
+          if (!res33) {
             validate.errors = [
               errorMerge(
-                suberr32[0],
+                suberr33[0],
                 '#/oneOf/39/properties/params/$ref',
                 '#/params',
               ),
@@ -2148,14 +2176,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err33 = validate.errors
-          const res33 = ref10(data.params)
-          const suberr33 = ref10.errors
-          validate.errors = err33
-          if (!res33) {
+          const err34 = validate.errors
+          const res34 = ref10(data.params)
+          const suberr34 = ref10.errors
+          validate.errors = err34
+          if (!res34) {
             validate.errors = [
               errorMerge(
-                suberr33[0],
+                suberr34[0],
                 '#/oneOf/40/properties/params/$ref',
                 '#/params',
               ),
@@ -2213,14 +2241,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err36 = validate.errors
-          const res36 = ref11(data.params)
-          const suberr36 = ref11.errors
-          validate.errors = err36
-          if (!res36) {
+          const err37 = validate.errors
+          const res37 = ref11(data.params)
+          const suberr37 = ref11.errors
+          validate.errors = err37
+          if (!res37) {
             validate.errors = [
               errorMerge(
-                suberr36[0],
+                suberr37[0],
                 '#/oneOf/43/properties/params/$ref',
                 '#/params',
               ),
@@ -2238,14 +2266,14 @@ export function validateRequest(value) {
             ]
             return false
           }
-          const err39 = validate.errors
-          const res39 = ref14(data.params)
-          const suberr39 = ref14.errors
-          validate.errors = err39
-          if (!res39) {
+          const err40 = validate.errors
+          const res40 = ref14(data.params)
+          const suberr40 = ref14.errors
+          validate.errors = err40
+          if (!res40) {
             validate.errors = [
               errorMerge(
-                suberr39[0],
+                suberr40[0],
                 '#/oneOf/44/properties/params/$ref',
                 '#/params',
               ),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exodus/web3-ethereum",
   "description": "Apps connectivity library for EVM-compatible chains.",
-  "version": "1.4.4",
+  "version": "1.4.6",
   "type": "module",
   "sideEffects": false,
   "module": "lib/index.js",
@@ -44,11 +44,11 @@
     "@exodus/json-rpc": "^1.11.0",
     "@exodus/schemasafe": "^1.0.0",
     "@exodus/web3-types": "^1.10.0",
-    "@exodus/web3-validation": "^1.29.0",
+    "@exodus/web3-validation": "^1.29.2",
     "@wallet-standard/base": "^1.0.1"
   },
   "peerDependencies": {
     "@exodus/assets": "^8.0.72"
   },
-  "gitHead": "4d705ac22b258fc6290d9a643dfab3880605be48"
+  "gitHead": "4d9d6eed59fbe201c1e6f2abb4b50f1f336bc690"
 }