From 8aef04368616795cbcfb59541f1c043a63e2bb76 Mon Sep 17 00:00:00 2001 From: Alex Gherghisan Date: Tue, 13 Aug 2024 09:31:54 +0000 Subject: [PATCH] fix: correct contract name --- .../cli/src/cmds/l1/deploy_l1_verifier.ts | 16 ++++++++-------- yarn-project/cli/src/cmds/l1/index.ts | 4 ++-- .../integration_proof_verification.test.ts | 10 +++++----- .../end-to-end/src/e2e_prover/e2e_prover_test.ts | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts b/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts index 39d10398c99..a338352d21e 100644 --- a/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts +++ b/yarn-project/cli/src/cmds/l1/deploy_l1_verifier.ts @@ -8,7 +8,7 @@ import solc from 'solc'; import { getContract } from 'viem'; import { mnemonicToAccount, privateKeyToAccount } from 'viem/accounts'; -export async function deployUltraVerifier( +export async function deployUltraHonkVerifier( ethRpcUrl: string, privateKey: string, mnemonic: string, @@ -26,13 +26,13 @@ export async function deployUltraVerifier( const { BBCircuitVerifier } = await import('@aztec/bb-prover'); const circuitVerifier = await BBCircuitVerifier.new({ bbBinaryPath, bbWorkingDirectory }); - const contractSrc = await circuitVerifier.generateSolidityContract('RootRollupArtifact', 'UltraVerifier.sol'); - log('Generated UltraVerifier contract'); + const contractSrc = await circuitVerifier.generateSolidityContract('RootRollupArtifact', 'UltraHonkVerifier.sol'); + log('Generated UltraHonkVerifier contract'); const input = { language: 'Solidity', sources: { - 'UltraVerifier.sol': { + 'UltraHonkVerifier.sol': { content: contractSrc, }, }, @@ -52,10 +52,10 @@ export async function deployUltraVerifier( }; const output = JSON.parse(solc.compile(JSON.stringify(input))); - log('Compiled UltraVerifier'); + log('Compiled UltraHonkVerifier'); - const abi = output.contracts['UltraVerifier.sol']['UltraVerifier'].abi; - const bytecode: string = output.contracts['UltraVerifier.sol']['UltraVerifier'].evm.bytecode.object; + const abi = output.contracts['UltraHonkVerifier.sol']['UltraHonkVerifier'].abi; + const bytecode: string = output.contracts['UltraHonkVerifier.sol']['HonkVerifier'].evm.bytecode.object; const account = !privateKey ? mnemonicToAccount(mnemonic!) @@ -63,7 +63,7 @@ export async function deployUltraVerifier( const { publicClient, walletClient } = createL1Clients(ethRpcUrl, account); const verifierAddress = await deployL1Contract(walletClient, publicClient, abi, `0x${bytecode}`); - log(`Deployed UltraVerifier at ${verifierAddress.toString()}`); + log(`Deployed HonkVerifier at ${verifierAddress.toString()}`); const pxe = await createCompatibleClient(pxeRpcUrl, debugLogger); const { l1ContractAddresses } = await pxe.getNodeInfo(); diff --git a/yarn-project/cli/src/cmds/l1/index.ts b/yarn-project/cli/src/cmds/l1/index.ts index 21457b31d5f..3653949339c 100644 --- a/yarn-project/cli/src/cmds/l1/index.ts +++ b/yarn-project/cli/src/cmds/l1/index.ts @@ -61,7 +61,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: DebugL .option('--bb ', 'Path to bb binary') .option('--bb-working-dir ', 'Path to bb working directory') .action(async options => { - const { deployMockVerifier, deployUltraVerifier } = await import('./deploy_l1_verifier.js'); + const { deployMockVerifier, deployUltraHonkVerifier } = await import('./deploy_l1_verifier.js'); if (options.verifier === 'mock') { await deployMockVerifier( options.ethRpcUrl, @@ -72,7 +72,7 @@ export function injectCommands(program: Command, log: LogFn, debugLogger: DebugL debugLogger, ); } else { - await deployUltraVerifier( + await deployUltraHonkVerifier( options.ethRpcUrl, options.privateKey, options.mnemonic, diff --git a/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts b/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts index 641bb5faded..522e295d58f 100644 --- a/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts +++ b/yarn-project/end-to-end/src/composed/integration_proof_verification.test.ts @@ -74,8 +74,8 @@ describe('proof_verification', () => { const input = { language: 'Solidity', sources: { - 'UltraVerifier.sol': { - content: await circuitVerifier.generateSolidityContract('RootRollupArtifact', 'UltraVerifier.sol'), + 'UltraHonkVerifier.sol': { + content: await circuitVerifier.generateSolidityContract('RootRollupArtifact', 'UltraHonkVerifier.sol'), }, }, settings: { @@ -95,8 +95,8 @@ describe('proof_verification', () => { const output = JSON.parse(solc.compile(JSON.stringify(input))); - const abi = output.contracts['UltraVerifier.sol']['UltraVerifier'].abi; - const bytecode: string = output.contracts['UltraVerifier.sol']['UltraVerifier'].evm.bytecode.object; + const abi = output.contracts['UltraHonkVerifier.sol']['HonkVerifier'].abi; + const bytecode: string = output.contracts['UltraHonkVerifier.sol']['HonkVerifier'].evm.bytecode.object; const verifierAddress = await deployL1Contract(walletClient, publicClient, abi, `0x${bytecode}`); verifierContract = getContract({ @@ -132,7 +132,7 @@ describe('proof_verification', () => { }); }); - describe('UltraVerifier', () => { + describe('HonkVerifier', () => { it('verifies full proof', async () => { const reader = BufferReader.asReader(proof.buffer); // +2 fields for archive diff --git a/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts b/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts index 8dd6605f764..65bc3b987a6 100644 --- a/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts +++ b/yarn-project/end-to-end/src/e2e_prover/e2e_prover_test.ts @@ -324,8 +324,8 @@ export class FullProverTest { const output = JSON.parse(solc.compile(JSON.stringify(input))); - const abi = output.contracts['UltraVerifier.sol']['UltraVerifier'].abi; - const bytecode: string = output.contracts['UltraVerifier.sol']['UltraVerifier'].evm.bytecode.object; + const abi = output.contracts['UltraHonkVerifier.sol']['HonkVerifier'].abi; + const bytecode: string = output.contracts['UltraHonkVerifier.sol']['HonkVerifier'].evm.bytecode.object; const verifierAddress = await deployL1Contract(walletClient, publicClient, abi, `0x${bytecode}`);