Enable chainId test

Author: ScreamingHawk

packages/wallet/core/src/signers/session-manager.ts

@@ -262,19 +262,18 @@ export class SessionManager implements SapientSigner {
     if (!Address.isEqual(wallet, this.wallet.address)) {
       throw new Error('Wallet address mismatch')
     }
+    if (this._provider) {
+      const providerChainId = await this._provider.request({
+        method: 'eth_chainId',
+      })
+      if (providerChainId !== Hex.fromNumber(chainId)) {
+        throw new Error(`Provider chain id mismatch, expected ${Hex.fromNumber(chainId)} but got ${providerChainId}`)
+      }
+    }
     if ((await this.imageHash) !== imageHash) {
       throw new Error('Unexpected image hash')
     }
     const topology = await this._getTopologyForImageHash(imageHash)
-    //FIXME Test chain id
-    // if (this._provider) {
-    //   const providerChainId = await this._provider.request({
-    //     method: 'eth_chainId',
-    //   })
-    //   if (providerChainId !== Hex.fromNumber(chainId)) {
-    //     throw new Error(`Provider chain id mismatch, expected ${Hex.fromNumber(chainId)} but got ${providerChainId}`)
-    //   }
-    // }
     if (!Payload.isCalls(payload) || payload.calls.length === 0) {
       throw new Error('Only calls are supported')
     }
@@ -363,22 +362,20 @@ export class SessionManager implements SapientSigner {
     if (!Address.isEqual(wallet, this.wallet.address)) {
       throw new Error('Wallet address mismatch')
     }
-    if (!Payload.isCalls(payload)) {
+    if (!Payload.isCalls(payload) || payload.calls.length === 0) {
       // Only calls are supported
       return false
     }
     if (!this._provider) {
       throw new Error('Provider not set')
     }
-    //FIXME Test chain id
-    // const providerChainId = await this._provider.request({
-    //   method: 'eth_chainId',
-    // })
-    // if (providerChainId !== Hex.fromNumber(chainId)) {
-    //   throw new Error(
-    //     `Provider chain id mismatch, expected ${Hex.fromNumber(chainId)} but got ${providerChainId}`,
-    //   )
-    // }
+    // Test chain id
+    const providerChainId = await this._provider.request({
+      method: 'eth_chainId',
+    })
+    if (providerChainId !== Hex.fromNumber(chainId)) {
+      throw new Error(`Provider chain id mismatch, expected ${Hex.fromNumber(chainId)} but got ${providerChainId}`)
+    }
 
     const encodedPayload = Payload.encodeSapient(chainId, payload)
     const encodedCallData = AbiFunction.encodeData(Constants.RECOVER_SAPIENT_SIGNATURE, [

packages/wallet/core/test/session-manager.test.ts

@@ -300,7 +300,7 @@ for (const extension of ALL_EXTENSIONS) {
       'should fail to sign with an expired explicit session',
       async () => {
         const provider = Provider.from(RpcTransport.fromHttp(LOCAL_RPC_URL))
-        const chainId = 0
+        const chainId = Number(await provider.request({ method: 'eth_chainId' }))
 
         // Create explicit signer
         const explicitPrivateKey = Secp256k1.randomPrivateKey()
@@ -353,7 +353,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(
           'No signers match the topology',
         )
       },

packages/wallet/wdk/test/sessions.test.ts

@@ -154,7 +154,7 @@ describe('Sessions (via Manager)', () => {
     }
     const signature = await dapp.sessionManager.signSapient(
       dapp.wallet.address,
-      chainId ?? 1n,
+      chainId,
       parentedEnvelope,
       sessionImageHash,
     )
@@ -258,7 +258,7 @@ describe('Sessions (via Manager)', () => {
         // Configure mock provider
         ;(provider as any).request.mockImplementation(({ method, params }) => {
           if (method === 'eth_chainId') {
-            return Promise.resolve(chainId.toString())
+            return Promise.resolve(Hex.fromNumber(chainId))
           }
           if (method === 'eth_call' && params[0].data === AbiFunction.encodeData(Constants.GET_IMPLEMENTATION)) {
             // Undeployed wallet
@@ -332,7 +332,7 @@ describe('Sessions (via Manager)', () => {
         // Configure mock provider
         ;(provider as any).request.mockImplementation(({ method, params }) => {
           if (method === 'eth_chainId') {
-            return Promise.resolve(chainId.toString())
+            return Promise.resolve(Hex.fromNumber(chainId))
           }
           if (method === 'eth_call' && params[0].data === AbiFunction.encodeData(Constants.GET_IMPLEMENTATION)) {
             // Undeployed wallet
@@ -407,7 +407,7 @@ describe('Sessions (via Manager)', () => {
         // Configure mock provider
         ;(provider as any).request.mockImplementation(({ method, params }) => {
           if (method === 'eth_chainId') {
-            return Promise.resolve(chainId.toString())
+            return Promise.resolve(Hex.fromNumber(chainId))
           }
           if (method === 'eth_call' && params[0].data === AbiFunction.encodeData(Constants.GET_IMPLEMENTATION)) {
             // Undeployed wallet
@@ -494,7 +494,7 @@ describe('Sessions (via Manager)', () => {
         // Configure mock provider
         ;(provider as any).request.mockImplementation(({ method, params }) => {
           if (method === 'eth_chainId') {
-            return Promise.resolve(chainId.toString())
+            return Promise.resolve(Hex.fromNumber(chainId))
           }
           if (method === 'eth_call' && params[0].data === AbiFunction.encodeData(Constants.GET_IMPLEMENTATION)) {
             // Undeployed wallet