Migrate ether to viem

Author: rodrigo-fournier-immutable

scripts/biconomy/complete-deployment-cfa-success.json

@@ -1,23 +1,23 @@
 {
-  "timestamp": "2025-09-30T23:11:33.217Z",
+  "timestamp": "2025-10-01T01:09:55.814Z",
   "status": "COMPLETE_SUCCESS_WITH_CFA_AND_SDK",
   "network": "localhost",
   "deployer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
   "infrastructure": {
-    "passportMultiCallDeploy": "0x172076E0166D1F9Cc711C77Adf8488051744980C",
-    "passportFactory": "0x4EE6eCAD1c2Dae9f525404De8555724e3c35d07B",
-    "latestWalletImplLocator": "0xBEc49fA140aCaA83533fB00A2BB19bDdd0290f25",
-    "startupWalletImpl": "0xD84379CEae14AA33C123Af12424A37803F885889",
-    "nexusK1Validator": "0x2B0d36FACD61B71CC05ab8F3D2355ec3631C0dd5",
-    "nexusImplementation": "0xfbC22278A96299D91d41C453234d97b4F5Eb9B2d",
-    "immutableSigner": "0x46b142DD1E924FAb83eCc3c08e4D46E82f005e0E",
+    "passportMultiCallDeploy": "0x1f10F3Ba7ACB61b2F50B9d6DdCf91a6f787C0E82",
+    "passportFactory": "0x457cCf29090fe5A24c19c1bc95F492168C0EaFdb",
+    "latestWalletImplLocator": "0x525C7063E7C20997BaaE9bDa922159152D0e8417",
+    "startupWalletImpl": "0x38a024C0b412B9d1db8BC398140D00F5Af3093D4",
+    "nexusK1Validator": "0x5fc748f1FEb28d7b76fa1c6B07D8ba2d5535177c",
+    "nexusImplementation": "0xB82008565FdC7e44609fA118A4a681E92581e680",
+    "immutableSigner": "0x2a810409872AfC346F9B5b26571Fd6eC42EA4849",
     "locatorToNexusConfigured": true,
-    "configurationTxHash": "0xaf6de818cd1c54e2fc012bb0fcdf03a7f54dd595020bb294b1306ab15b5fa782",
-    "nexusBootstrap": "0x1c85638e118b37167e9298c2268758e058DdfDA0",
-    "k1ValidatorFactory": "0x367761085BF3C12e5DA2Df99AC6E1a824612b8fb",
-    "entryPoint": "0x4C2F7092C2aE51D986bEFEe378e50BD4dB99C901",
+    "configurationTxHash": "0x215f65194b0ae70c29f8ffb38c0a4c9f3de017b010b6af2993ea7093f997aaab",
+    "nexusBootstrap": "0x8A93d247134d91e0de6f96547cB0204e5BE8e5D8",
+    "k1ValidatorFactory": "0x40918Ba7f132E0aCba2CE4de4c4baF9BD2D7D849",
+    "entryPoint": "0xF32D39ff9f6Aa7a7A64d7a4F00a54826Ef791a55",
     "entryPointSource": "deployed_real",
-    "passportCompatibleNexusFactory": "0x7A9Ec1d04904907De0ED7b6839CcdD59c3716AC9",
+    "passportCompatibleNexusFactory": "0xd6e1afe5cA8D00A2EFC01B89997abE2De47fdfAf",
     "cfaCompatibilityEnabled": true,
     "entryPointArtifact": {
       "address": "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
@@ -1339,14 +1339,14 @@
     }
   },
   "wallet": {
-    "address": "0x02b835368996B680b85297C603a216C05dA38DC3",
+    "address": "0x6f5353D9DaD006AAa4D1A91DA675Fd6A75DcdDa7",
     "owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
-    "nexusImplementation": "0xfbC22278A96299D91d41C453234d97b4F5Eb9B2d",
+    "nexusImplementation": "0xB82008565FdC7e44609fA118A4a681E92581e680",
     "cfaCompatible": true
   },
   "cfaCompatibility": {
-    "oldFactoryAddress": "0x4EE6eCAD1c2Dae9f525404De8555724e3c35d07B",
-    "newFactoryAddress": "0x7A9Ec1d04904907De0ED7b6839CcdD59c3716AC9",
+    "oldFactoryAddress": "0x457cCf29090fe5A24c19c1bc95F492168C0EaFdb",
+    "newFactoryAddress": "0xd6e1afe5cA8D00A2EFC01B89997abE2De47fdfAf",
     "cfaPreserved": true
   },
   "sdkTesting": {

scripts/biconomy/deploy-infrastructure-and-wallet.js

@@ -4,14 +4,32 @@ const { newWalletOptions } = require('../wallet-options');
 const { loadEnvironmentInfo } = require('../environment');
 const fs = require('fs');
 
-// Import viem for signature (following Biconomy SDK pattern)
+// Import viem for signature and utilities (following Biconomy SDK pattern)
 const { privateKeyToAccount } = require('viem/accounts');
+const {
+    createPublicClient,
+    http,
+    parseEther,
+    formatEther,
+    zeroAddress,
+    encodeAbiParameters,
+    parseAbiParameters,
+    concat
+} = require('viem');
 
 // Import Biconomy SDK for production testing
 const { createSmartAccountClient } = require('@biconomy/abstractjs');
 const { toNexusAccount } = require('@biconomy/abstractjs');
 const { getMEEVersion, DEFAULT_MEE_VERSION } = require('@biconomy/abstractjs');
-const { http } = require('viem');
+
+// Create viem public client helper
+function createViemPublicClient(network) {
+    const networkConfig = hre.network.config;
+    const rpcUrl = networkConfig.url || 'http://localhost:8545';
+    return createPublicClient({
+        transport: http(rpcUrl)
+    });
+}
 
 // Generate working initData for Nexus deployment
 async function generateWorkingInitData(signerAddress, bootstrapAddress, k1ValidatorAddress) {
@@ -36,15 +54,15 @@ async function generateWorkingInitData(signerAddress, bootstrapAddress, k1Valida
             signerAddress, // defaultValidatorInitData (signer address for K1Validator)
             [], // validators - EMPTY because K1Validator is already the DEFAULT_VALIDATOR
             [], // executors (empty array for 1.2.x)
-            { module: hre.ethers.constants.AddressZero, data: '0x' }, // hook (empty)
+            { module: zeroAddress, data: '0x' }, // hook (empty)
             [], // fallbacks (empty array for 1.2.x)
             [] // prevalidationHooks (empty array for 1.2.x)
         ]
     );
 
     // Create the complete initData structure: [bootstrap_address, bootstrap_call_data]
-    const initData = hre.ethers.utils.defaultAbiCoder.encode(
-        ['address', 'bytes'],
+    const initData = encodeAbiParameters(
+        parseAbiParameters('address, bytes'),
         [bootstrapAddress, bootstrapCallData]
     );
 
@@ -116,10 +134,10 @@ async function testWalletWithOfficialSDK(deployer, network) {
 
         try {
             const targetAddress = '0x70997970C51812dc3A010C7d01b50e0d17dc79C8';
-            const transferAmount = hre.ethers.utils.parseEther('0.001');
+            const transferAmount = parseEther('0.001');
 
             console.log(`[${network}]    🎯 Target: ${targetAddress}`);
-            console.log(`[${network}]    💰 Amount: ${hre.ethers.utils.formatEther(transferAmount)} ETH`);
+            console.log(`[${network}]    💰 Amount: ${formatEther(transferAmount)} ETH`);
 
             const userOp = await smartAccountClient.prepareUserOperation({
                 calls: [{
@@ -226,16 +244,19 @@ async function deployInfrastructureAndWalletWithCFA() {
 
     console.log('Deployer:', await deployer.getAddress());
     console.log('Network:', network);
-    console.log('Balance:', hre.ethers.utils.formatEther(await deployer.getBalance()), 'ETH');
+    console.log('Balance:', formatEther(await deployer.getBalance()), 'ETH');
     console.log('🎯 Deployment Method:', deploymentMethod);
     console.log('🔄 CFA Compatibility: ENABLED');
     console.log('');
 
+    // Initialize viem public client for code verification
+    const publicClient = createViemPublicClient(network);
+
     // PHASE 1: Deploy Infrastructure
     console.log('🏗️  PHASE 1: DEPLOYING INFRASTRUCTURE WITH CFA COMPATIBILITY');
     console.log('===========================================================');
 
-    const infrastructure = await deployInfrastructureWithCFA(deployer, network);
+    const infrastructure = await deployInfrastructureWithCFA(deployer, network, publicClient);
 
     // PHASE 2: Deploy Wallet
     console.log('\n🎯 PHASE 2: DEPLOYING WALLET WITH CFA COMPATIBILITY');
@@ -314,7 +335,7 @@ async function deployInfrastructureAndWalletWithCFA() {
     console.log('📁 Complete results saved to complete-deployment-cfa-success.json');
 }
 
-async function deployInfrastructureWithCFA(deployer, network) {
+async function deployInfrastructureWithCFA(deployer, network, publicClient) {
     console.log('📦 Deploying infrastructure components with CFA compatibility...\n');
 
     // Load EntryPoint artifact once for reuse throughout the function
@@ -345,8 +366,8 @@ async function deployInfrastructureWithCFA(deployer, network) {
 
     // Wait and verify
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const factoryCode = await hre.ethers.provider.getCode(factory.address);
-    if (factoryCode === '0x') throw new Error('Factory deployment verification failed');
+    const factoryCode = await publicClient.getCode({ address: factory.address });
+    if (!factoryCode || factoryCode === '0x') throw new Error('Factory deployment verification failed');
     console.log('✅ Old Factory verified with', Math.floor(factoryCode.length / 2), 'bytes');
 
     // 3. Deploy LatestWalletImplLocator (Step 2)
@@ -361,8 +382,8 @@ async function deployInfrastructureWithCFA(deployer, network) {
 
     // Wait and verify
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const locatorCode = await hre.ethers.provider.getCode(latestWalletImplLocator.address);
-    if (locatorCode === '0x') throw new Error('LatestWalletImplLocator deployment verification failed');
+    const locatorCode = await publicClient.getCode({ address: latestWalletImplLocator.address });
+    if (!locatorCode || locatorCode === '0x') throw new Error('LatestWalletImplLocator deployment verification failed');
     console.log('✅ LatestWalletImplLocator verified with', Math.floor(locatorCode.length / 2), 'bytes');
 
     // 4. Deploy StartupWalletImpl (Step 3)
@@ -376,8 +397,8 @@ async function deployInfrastructureWithCFA(deployer, network) {
 
     // Wait and verify
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const startupCode = await hre.ethers.provider.getCode(startupWalletImpl.address);
-    if (startupCode === '0x') throw new Error('StartupWalletImpl deployment verification failed');
+    const startupCode = await publicClient.getCode({ address: startupWalletImpl.address });
+    if (!startupCode || startupCode === '0x') throw new Error('StartupWalletImpl deployment verification failed');
     console.log('✅ StartupWalletImpl verified with', Math.floor(startupCode.length / 2), 'bytes');
 
     // 5. Deploy K1Validator (Nexus Core - Step 4)
@@ -389,15 +410,15 @@ async function deployInfrastructureWithCFA(deployer, network) {
 
     // Wait and verify
     await new Promise(resolve => setTimeout(resolve, 1000));
-    const validatorCode = await hre.ethers.provider.getCode(k1Validator.address);
-    if (validatorCode === '0x') throw new Error('K1Validator deployment verification failed');
+    const validatorCode = await publicClient.getCode({ address: k1Validator.address });
+    if (!validatorCode || validatorCode === '0x') throw new Error('K1Validator deployment verification failed');
     console.log('✅ K1Validator verified with', Math.floor(validatorCode.length / 2), 'bytes');
 
     // 6. Deploy Nexus Implementation (Step 4)
     console.log('\n6️⃣  Deploying Nexus Implementation (Step 4)...');
     const NexusFactory = await hre.ethers.getContractFactory('Nexus', deployer);
     const testEntryPoint = '0x70997970C51812dc3A010C7d01b50e0d17dc79C8'; // Test EntryPoint
-    const initData = hre.ethers.utils.hexConcat([await deployer.getAddress()]);
+    const initData = concat([await deployer.getAddress()]);
 
     const nexus = await NexusFactory.deploy(
         testEntryPoint,       // entryPoint
@@ -459,7 +480,7 @@ async function deployInfrastructureWithCFA(deployer, network) {
         await deployer.getAddress(), // factoryOwner
         k1Validator.address,        // K1_VALIDATOR
         nexusBootstrap.address,     // BOOTSTRAPPER
-        hre.ethers.constants.AddressZero  // REGISTRY (minimal for now)
+        zeroAddress  // REGISTRY (minimal for now)
     );
     await k1ValidatorFactory.deployed();
     console.log('✅ K1ValidatorFactory:', k1ValidatorFactory.address);
@@ -776,18 +797,18 @@ async function testWalletOperations(infrastructure, walletAddress, deployer, net
         console.log('1️⃣  Testing ETH reception...');
 
         const initialBalance = await hre.ethers.provider.getBalance(walletAddress);
-        console.log(`   Initial wallet balance: ${hre.ethers.utils.formatEther(initialBalance)} ETH`);
+        console.log(`   Initial wallet balance: ${formatEther(initialBalance)} ETH`);
 
         // Send some ETH to the wallet
         const sendTx = await deployer.sendTransaction({
             to: walletAddress,
-            value: hre.ethers.utils.parseEther('0.1'),
+            value: parseEther('0.1'),
             gasLimit: 100000
         });
         await sendTx.wait();
 
         const newBalance = await hre.ethers.provider.getBalance(walletAddress);
-        console.log(`   ✅ ETH sent successfully! New balance: ${hre.ethers.utils.formatEther(newBalance)} ETH`);
+        console.log(`   ✅ ETH sent successfully! New balance: ${formatEther(newBalance)} ETH`);
 
         // Test 2: Check wallet code and type
         console.log('\n2️⃣  Analyzing wallet structure...');

scripts/biconomy/steps/step0.json

@@ -1,7 +1,7 @@
 {
-  "create2DeployerAddress": "0x5FbDB2315678afecb367f032d93F642f64180aa3",
+  "create2DeployerAddress": "0xF8e31cb472bc70500f08Cd84917E5A1912Ec8397",
   "owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
   "network": "localhost",
-  "deployedAt": "2025-09-30T11:31:09.810Z",
+  "deployedAt": "2025-10-01T00:59:54.768Z",
   "codeSize": 3125
 }

scripts/biconomy/steps/step0.ts

@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import * as hre from 'hardhat';
+import { createPublicClient, http } from 'viem';
 import { EnvironmentInfo, loadEnvironmentInfo } from '../../environment';
 import { newWalletOptions, WalletOptions } from '../../wallet-options';
 import { deployContract } from '../../contract';
@@ -22,16 +23,26 @@ async function step0(): Promise<EnvironmentInfo> {
     // Setup wallet
     const wallets: WalletOptions = await newWalletOptions(env);
     const deployer = wallets.getWallet();
+    const deployerAddress = await deployer.getAddress(); // Get address using ethers method
 
     // Deploy OwnableCreate2Deployer
     console.log(`[${network}] Deploying OwnableCreate2Deployer...`);
     const create2Deployer = await deployContract(env, wallets, 'OwnableCreate2Deployer', [
-        await deployer.getAddress() // Owner of the deployer (use deployer as owner)
+        deployerAddress // Owner of the deployer (use deployer as owner)
     ]);
 
-    // Verify deployment
-    const deployedCode = await hre.ethers.provider.getCode(create2Deployer.address);
-    if (deployedCode === '0x') {
+    // Verify deployment using viem public client
+    const networkConfig = hre.network.config as any;
+    const rpcUrl = networkConfig.url || 'http://localhost:8545';
+    const publicClient = createPublicClient({
+        transport: http(rpcUrl)
+    });
+
+    const deployedCode = await publicClient.getCode({
+        address: create2Deployer.address as `0x${string}`
+    });
+
+    if (!deployedCode || deployedCode === '0x') {
         throw new Error('OwnableCreate2Deployer deployment verification failed');
     }
 
@@ -41,7 +52,7 @@ async function step0(): Promise<EnvironmentInfo> {
     // Save deployment information
     const deploymentData = {
         create2DeployerAddress: create2Deployer.address,
-        owner: await deployer.getAddress(),
+        owner: deployerAddress, // Use cached address
         network: network,
         deployedAt: new Date().toISOString(),
         codeSize: Math.floor(deployedCode.length / 2)
@@ -51,7 +62,7 @@ async function step0(): Promise<EnvironmentInfo> {
 
     console.log(`[${network}] Step 0 deployment completed`);
     console.log(`[${network}] OwnableCreate2Deployer deployed at: ${create2Deployer.address}`);
-    console.log(`[${network}] Owner: ${await deployer.getAddress()}`);
+    console.log(`[${network}] Owner: ${deployerAddress}`); // Use cached address
     console.log(`[${network}] 📋 IMPORTANT: Update DEPLOYER_CONTRACT_ADDRESS in .env to: ${create2Deployer.address}`);
     console.log(`[${network}] 📋 This deployer will be used for deterministic CREATE2 deployments in subsequent steps`);
 

scripts/biconomy/steps/step1.json

@@ -1,6 +1,6 @@
 {
  "multiCallAdminPubKey": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
  "factoryAdminPubKey": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
- "multiCallDeploy": "0xe7f1725E7734CE288F8367e1Bb143E90bb3F0512",
- "factory": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0"
+ "multiCallDeploy": "0xc0F115A19107322cFBf1cDBC7ea011C19EbDB4F8",
+ "factory": "0xc96304e3c037f81dA488ed9dEa1D8F2a48278a75"
 }

scripts/biconomy/steps/step10.json

@@ -1,13 +1,13 @@
 {
-  "timestamp": "2025-09-30T22:28:23.790Z",
+  "timestamp": "2025-10-01T01:03:38.304Z",
   "network": "localhost",
   "deployer": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
   "step": 10,
   "description": "K1ValidatorFactory (Complete Factory)",
-  "k1ValidatorFactory": "0x7bc06c482DEAd17c0e297aFbC32f6e63d3846650",
-  "accountImplementation": "0x24F5E63b0Faa059f11E5fC897215FE707bbC8ccF",
-  "k1ValidatorModule": "0x057bA9624F8912122D9E2370Ec8d6197748644Ca",
-  "bootstrapper": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318",
+  "k1ValidatorFactory": "0x3347B4d90ebe72BeFb30444C9966B2B990aE9FcB",
+  "accountImplementation": "0xD6Bbb18a1141ab3eC0fAf542272F486C1566b1Dc",
+  "k1ValidatorModule": "0x7F1f0b249CB8e5d11E6c0fb8d9a4b7Bbf471614F",
+  "bootstrapper": "0xfaAddC93baf78e89DCf37bA67943E1bE8F37Bb8c",
   "registry": "0x0000000000000000000000000000000000000000",
   "codeSize": 6677,
   "configurationVerified": true,

scripts/biconomy/steps/step10.ts

@@ -1,6 +1,7 @@
 // Step 10: Deploy K1ValidatorFactory (Complete Factory)
 import * as hre from 'hardhat';
 import * as fs from 'fs';
+import { createPublicClient, http, zeroAddress } from 'viem';
 import { EnvironmentInfo, loadEnvironmentInfo } from '../../environment';
 import { newWalletOptions } from '../../wallet-options';
 
@@ -18,6 +19,13 @@ async function deployK1ValidatorFactory() {
     const deployer = walletOptions.getWallet();
     const deployerAddress = await deployer.getAddress();
 
+    // Setup viem public client for code verification
+    const networkConfig = hre.network.config as any;
+    const rpcUrl = networkConfig.url || 'http://localhost:8545';
+    const publicClient = createPublicClient({
+        transport: http(rpcUrl)
+    });
+
     console.log(`[${network}] Deployer: ${deployerAddress}`);
 
     try {
@@ -43,16 +51,19 @@ async function deployK1ValidatorFactory() {
             deployerAddress,            // factoryOwner
             k1Validator,               // K1_VALIDATOR
             nexusBootstrap,            // BOOTSTRAPPER
-            hre.ethers.constants.AddressZero  // REGISTRY (minimal for now)
+            zeroAddress                 // REGISTRY (minimal for now) - using viem zeroAddress
         );
         await k1ValidatorFactory.deployed();
 
         console.log(`[${network}] ✅ K1ValidatorFactory deployed at: ${k1ValidatorFactory.address}`);
 
-        // Verify deployment
+        // Verify deployment using viem
         await new Promise(resolve => setTimeout(resolve, 1000));
-        const k1FactoryCode = await hre.ethers.provider.getCode(k1ValidatorFactory.address);
-        if (k1FactoryCode === '0x') {
+        const k1FactoryCode = await publicClient.getCode({
+            address: k1ValidatorFactory.address as `0x${string}`
+        });
+
+        if (!k1FactoryCode || k1FactoryCode === '0x') {
             throw new Error('K1ValidatorFactory deployment verification failed');
         }
         console.log(`[${network}] ✅ K1ValidatorFactory verified with ${Math.floor(k1FactoryCode.length / 2)} bytes`);
@@ -103,7 +114,7 @@ async function deployK1ValidatorFactory() {
             accountImplementation: nexusImplementation,
             k1ValidatorModule: k1Validator,
             bootstrapper: nexusBootstrap,
-            registry: hre.ethers.constants.AddressZero,
+            registry: zeroAddress, // Use viem zeroAddress
 
             // Verification
             codeSize: Math.floor(k1FactoryCode.length / 2),

scripts/biconomy/steps/step2.json

@@ -1,5 +1,5 @@
 {
  "walletImplLocatorAdmin": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
  "walletImplChangerAdmin": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
- "latestWalletImplLocator": "0xc5D329d715A933F141Bd57D26296F9F6e6d61BA6"
+ "latestWalletImplLocator": "0x1B74C2020592f8B0cb5Eb66C089F3fEa9e5fB6fc"
 }