Update ox to v9.17.0 (#928)

* Upgrading ox to 9.17.0

* WrappedSignature renamed to SignatureErc6492

* Fixing PasskeySignatureValidator interface

* Lock ox lib dep to use the same version with pnpm overrides and update viem to latest

Author: corbanbrook

package.json

@@ -28,6 +28,11 @@
     "turbo": "^2.6.1",
     "typescript": "^5.8.3"
   },
+  "pnpm": {
+    "overrides": {
+      "ox": "^0.9.17"
+    }
+  },
   "packageManager": "[email protected]",
   "engines": {
     "node": ">=18"

packages/services/guard/package.json

@@ -30,6 +30,6 @@
     "vitest": "^4.0.14"
   },
   "dependencies": {
-    "ox": "^0.7.2"
+    "ox": "^0.9.17"
   }
 }

packages/services/identity-instrument/package.json

@@ -27,6 +27,6 @@
   "dependencies": {
     "json-canonicalize": "^2.0.0",
     "jwt-decode": "^4.0.0",
-    "ox": "^0.7.2"
+    "ox": "^0.9.17"
   }
 }

packages/services/relayer/package.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "@0xsequence/wallet-primitives": "workspace:^",
     "mipd": "^0.0.7",
-    "ox": "^0.7.2",
-    "viem": "^2.37.8"
+    "ox": "^0.9.17",
+    "viem": "^2.40.3"
   }
 }

packages/wallet/core/package.json

@@ -35,7 +35,7 @@
     "@0xsequence/relayer": "workspace:^",
     "@0xsequence/wallet-primitives": "workspace:^",
     "mipd": "^0.0.7",
-    "ox": "^0.7.2",
-    "viem": "^2.37.8"
+    "ox": "^0.9.17",
+    "viem": "^2.40.3"
   }
 }

packages/wallet/core/src/state/sequence/index.ts

@@ -377,10 +377,14 @@ const recoverSapientSignatureCompactSignature =
 const recoverSapientSignatureCompactFunction = AbiFunction.from(recoverSapientSignatureCompactSignature)
 
 class PasskeySignatureValidator implements oxProvider.Provider {
-  request: oxProvider.Provider['request'] = (({ method, params }: { method: string; params: unknown }) => {
-    switch (method) {
+  request: oxProvider.Provider['request'] = (async (request) => {
+    switch (request.method) {
       case 'eth_call':
-        const transaction: TransactionRequest.Rpc = (params as any)[0]
+        if (!request.params || !Array.isArray(request.params) || request.params.length === 0) {
+          throw new Error('eth_call requires transaction parameters')
+        }
+
+        const transaction: TransactionRequest.Rpc = request.params[0]
 
         if (!transaction.data?.startsWith(AbiFunction.getSelector(recoverSapientSignatureCompactFunction))) {
           throw new Error(
@@ -403,15 +407,15 @@ class PasskeySignatureValidator implements oxProvider.Provider {
         }
 
       default:
-        throw new Error(`method ${method} not implemented`)
+        throw new Error(`method ${request.method} not implemented`)
     }
-  }) as any
+  }) as oxProvider.Provider['request']
 
-  on(event: string) {
+  on: oxProvider.Provider['on'] = (event: string) => {
     throw new Error(`unable to listen for ${event}: not implemented`)
   }
 
-  removeListener(event: string) {
+  removeListener: oxProvider.Provider['removeListener'] = (event: string) => {
     throw new Error(`unable to remove listener for ${event}: not implemented`)
   }
 }

packages/wallet/dapp-client/package.json

@@ -34,6 +34,6 @@
     "@0xsequence/relayer": "workspace:^",
     "@0xsequence/wallet-core": "workspace:^",
     "@0xsequence/wallet-primitives": "workspace:^",
-    "ox": "^0.7.2"
+    "ox": "^0.9.17"
   }
 }

packages/wallet/primitives-cli/package.json

@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@0xsequence/wallet-primitives": "workspace:^",
-    "ox": "^0.7.2",
+    "ox": "^0.9.17",
     "yargs": "^18.0.0"
   }
 }

packages/wallet/primitives/package.json

@@ -28,6 +28,6 @@
     "vitest": "^4.0.14"
   },
   "dependencies": {
-    "ox": "^0.7.2"
+    "ox": "^0.9.17"
   }
 }

packages/wallet/primitives/src/erc-6492.ts

@@ -1,5 +1,5 @@
 import { AbiFunction, AbiParameters, Address, Bytes, Hex, Provider } from 'ox'
-import { WrappedSignature } from 'ox/erc6492'
+import { SignatureErc6492 } from 'ox/erc6492'
 import { DEPLOY } from './constants.js'
 import { Context } from './context.js'
 
@@ -29,7 +29,7 @@ export function wrap<T extends Bytes.Bytes | Hex.Hex>(
       [{ type: 'address' }, { type: 'bytes' }, { type: 'bytes' }],
       [to, Hex.from(data), Hex.from(signature)],
     ),
-    WrappedSignature.magicBytes,
+    SignatureErc6492.magicBytes,
   )
 
   switch (typeof signature) {
@@ -46,24 +46,24 @@ export function decode<T extends Bytes.Bytes | Hex.Hex>(
   switch (typeof signature) {
     case 'object':
       if (
-        Bytes.toHex(signature.subarray(-WrappedSignature.magicBytes.slice(2).length / 2)) ===
-        WrappedSignature.magicBytes
+        Bytes.toHex(signature.subarray(-SignatureErc6492.magicBytes.slice(2).length / 2)) ===
+        SignatureErc6492.magicBytes
       ) {
         const [to, data, decoded] = AbiParameters.decode(
           [{ type: 'address' }, { type: 'bytes' }, { type: 'bytes' }],
-          signature.subarray(0, -WrappedSignature.magicBytes.slice(2).length / 2),
+          signature.subarray(0, -SignatureErc6492.magicBytes.slice(2).length / 2),
         )
         return { signature: Hex.toBytes(decoded) as T, erc6492: { to, data: Hex.toBytes(data) as T } }
       } else {
         return { signature }
       }
 
     case 'string':
-      if (signature.endsWith(WrappedSignature.magicBytes.slice(2))) {
+      if (signature.endsWith(SignatureErc6492.magicBytes.slice(2))) {
         try {
           const [to, data, decoded] = AbiParameters.decode(
             [{ type: 'address' }, { type: 'bytes' }, { type: 'bytes' }],
-            signature.slice(0, -WrappedSignature.magicBytes.slice(2).length) as Hex.Hex,
+            signature.slice(0, -SignatureErc6492.magicBytes.slice(2).length) as Hex.Hex,
           )
           return { signature: decoded as T, erc6492: { to, data: data as T } }
         } catch {