Merge pull request #913 from 0xsequence/v3-rc4

ScreamingHawk · web-flow · commit 7ed9aae2f28c · 2025-11-18T10:27:05.000+13:00
Sequence v3 rc4
diff --git a/packages/wallet/core/src/signers/session/explicit.ts b/packages/wallet/core/src/signers/session/explicit.ts
@@ -263,10 +263,7 @@ export class Explicit implements ExplicitSessionSigner {
     }
 
     // Sign it
-    const useDeprecatedHash =
-      Address.isEqual(sessionManagerAddress, Extensions.Dev1.sessions) ||
-      Address.isEqual(sessionManagerAddress, Extensions.Dev2.sessions)
-    const callHash = SessionSignature.hashCallWithReplayProtection(payload, callIdx, chainId, useDeprecatedHash)
+    const callHash = SessionSignature.hashPayloadWithCallIdx(wallet, payload, callIdx, chainId, sessionManagerAddress)
     const sessionSignature = await this._privateKey.signDigest(Bytes.fromHex(callHash))
     return {
       permissionIndex: BigInt(permissionIndex),
diff --git a/packages/wallet/core/src/signers/session/implicit.ts b/packages/wallet/core/src/signers/session/implicit.ts
@@ -115,10 +115,7 @@ export class Implicit implements ImplicitSessionSigner {
     if (!isSupported) {
       throw new Error('Unsupported call')
     }
-    const useDeprecatedHash =
-      Address.isEqual(sessionManagerAddress, Extensions.Dev1.sessions) ||
-      Address.isEqual(sessionManagerAddress, Extensions.Dev2.sessions)
-    const callHash = SessionSignature.hashCallWithReplayProtection(payload, callIdx, chainId, useDeprecatedHash)
+    const callHash = SessionSignature.hashPayloadWithCallIdx(wallet, payload, callIdx, chainId, sessionManagerAddress)
     const sessionSignature = await this._privateKey.signDigest(Bytes.fromHex(callHash))
     return {
       attestation: this._attestation,
diff --git a/packages/wallet/core/src/state/local/index.ts b/packages/wallet/core/src/state/local/index.ts
@@ -66,7 +66,7 @@ export interface Store {
 export class Provider implements ProviderInterface {
   constructor(
     private readonly store: Store = new MemoryStore(),
-    public readonly extensions: Extensions.Extensions = Extensions.Rc3,
+    public readonly extensions: Extensions.Extensions = Extensions.Rc4,
   ) {}
 
   getConfiguration(imageHash: Hex.Hex): Promise<Config.Config | undefined> {
diff --git a/packages/wallet/core/src/state/sequence/index.ts b/packages/wallet/core/src/state/sequence/index.ts
@@ -364,9 +364,12 @@ export class Provider implements ProviderInterface {
   }
 }
 
-const passkeySigners = [Extensions.Dev1.passkeys, Extensions.Dev2.passkeys, Extensions.Rc3.passkeys].map(
-  Address.checksum,
-)
+const passkeySigners = [
+  Extensions.Dev1.passkeys,
+  Extensions.Dev2.passkeys,
+  Extensions.Rc3.passkeys,
+  Extensions.Rc4.passkeys,
+].map(Address.checksum)
 
 const recoverSapientSignatureCompactSignature =
   'function recoverSapientSignatureCompact(bytes32 _digest, bytes _signature) view returns (bytes32)'
diff --git a/packages/wallet/core/test/session-manager.test.ts b/packages/wallet/core/test/session-manager.test.ts
@@ -13,7 +13,7 @@ import {
   USDC_ADDRESS,
 } from './constants'
 import { Extensions } from '@0xsequence/wallet-primitives'
-import { ExplicitSessionConfig } from '../../wdk/src/sequence/types/sessions.js'
+import { ExplicitSessionConfig } from '../src/utils/session/types.js'
 
 const { PermissionBuilder, ERC20PermissionBuilder } = Utils
 
@@ -34,6 +34,10 @@ const ALL_EXTENSIONS = [
     name: 'Rc3',
     ...Extensions.Rc3,
   },
+  {
+    name: 'Rc4',
+    ...Extensions.Rc4,
+  },
 ]
 
 // Handle the increment call being first or last depending on the session manager version
@@ -561,7 +565,7 @@ for (const extension of ALL_EXTENSIONS) {
         }
 
         // Sign the transaction
-        expect(sessionManager.signSapient(wallet.address, chainId, payload, imageHash)).rejects.toThrow(
+        await expect(sessionManager.signSapient(wallet.address, chainId, payload, imageHash)).rejects.toThrow(
           `Signer supporting call is expired: ${explicitSigner.address}`,
         )
       },
diff --git a/packages/wallet/dapp-client/src/ChainSessionManager.ts b/packages/wallet/dapp-client/src/ChainSessionManager.ts
@@ -221,7 +221,7 @@ export class ChainSessionManager {
       stateProvider: this.stateProvider,
     })
     this.sessionManager = new Signers.SessionManager(this.wallet, {
-      sessionManagerAddress: Extensions.Rc3.sessions,
+      sessionManagerAddress: Extensions.Rc4.sessions,
       provider: this.provider!,
     })
     this.isInitialized = true
@@ -730,7 +730,7 @@ export class ChainSessionManager {
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
         const tempManager = new Signers.SessionManager(this.wallet, {
-          sessionManagerAddress: Extensions.Rc3.sessions,
+          sessionManagerAddress: Extensions.Rc4.sessions,
           provider: this.provider,
         })
         const topology = await tempManager.getTopology()
diff --git a/packages/wallet/primitives-cli/src/subcommands/address.ts b/packages/wallet/primitives-cli/src/subcommands/address.ts
@@ -45,7 +45,7 @@ const addressCommand: CommandModule = {
             .option('creationCode', {
               type: 'string',
               description: 'Creation code (optional)',
-              default: Context.Rc3.creationCode,
+              default: Context.Rc4.creationCode,
             })
         },
         async (argv) => {
diff --git a/packages/wallet/primitives/src/context.ts b/packages/wallet/primitives/src/context.ts
@@ -59,6 +59,25 @@ export const Rc3_4337: Context = {
   },
 }
 
+export const Rc4: Context = {
+  factory: '0x00000000000018A77519fcCCa060c2537c9D6d3F',
+  stage1: '0x0000000000003DF093bc4257E6dCE45D937EF161',
+  stage2: '0x10bE1Abf3cD0918bb1079ECc6b8220c177F34088',
+  creationCode: '0x6041600e3d396021805130553df33d3d36153402601f57363d3d373d363d30545af43d82803e903d91601f57fd5bf3',
+}
+
+export const Rc4_4337: Context = {
+  factory: '0x00000000000003c0C955C8AE06FB13cDd19a7ac6',
+  stage1: '0x0000000000003add039FF84b064B7347Fc23C444',
+  stage2: '0x4B3E5735665057A0A15eE448A7293bC01e3b4De9',
+  creationCode: '0x6041600e3d396021805130553df33d3d36153402601f57363d3d373d363d30545af43d82803e903d91601f57fd5bf3',
+  capabilities: {
+    erc4337: {
+      entrypoint: '0x0000000071727De22E5E9d8BAf0edAc6f37da032',
+    },
+  },
+}
+
 export type KnownContext = Context & {
   name: string
   development: boolean
@@ -70,6 +89,8 @@ export const KnownContexts: KnownContext[] = [
   { name: 'Dev2_4337', development: true, ...Dev2_4337 },
   { name: 'Rc3', development: true, ...Rc3 },
   { name: 'Rc3_4337', development: true, ...Rc3_4337 },
+  { name: 'Rc4', development: false, ...Rc4 },
+  { name: 'Rc4_4337', development: false, ...Rc4_4337 },
 ]
 
 export function isKnownContext(context: Context): context is KnownContext {
diff --git a/packages/wallet/primitives/src/extensions/index.ts b/packages/wallet/primitives/src/extensions/index.ts
@@ -24,5 +24,11 @@ export const Rc3: Extensions = {
   sessions: '0x0000000000CC58810c33F3a0D78aA1Ed80FaDcD8',
 }
 
+export const Rc4: Extensions = {
+  passkeys: '0x0000000000005204F3711851EAD52CC9c241499a',
+  recovery: '0x000000000001FC499c3E177DD56Febb0A4bc15b7',
+  sessions: '0x00000000000030Bcc832F7d657f50D6Be35C92b3',
+}
+
 export * as Passkeys from './passkeys.js'
 export * as Recovery from './recovery.js'
diff --git a/packages/wallet/primitives/src/payload.ts b/packages/wallet/primitives/src/payload.ts
@@ -184,6 +184,10 @@ export function isCalls4337_07(payload: Payload): payload is Calls4337_07 {
   return payload.type === 'call_4337_07'
 }
 
+export function isParented(payload: Payload): payload is Parented {
+  return 'parentWallets' in payload
+}
+
 export function toRecovery<T extends MayRecoveryPayload>(payload: T): Recovery<T> {
   if (isRecovery(payload)) {
     return payload
diff --git a/packages/wallet/primitives/src/session-signature.ts b/packages/wallet/primitives/src/session-signature.ts
@@ -1,4 +1,5 @@
 import { Address, Bytes, Hash, Hex } from 'ox'
+import { Attestation, Extensions, Payload } from './index.js'
 import { MAX_PERMISSIONS_COUNT } from './permission.js'
 import {
   decodeSessionsTopology,
@@ -10,7 +11,6 @@ import {
 } from './session-config.js'
 import { RSY } from './signature.js'
 import { minBytesFor, packRSY, unpackRSY } from './utils.js'
-import { Attestation, Payload } from './index.js'
 
 export type ImplicitSessionCallSignature = {
   attestation: Attestation.Attestation
@@ -273,22 +273,48 @@ export function decodeSessionSignature(encodedSignatures: Bytes.Bytes): {
 
 // Call encoding
 
-export function hashCallWithReplayProtection(
-  payload: Payload.Calls,
+/**
+ * Hashes a call with replay protection parameters.
+ * @param payload The payload to hash.
+ * @param callIdx The index of the call to hash.
+ * @param chainId The chain ID. Use 0 when noChainId enabled.
+ * @param sessionManagerAddress The session manager address to compile the hash for. Only required to support deprecated hash encodings for Dev1, Dev2 and Rc3.
+ * @returns The hash of the call with replay protection parameters for sessions.
+ */
+export function hashPayloadWithCallIdx(
+  wallet: Address.Address,
+  payload: Payload.Calls & Payload.Parent,
   callIdx: number,
   chainId: number,
-  skipCallIdx: boolean = false, // Deprecated. Dev1 and Dev2 support
+  sessionManagerAddress?: Address.Address,
 ): Hex.Hex {
-  const call = payload.calls[callIdx]!
-  return Hex.fromBytes(
-    Hash.keccak256(
-      Bytes.concat(
-        Bytes.fromNumber(chainId, { size: 32 }),
-        Bytes.fromNumber(payload.space, { size: 32 }),
-        Bytes.fromNumber(payload.nonce, { size: 32 }),
-        skipCallIdx ? Bytes.from([]) : Bytes.fromNumber(callIdx, { size: 32 }),
-        Bytes.fromHex(Payload.hashCall(call)),
+  // Support deprecated hashes for Dev1, Dev2 and Rc3
+  const deprecatedHashing =
+    sessionManagerAddress &&
+    (Address.isEqual(sessionManagerAddress, Extensions.Dev1.sessions) ||
+      Address.isEqual(sessionManagerAddress, Extensions.Dev2.sessions) ||
+      Address.isEqual(sessionManagerAddress, Extensions.Rc3.sessions))
+  if (deprecatedHashing) {
+    const call = payload.calls[callIdx]!
+    const ignoreCallIdx = !Address.isEqual(sessionManagerAddress, Extensions.Rc3.sessions)
+    return Hex.fromBytes(
+      Hash.keccak256(
+        Bytes.concat(
+          Bytes.fromNumber(chainId, { size: 32 }),
+          Bytes.fromNumber(payload.space, { size: 32 }),
+          Bytes.fromNumber(payload.nonce, { size: 32 }),
+          ignoreCallIdx ? Bytes.from([]) : Bytes.fromNumber(callIdx, { size: 32 }),
+          Bytes.fromHex(Payload.hashCall(call)),
+        ),
       ),
-    ),
-  )
+    )
+  }
+  // Current hashing scheme uses entire payload hash and call index (without last parent)
+  const parentWallets = payload.parentWallets
+  if (payload.parentWallets && payload.parentWallets.length > 0) {
+    payload.parentWallets.pop()
+  }
+  const payloadHash = Payload.hash(wallet, chainId, payload)
+  payload.parentWallets = parentWallets
+  return Hex.fromBytes(Hash.keccak256(Bytes.concat(payloadHash, Bytes.fromNumber(callIdx, { size: 32 }))))
 }
diff --git a/packages/wallet/primitives/test/address.test.ts b/packages/wallet/primitives/test/address.test.ts
@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest'
 import { Address, Bytes, Hash, Hex } from 'ox'
 
 import { from } from '../src/address.js'
-import { Context, Dev1, Dev2, Rc3 } from '../src/context.js'
+import { Context, Dev1, Dev2, Rc3, Rc4 } from '../src/context.js'
 import { Config, hashConfiguration } from '../src/config.js'
 
 describe('Address', () => {
@@ -121,6 +121,19 @@ describe('Address', () => {
       expect(address).not.toBe(dev2Address)
     })
 
+    it('should work with Rc4 context', () => {
+      const { stage2, ...rc4Context } = Rc4
+      const address = from(sampleConfig, rc4Context)
+
+      expect(() => Address.assert(address)).not.toThrow()
+      expect(address).toMatch(/^0x[a-fA-F0-9]{40}$/)
+
+      // Should be different from Dev2
+      const { stage2: _, ...dev2Context } = Dev2
+      const dev2Address = from(sampleConfig, dev2Context)
+      expect(address).not.toBe(dev2Address)
+    })
+
     it('should handle complex topology configurations', () => {
       const complexConfig: Config = {
         threshold: 2n,
diff --git a/packages/wallet/primitives/test/session-signature.test.ts b/packages/wallet/primitives/test/session-signature.test.ts
diff --git a/packages/wallet/wdk/src/sequence/manager.ts b/packages/wallet/wdk/src/sequence/manager.ts
diff --git a/packages/wallet/wdk/test/sessions.test.ts b/packages/wallet/wdk/test/sessions.test.ts

Original file line number	Diff line number	Diff line change
`@@ -364,9 +364,12 @@ export class Provider implements ProviderInterface {`
`364`	`364`	`}`
`365`	`365`	`}`
`366`	`366`
`367`		`-const passkeySigners = [Extensions.Dev1.passkeys, Extensions.Dev2.passkeys, Extensions.Rc3.passkeys].map(`
`368`		`- Address.checksum,`
`369`		`-)`
	`367`	`+const passkeySigners = [`
	`368`	`+ Extensions.Dev1.passkeys,`
	`369`	`+ Extensions.Dev2.passkeys,`
	`370`	`+ Extensions.Rc3.passkeys,`
	`371`	`+ Extensions.Rc4.passkeys,`
	`372`	`+].map(Address.checksum)`
`370`	`373`
`371`	`374`	`const recoverSapientSignatureCompactSignature =`
`372`	`375`	`'function recoverSapientSignatureCompact(bytes32 _digest, bytes _signature) view returns (bytes32)'`