Test stability

Author: ScreamingHawk

packages/utils/migration/src/migrations/v1/encoder_v1_v3.ts

@@ -66,7 +66,6 @@ export class MigrationEncoder_v1v3
 
     const space = options?.space ?? BigInt(MIGRATION_V1_V3_NONCE_SPACE)
     const nonce = 0n // Nonce must be unused
-    // const v2Nonce = v2commons.transaction.encodeNonce(space, nonce)
 
     // Update implementation to v3
     const updateImplementationAbi = AbiFunction.from('function updateImplementation(address implementation)')

packages/utils/migration/test/encoder_v1_v3.test.ts

@@ -28,7 +28,7 @@ const convertContextToV3Context = (context: v2commons.context.WalletContext): V3
   }
 }
 
-describe('MigrationEncoder_v1v3', () => {
+describe('MigrationEncoder_v1v3', async () => {
   let anvilSigner: MultiSigner
   let testSigner: MultiSigner
 
@@ -57,7 +57,7 @@ describe('MigrationEncoder_v1v3', () => {
     testSigner = createMultiSigner(testSignerPk, providers.v2)
   })
 
-  describe('convertConfig', () => {
+  describe('convertConfig', async () => {
     it('should convert v1 config to v3 config with single signer', async () => {
       const v1Config: v1.config.WalletConfig = {
         version: 1,
@@ -251,7 +251,7 @@ describe('MigrationEncoder_v1v3', () => {
     })
   })
 
-  describe('prepareMigration', () => {
+  describe('prepareMigration', async () => {
     it('should prepare migration transactions correctly', async () => {
       const walletAddress = testAddress
       const contexts: VersionedContext = {
@@ -396,7 +396,7 @@ describe('MigrationEncoder_v1v3', () => {
     })
   })
 
-  describe('decodeTransactions', () => {
+  describe('decodeTransactions', async () => {
     it('should decode transactions correctly', async () => {
       const walletAddress = testAddress
       const imageHash = '0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef'
@@ -524,7 +524,7 @@ describe('MigrationEncoder_v1v3', () => {
     })
   })
 
-  describe('constants', () => {
+  describe('constants', async () => {
     it('should have correct nonce space', () => {
       expect(MIGRATION_V1_V3_NONCE_SPACE).toBe('0x9e4d5bdafd978baf1290aff23057245a2a62bef5')
     })
@@ -535,7 +535,7 @@ describe('MigrationEncoder_v1v3', () => {
     })
   })
 
-  describe('integration test', () => {
+  describe('integration test', async () => {
     it('should use migration ', async () => {
       // Create v1 config
       const v1Config: v1.config.WalletConfig = {
@@ -620,6 +620,9 @@ describe('MigrationEncoder_v1v3', () => {
       expect(receipt?.status).toBe(1)
       // This should now be a v3 wallet on chain
 
+      // Wait for any pending transactions to fully settle
+      await new Promise((resolve) => setTimeout(resolve, 100))
+
       // Save the wallet information to the state provider
       const stateProvider = new State.Local.Provider()
       await stateProvider.saveDeploy(v1ImageHash, convertContextToV3Context(v1.DeployedWalletContext))
@@ -653,6 +656,8 @@ describe('MigrationEncoder_v1v3', () => {
         method: 'eth_sendTransaction',
         params: [signedTx],
       })
+      // Wait a bit for the transaction to be mined
+      await new Promise((resolve) => setTimeout(resolve, 3000))
       const testReceipt = await providers.v3.request({
         method: 'eth_getTransactionReceipt',
         params: [testTx],

packages/utils/migration/test/migrator_v1_v3.test.ts

@@ -11,7 +11,7 @@ import { assert, beforeEach, describe, expect, it } from 'vitest'
 import { Migrator_v1v3, MigratorV1V3Options } from '../src/migrations/v1/migrator_v1_v3.js'
 import { createMultiSigner, type MultiSigner, type V1WalletType } from './testUtils.js'
 
-describe('Migrator_v1v3', () => {
+describe('Migrator_v1v3', async () => {
   let anvilSigner: MultiSigner
   let testSigner: MultiSigner
 
@@ -42,7 +42,7 @@ describe('Migrator_v1v3', () => {
     testSigner = createMultiSigner(Secp256k1.randomPrivateKey(), providers.v2)
   })
 
-  describe('convertWallet', () => {
+  describe('convertWallet', async () => {
     it('should convert a v1 wallet to a v3 wallet', async () => {
       const v1Config = {
         version: 1,
@@ -84,6 +84,9 @@ describe('Migrator_v1v3', () => {
       }
       const v3Wallet = await migrator.convertWallet(v1Wallet, options)
 
+      // Wait for any pending transactions from v1 wallet operations to settle
+      await new Promise((resolve) => setTimeout(resolve, 100))
+
       // Test the wallet works as a v3 wallet now with a test transaction
       const call: Payload.Call = {
         to: Address.from('0x0000000000000000000000000000000000000000'),
@@ -111,6 +114,8 @@ describe('Migrator_v1v3', () => {
         method: 'eth_sendTransaction',
         params: [signedTx],
       })
+      // Wait a bit for the transaction to be mined
+      await new Promise((resolve) => setTimeout(resolve, 3000))
       const receipt = await providers.v3.request({
         method: 'eth_getTransactionReceipt',
         params: [testTx],