Skip to content

fix(deploy): unbreak main compile — rename stale authoriser constants after #222 #235

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

Merged
thedavidmeister merged 1 commit into from
Jul 8, 2026
Merged

fix(deploy): unbreak main compile — rename stale authoriser constants after #222 #235

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
8 changes: 4 additions & 4 deletions script/20260619-deploy-v4-authoriser-clone.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ error V4ImplNotDeployed(address impl);
/// non-canonical contract is squatting the address or that the Zoltu
/// deploy emitted different bytecode than the lib expects.
/// @param impl The V4 impl address inspected.
/// @param expected The pinned codehash (`STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_RAIN_VATS_0_1_6`).
/// @param expected The pinned codehash (`STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_0_1_1`).
/// @param actual The codehash observed at `impl`.
error V4ImplCodehashMismatch(address impl, bytes32 expected, bytes32 actual);

Expand Down Expand Up @@ -289,7 +289,7 @@ contract DeployV4AuthoriserClone is Script {
// if it isn't there or has the wrong code, the clone would
// either fail to initialize or initialize against attacker
// code.
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6;
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1;
assertV4ImplDeployed(v4Impl);

// Pre-flight: the canonical CloneFactory is deployed with the
Expand Down Expand Up @@ -494,7 +494,7 @@ contract DeployV4AuthoriserClone is Script {
/// @param parsedTo The `transactions[0].to` reported by the parser.
/// @param parsedTxs The parsed transactions array (length == 1).
function verifyDeployBundle(IGnosisSafe safe, address parsedTo, SafeTx[] memory parsedTxs) internal view {
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6;
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1;
assertV4ImplDeployed(v4Impl);

address factoryAddr = LibCloneFactoryDeploy.CLONE_FACTORY_DEPLOYED_ADDRESS;
Expand Down Expand Up @@ -607,7 +607,7 @@ contract DeployV4AuthoriserClone is Script {
function assertV4ImplDeployed(address impl) internal view {
if (impl.code.length == 0) revert V4ImplNotDeployed(impl);
bytes32 actual = impl.codehash;
bytes32 expected = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_RAIN_VATS_0_1_6;
bytes32 expected = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_0_1_1;
if (actual != expected) revert V4ImplCodehashMismatch(impl, expected, actual);
}

Expand Down
12 changes: 6 additions & 6 deletions test/script/20260619-deploy-v4-authoriser-clone.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ contract DeployV4AuthoriserCloneTest is Test {
safe = IGnosisSafe(LibSafeInvariants.STOX_TOKEN_OWNER_SAFE);
StoxOffchainAssetReceiptVaultAuthorizerV1 impl = new StoxOffchainAssetReceiptVaultAuthorizerV1();
v4ImplRuntime = address(impl).code;
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6, v4ImplRuntime);
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1, v4ImplRuntime);
}

/// @notice `run()` dry-run completes against the live pre-state, writes
Expand Down Expand Up @@ -192,7 +192,7 @@ contract DeployV4AuthoriserCloneTest is Test {
// the fork's state slot and the revert may or may not preserve
// it depending on whether the snapshot captured it; etching
// again is idempotent).
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6, v4ImplRuntime);
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1, v4ImplRuntime);
script.verify(artifactPath);
}

Expand Down Expand Up @@ -226,7 +226,7 @@ contract DeployV4AuthoriserCloneTest is Test {
/// code at the pin so `impl.code.length == 0` trips first.
function testRunRejectsMissingV4Impl() external {
selectBaseFork();
address implAddr = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6;
address implAddr = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1;
vm.etch(implAddr, new bytes(0));
vm.expectRevert(abi.encodeWithSelector(V4ImplNotDeployed.selector, implAddr));
script.run();
Expand All @@ -238,10 +238,10 @@ contract DeployV4AuthoriserCloneTest is Test {
/// not the canonical bytecode.
function testRunRejectsV4ImplCodehashDrift() external {
selectBaseFork();
address implAddr = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6;
address implAddr = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1;
bytes memory stub = hex"60005260206000F3";
vm.etch(implAddr, stub);
bytes32 expectedHash = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_RAIN_VATS_0_1_6;
bytes32 expectedHash = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_CODEHASH_0_1_1;
bytes32 actualHash = keccak256(stub);
vm.expectRevert(abi.encodeWithSelector(V4ImplCodehashMismatch.selector, implAddr, expectedHash, actualHash));
script.run();
Expand Down Expand Up @@ -564,7 +564,7 @@ contract DeployV4AuthoriserCloneTest is Test {
/// @notice The canonical deploy-bundle calldata:
/// `clone(v4Impl, abi.encode(Config(Safe)))` against the CloneFactory.
function _expectedDeployData() internal view returns (bytes memory) {
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6;
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1;
bytes memory initData = abi.encode(OffchainAssetReceiptVaultAuthorizerV1Config({initialAdmin: address(safe)}));
return abi.encodeCall(ICloneableFactoryV2.clone, (v4Impl, initData));
}
Expand Down
4 changes: 2 additions & 2 deletions test/script/AuthoriserCloneAuthorization.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ contract AuthoriserCloneAuthorizationTest is Test {
safe = IGnosisSafe(LibSafeInvariants.STOX_TOKEN_OWNER_SAFE);

StoxOffchainAssetReceiptVaultAuthorizerV1 impl = new StoxOffchainAssetReceiptVaultAuthorizerV1();
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6, address(impl).code);
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1, address(impl).code);

TestableDeployV4AuthoriserClone testable = new TestableDeployV4AuthoriserClone();
testable.run();
Expand Down Expand Up @@ -159,7 +159,7 @@ contract AuthoriserCloneAuthorizationTest is Test {
vm.createSelectFork(LibRainDeploy.BASE);
safe = IGnosisSafe(LibSafeInvariants.STOX_TOKEN_OWNER_SAFE);
StoxOffchainAssetReceiptVaultAuthorizerV1 impl = new StoxOffchainAssetReceiptVaultAuthorizerV1();
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6;
address v4Impl = LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1;
vm.etch(v4Impl, address(impl).code);
address factory = LibCloneFactoryDeploy.CLONE_FACTORY_DEPLOYED_ADDRESS;

Expand Down
2 changes: 1 addition & 1 deletion test/script/GrantsBundleSafeTxHash.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ contract GrantsBundleSafeTxHashTest is Test {
safe = IGnosisSafe(LibSafeInvariants.STOX_TOKEN_OWNER_SAFE);

StoxOffchainAssetReceiptVaultAuthorizerV1 impl = new StoxOffchainAssetReceiptVaultAuthorizerV1();
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_RAIN_VATS_0_1_6, address(impl).code);
vm.etch(LibProdDeployV4.STOX_OFFCHAIN_ASSET_RECEIPT_VAULT_AUTHORIZER_V1_0_1_1, address(impl).code);

TestableDeployV4AuthoriserClone testable = new TestableDeployV4AuthoriserClone();
testable.run();
Expand Down
Loading