Relayer supports chain switching

Author: ScreamingHawk

packages/wallet/core/src/relayer/local.ts

@@ -5,8 +5,8 @@ import { FeeOption, FeeQuote, OperationStatus, Relayer } from './relayer.js'
 type GenericProviderTransactionReceipt = 'success' | 'failed' | 'unknown'
 
 export interface GenericProvider {
-  sendTransaction(args: { to: string; data: string }): Promise<string>
-  getTransactionReceipt(txHash: string): Promise<GenericProviderTransactionReceipt>
+  sendTransaction(args: { to: string; data: string }, chainId: bigint): Promise<string>
+  getTransactionReceipt(txHash: string, chainId: bigint): Promise<GenericProviderTransactionReceipt>
 }
 
 export class LocalRelayer implements Relayer {
@@ -21,15 +21,33 @@ export class LocalRelayer implements Relayer {
       return undefined
     }
 
+    const trySwitchChain = async (chainId: bigint) => {
+      try {
+        await eth.request({
+          method: 'wallet_switchEthereumChain',
+          params: [
+            {
+              chainId: `0x${chainId.toString(16)}`,
+            },
+          ],
+        })
+      } catch (error) {
+        // Log and continue
+        console.error('Error switching chain', error)
+      }
+    }
+
     return new LocalRelayer({
-      sendTransaction: async (args) => {
+      sendTransaction: async (args, chainId) => {
         const accounts: string[] = await eth.request({ method: 'eth_requestAccounts' })
         const from = accounts[0]
         if (!from) {
           console.warn('No account selected, skipping local relayer')
           return undefined
         }
 
+        await trySwitchChain(chainId)
+
         const tx = await eth.request({
           method: 'eth_sendTransaction',
           params: [
@@ -42,7 +60,9 @@ export class LocalRelayer implements Relayer {
         })
         return tx
       },
-      getTransactionReceipt: async (txHash) => {
+      getTransactionReceipt: async (txHash, chainId) => {
+        await trySwitchChain(chainId)
+
         const rpcReceipt = await eth.request({ method: 'eth_getTransactionReceipt', params: [txHash] })
         if (rpcReceipt) {
           const receipt = TransactionReceipt.fromRpc(rpcReceipt)
@@ -80,17 +100,20 @@ export class LocalRelayer implements Relayer {
   }
 
   async relay(to: Address.Address, data: Hex.Hex, chainId: bigint, _?: FeeQuote): Promise<{ opHash: Hex.Hex }> {
-    const txHash = await this.provider.sendTransaction({
-      to,
-      data,
-    })
+    const txHash = await this.provider.sendTransaction(
+      {
+        to,
+        data,
+      },
+      chainId,
+    )
     Hex.assert(txHash)
 
     return { opHash: txHash }
   }
 
   async status(opHash: Hex.Hex, chainId: bigint): Promise<OperationStatus> {
-    const receipt = await this.provider.getTransactionReceipt(opHash)
+    const receipt = await this.provider.getTransactionReceipt(opHash, chainId)
     if (receipt === 'unknown') {
       // Could be pending but we don't know
       return { status: 'unknown' }

packages/wallet/core/src/relayer/pk-relayer.ts

@@ -13,7 +13,12 @@ export class PkRelayer implements Relayer {
   ) {
     const relayerAddress = Address.fromPublicKey(Secp256k1.getPublicKey({ privateKey }))
     this.relayer = new LocalRelayer({
-      sendTransaction: async (args) => {
+      sendTransaction: async (args, chainId) => {
+        const providerChainId = BigInt(await this.provider.request({ method: 'eth_chainId' }))
+        if (providerChainId !== chainId) {
+          throw new Error('Provider chain id does not match relayer chain id')
+        }
+
         const oxArgs = { ...args, to: args.to as `0x${string}`, data: args.data as `0x${string}` }
         // Estimate gas with a safety buffer
         const estimatedGas = BigInt(await this.provider.request({ method: 'eth_estimateGas', params: [oxArgs] }))
@@ -40,7 +45,6 @@ export class PkRelayer implements Relayer {
         )
 
         // Build the relay envelope
-        const chainId = BigInt(await this.provider.request({ method: 'eth_chainId' }))
         const relayEnvelope = TransactionEnvelopeEip1559.from({
           chainId: Number(chainId),
           type: 'eip1559',
@@ -66,8 +70,14 @@ export class PkRelayer implements Relayer {
         })
         return tx
       },
-      getTransactionReceipt: async (txHash: string) => {
+      getTransactionReceipt: async (txHash: string, chainId: bigint) => {
         Hex.assert(txHash)
+
+        const providerChainId = BigInt(await this.provider.request({ method: 'eth_chainId' }))
+        if (providerChainId !== chainId) {
+          throw new Error('Provider chain id does not match relayer chain id')
+        }
+
         const rpcReceipt = await this.provider.request({ method: 'eth_getTransactionReceipt', params: [txHash] })
         if (!rpcReceipt) {
           return 'unknown'