Skip to content

fix(l1): deploy the real epoch proof verifier unless REAL_VERIFIER=false #25517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AztecBot wants to merge 1 commit into from
Closed

fix(l1): deploy the real epoch proof verifier unless REAL_VERIFIER=false #25517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion l1-contracts/script/deploy/RollupConfiguration.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ contract RollupConfiguration is IRollupConfiguration, Test {
}

function useRealVerifier() external view returns (bool) {
return vm.envOr("REAL_VERIFIER", false);
return vm.envOr("REAL_VERIFIER", true);
}

function getFeeJuicePortalInitialBalance() external view returns (uint256) {
Expand Down
1 change: 0 additions & 1 deletion l1-contracts/scripts/run_rollup_upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ echo "=== Deploying rollup upgrade ==="
echo "Registry: $registry_address"

REGISTRY_ADDRESS="$registry_address" \
REAL_VERIFIER="${REAL_VERIFIER:-true}" \
./scripts/forge_broadcast.js \
script/deploy/DeployRollupForUpgrade.s.sol:DeployRollupForUpgrade \
--rpc-url "$L1_RPC_URL" \
Expand Down
13 changes: 13 additions & 0 deletions l1-contracts/test/script/DeployAztecL1Contracts.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ import {stdJson} from "forge-std/StdJson.sol";
import {DeployAztecL1Contracts} from "../../script/deploy/DeployAztecL1Contracts.s.sol";
import {RollupConfiguration} from "../../script/deploy/RollupConfiguration.sol";
import {RegistryRewardOverride, RollupConfigInput} from "@aztec/core/interfaces/IRollup.sol";
import {IVerifier} from "@aztec/core/interfaces/IVerifier.sol";
import {IRewardDistributor} from "@aztec/governance/interfaces/IRewardDistributor.sol";
import {HonkVerifier} from "@generated/HonkVerifier.sol";

contract RollupConfigurationHarness is RollupConfiguration {
function getRegistryRewardOverride(string memory _envName) external view returns (RegistryRewardOverride memory) {
Expand Down Expand Up @@ -95,6 +97,17 @@ contract DeployAztecL1ContractsTest is Test {
deployScript.run();
}

// The mock verifier accepts any proof, so a deployment that does not set REAL_VERIFIER must bind the real one.
function test_DeploysRealVerifierByDefault() public {
DeployAztecL1Contracts deployScript = new DeployAztecL1Contracts();
deployScript.run();

IVerifier verifier = deployScript.output().rollup.rollup.getEpochProofVerifier();
assertEq(
address(verifier).codehash, address(new HonkVerifier()).codehash, "epoch proof verifier is not HonkVerifier"
);
}

function test_RegistryRewardOverridesConfiguration() public {
address registry0 = makeAddr("registry0");
address registry1 = makeAddr("registry1");
Expand Down
Loading