Skip to content
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

Display more deployed addresses #1203

Merged
merged 16 commits into from
Jan 23, 2025
Merged

Display more deployed addresses #1203

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8965047
display more addresses
StanislavBreadless Jan 16, 2025
56dc377
display more contracts + correct constructor params for validator tim…
StanislavBreadless Jan 16, 2025
572cd0c
include the script for security council approval
StanislavBreadless Jan 16, 2025
3cd7159
fmt
StanislavBreadless Jan 16, 2025
e7f9163
update hashes of scripts
StanislavBreadless Jan 17, 2025
eed6e01
Merge branch 'release-v26' into sb-display-more-deployed-addresses
StanislavBreadless Jan 17, 2025
e1b50e8
dont include scripts
StanislavBreadless Jan 17, 2025
67e4828
Merge remote-tracking branch 'origin/sb-display-more-deployed-address…
StanislavBreadless Jan 17, 2025
6612664
remove test files
StanislavBreadless Jan 17, 2025
f749f8a
wip
StanislavBreadless Jan 17, 2025
30b471f
upd script
StanislavBreadless Jan 17, 2025
91c6752
fix script
StanislavBreadless Jan 17, 2025
4338f5d
restore da contracts
StanislavBreadless Jan 17, 2025
c461207
add some comments
StanislavBreadless Jan 17, 2025
741d10d
fmt
StanislavBreadless Jan 17, 2025
1cd5d6b
respond to comments
StanislavBreadless Jan 21, 2025
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
142 changes: 3 additions & 139 deletions AllContractsHashes.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1579,9 +1579,9 @@
"contractName": "l1-contracts/Utils",
"zkBytecodeHash": "0x010000077b86e41703f8195fd86398efb4004f1486c2b86130fc0667603ab5d2",
"zkBytecodePath": "/l1-contracts/zkout/SystemContractsCaller.sol/Utils.json",
"evmBytecodeHash": "0x534bc5e7432735c8808d91708e9eab901f55a7ec6f7c0f878bb562757b6a99d9",
"evmBytecodePath": "/l1-contracts/out/Utils.sol/Utils.json",
"evmDeployedBytecodeHash": "0x43081c39edfbf9f44a8f1c1f0e5e00423e727da0da196eab876aed9949811e77"
"evmBytecodeHash": "0x4c9033aa9f834d00d4110549c502fecc1028b31b071c5d4833f1e23a59c941bf",
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this one changed because previously for the l1-contracts/Utils we used /l1-contracts/out/Utils.sol/Utils.json, while now we are using /l1-contracts/out/SystemContractsCaller.sol/Utils.json. The former was from a test, while the latter is actually a library in code

"evmBytecodePath": "/l1-contracts/out/SystemContractsCaller.sol/Utils.json",
"evmDeployedBytecodeHash": "0x749f6171fd58e7fd6742e379d8685bbd605fc439382a9a5cee2c02e68f0b7df7"
},
{
"contractName": "l1-contracts/TestCalldataDA",
Expand Down Expand Up @@ -1703,14 +1703,6 @@
"evmBytecodePath": "/l1-contracts/out/ZKChainBase.sol/ZKChainBase.json",
"evmDeployedBytecodeHash": "0x1438f2c1614cf88694e270d8290e51050d8444e5fac7f6332ec21cda59d2c530"
},
{
"contractName": "l1-contracts/CheckTransactionTest",
"evmBytecodeHash": "0x1078337564b75370b1751bdc7e685add3695cbc2099f98681df8a9e7b70f45ae",
"evmBytecodePath": "/l1-contracts/out/CheckTransaction.sol/CheckTransactionTest.json",
"evmDeployedBytecodeHash": "0x695ef1be463fb461939d9d5e4e2e1692e03a046ff3e6ba372995e0f3d7b3e46a",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/Create2AndTransfer",
"evmBytecodeHash": "0x95d7ded2a7e878aa82674a330a2b3638b0efa6168a4e0af9b30afdf68384cabb",
Expand All @@ -1719,78 +1711,6 @@
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/EIP712Utils",
"evmBytecodeHash": "0x2c6e37222391b17574f82ea60648ff76570857c09850e19cb439484ceea9f5ce",
"evmBytecodePath": "/l1-contracts/out/EIP712Utils.sol/EIP712Utils.json",
"evmDeployedBytecodeHash": "0xf878f1f72fdb3a0a08c4d8ca7d74a2389f84707c06c94dd6189786ef03bed7fd",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/GatewayCTMDeployerHelper",
"evmBytecodeHash": "0xc2f943354c6081cfeb4d6e14bcc4206286b432c8b798c26d1238a9e1f7f2ebe5",
"evmBytecodePath": "/l1-contracts/out/GatewayCTMDeployerHelper.sol/GatewayCTMDeployerHelper.json",
"evmDeployedBytecodeHash": "0x2f0d5740387eecfd06e5bb2c5a813e3d76bdab3bd9fea5bb80cf0a25e9bd58bf",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/L1NativeTokenVaultTest",
"evmBytecodeHash": "0x250162173ef74292e1cc80aab84aa7bd7b4add7c3dabcb37c2214f991eb8c4f3",
"evmBytecodePath": "/l1-contracts/out/L1NativeTokenVault.sol/L1NativeTokenVaultTest.json",
"evmDeployedBytecodeHash": "0xf85d7935c4ffd77f30bcdc04d4bbf6fe3e4bd06d5406b76d6294df41c03fb4fb",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/SomeToken",
"evmBytecodeHash": "0x4f2715fe887d9a1644ad9bef9a4a054544e30528211f05695e3cbd444931592b",
"evmBytecodePath": "/l1-contracts/out/L1NativeTokenVault.sol/SomeToken.json",
"evmDeployedBytecodeHash": "0x37318c04e7520ac15d36f987bd0c9e357d51f6d8089302ca90bf8b476accc026",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/L2ContractsBytecodesLib",
"evmBytecodeHash": "0xf529991a2409549048691f228460421fc7abeadf0a850c77e045be9f1e03d84f",
"evmBytecodePath": "/l1-contracts/out/L2ContractsBytecodesLib.sol/L2ContractsBytecodesLib.json",
"evmDeployedBytecodeHash": "0x926b5cbdd4380fcee8ce08c83e7a1537ff552d732ea3a9a67a55acbed2486ba2",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/L2LegacySharedBridgeTestHelper",
"evmBytecodeHash": "0xa5764f4d2186631b2e510944ed57f76d95c03e18853e75b870da6ff52d7ec866",
"evmBytecodePath": "/l1-contracts/out/L2LegacySharedBridgeTestHelper.sol/L2LegacySharedBridgeTestHelper.json",
"evmDeployedBytecodeHash": "0xd549dd56c79a7dbb77c2b5985212a9dcf3833436258f972cacf3f553776b224e",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/L2Utils",
"evmBytecodeHash": "0x58ad7d621b09034d87f85956b99800fc81e883d80cf3e08927b5ebac506043af",
"evmBytecodePath": "/l1-contracts/out/L2Utils.sol/L2Utils.json",
"evmDeployedBytecodeHash": "0x524ad674b4b7d42ab8813b36cae3e37019aecaad15b4c1769334c68da6c7429c",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/ManageWhitelistTest",
"evmBytecodeHash": "0x57dfede110d42a9360e7d4385231e587e7c5e6c08aeb765a31200af1412f2667",
"evmBytecodePath": "/l1-contracts/out/ManageWhitelist.sol/ManageWhitelistTest.json",
"evmDeployedBytecodeHash": "0x206074c8d6d3d36cb603a59393b45bcdcb4d0ca53031990483c96ba57eb778c3",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/MerkleTreeNoSort",
"evmBytecodeHash": "0x298afb6ae89c746384e124b97a782984cb928083426359b655ec3e65c2ba56b1",
"evmBytecodePath": "/l1-contracts/out/MerkleTreeNoSort.sol/MerkleTreeNoSort.json",
"evmDeployedBytecodeHash": "0xe437113971789c010b68580bbcfa06d0a4e6b14355d2aa1d1191659e5d2ea8e9",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/MockERC20",
"evmBytecodeHash": "0x4979cc2df2ac7d0cfe5400ea0fc00c1cce56248c3e87764eed7a1a3b260f1f93",
Expand All @@ -1807,30 +1727,6 @@
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/OnEmptyQueueTest",
"evmBytecodeHash": "0x66e63a393c6021e132b95f9ce91931a97e3617cef18b308b78834bef125ef700",
"evmBytecodePath": "/l1-contracts/out/OnEmptyQueue.sol/OnEmptyQueueTest.json",
"evmDeployedBytecodeHash": "0x78e374d0568b46409ae77cea76379e420282220ecae5ac296433195d9e65d2ed",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/PopOperationsTest",
"evmBytecodeHash": "0x2fced6d25eb21c0a87aefb8338c35113e7d8fd0631a8319975baae270be3f083",
"evmBytecodePath": "/l1-contracts/out/PopOperations.sol/PopOperationsTest.json",
"evmDeployedBytecodeHash": "0xe161cbd8524ab40d2534a516ece7c844c40b132b6737240c090e898612b4ec8e",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/PushOperationsTest",
"evmBytecodeHash": "0x6cd55e5476461ec9cf2c04b03d564d413b7850809873655d0daf2c91bec48ab8",
"evmBytecodePath": "/l1-contracts/out/PushOperations.sol/PushOperationsTest.json",
"evmDeployedBytecodeHash": "0x18e0f4892bf49aef0dcc8d104858f52c86b3a33b8b0777ef748513b2536f86f2",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/stdError",
"evmBytecodeHash": "0xa5cd965e5609ac02cc106708d5449c5a2e01d0d09a879e7c9bc1ca6ef6142f53",
Expand Down Expand Up @@ -1887,38 +1783,6 @@
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/UtilsFacet",
"evmBytecodeHash": "0x1ea198587e47946d69110741303d7e44e15afdd7370e4b3497993a1d37f2b902",
"evmBytecodePath": "/l1-contracts/out/UtilsFacet.sol/UtilsFacet.json",
"evmDeployedBytecodeHash": "0x7bd18121543aad77e8a631ba7bf7967434a3fa805ab92220bad03d5b4d4b27b2",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/GatewayPreparationForTests",
"evmBytecodeHash": "0xa49ad09b7277cd40223b0b8c78382552b9a96f23933414e0ebc045167f5f9681",
"evmBytecodePath": "/l1-contracts/out/_GatewayPreparationForTests.sol/GatewayPreparationForTests.json",
"evmDeployedBytecodeHash": "0x260a2a1e256a6d70ec9e66c6e5acf67c64caa05e13d40336b095bb8ab64cfaf1",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/SharedL2ContractL1DeployerUtils",
"evmBytecodeHash": "0x5903f68e6896e719cd87d0c5c08af2b5646ef035a34d7d3d2508ab3ce0c1a754",
"evmBytecodePath": "/l1-contracts/out/_SharedL2ContractL1DeployerUtils.sol/SharedL2ContractL1DeployerUtils.json",
"evmDeployedBytecodeHash": "0xeb3b8144c3b690055f33a8ce4a80d8a50badff0a775e175f3cee6860892312d8",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/SharedL2ContractL2DeployerUtils",
"evmBytecodeHash": "0xd892435640a5c4beb9cbda5af0e5374f677d7fb3ad07cfda77bf7e1a1887f266",
"evmBytecodePath": "/l1-contracts/out/_SharedL2ContractL2DeployerUtils.sol/SharedL2ContractL2DeployerUtils.json",
"evmDeployedBytecodeHash": "0x6266ca830309305eacd21db8a215dbb4c5f2bae84e77ed7c571689ec63a78710",
"zkBytecodeHash": null,
"zkBytecodePath": null
},
{
"contractName": "l1-contracts/console",
"evmBytecodeHash": "0x35348e9a92e75913ac4347c4748573128dc2422e67975566407ce365b30786b3",
Expand Down
24 changes: 24 additions & 0 deletions l1-contracts/deploy-scripts/SecurityCouncilApproveStageUpgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// SPDX-License-Identifier: MIT
pragma solidity ^0.8.21;

import {Utils} from "./Utils.sol";
import {IGovernance} from "contracts/governance/IGovernance.sol";
import {stdToml} from "forge-std/StdToml.sol";
import {IProtocolUpgradeHandler} from "./interfaces/IProtocolUpgradeHandler.sol";
import {Script} from "forge-std/Script.sol";
import {Vm} from "forge-std/Vm.sol";

contract SecurityCouncilApproveStageUpgrade is Script {
using stdToml for string;

function run() external {
// Insert the address of the protocol upgrade handler here.
IProtocolUpgradeHandler protocolUpgradeHandler = IProtocolUpgradeHandler(address(0));
// Insert the private key of the stage governance
Vm.Wallet memory wallet = vm.createWallet(uint256(0));

bytes32 upgradeId = bytes32(0);

Utils.securityCouncilApproveUpgrade(protocolUpgradeHandler, wallet, upgradeId);
}
}
51 changes: 51 additions & 0 deletions l1-contracts/deploy-scripts/Utils.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {IChainAdmin} from "contracts/governance/IChainAdmin.sol";
import {EIP712Utils} from "./EIP712Utils.sol";
import {IProtocolUpgradeHandler} from "./interfaces/IProtocolUpgradeHandler.sol";
import {IEmergencyUpgrageBoard} from "./interfaces/IEmergencyUpgrageBoard.sol";
import {ISecurityCouncil} from "./interfaces/ISecurityCouncil.sol";
import {IMultisig} from "./interfaces/IMultisig.sol";
import {ISafe} from "./interfaces/ISafe.sol";
import {AccessControlRestriction} from "contracts/governance/AccessControlRestriction.sol";
Expand All @@ -38,6 +39,9 @@ bytes32 constant EXECUTE_EMERGENCY_UPGRADE_ZK_FOUNDATION_TYPEHASH = keccak256(
"ExecuteEmergencyUpgradeZKFoundation(bytes32 id)"
);

/// @dev EIP-712 TypeHash for protocol upgrades approval by the Security Council.
bytes32 constant APPROVE_UPGRADE_SECURITY_COUNCIL_TYPEHASH = keccak256("ApproveUpgradeSecurityCouncil(bytes32 id)");

/// @dev The offset from which the built-in, but user space contracts are located.
uint160 constant USER_CONTRACTS_OFFSET = 0x10000; // 2^16

Expand Down Expand Up @@ -1002,6 +1006,53 @@ library Utils {
}
}

function securityCouncilApproveUpgrade(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add a comment on what this method does

IProtocolUpgradeHandler _protocolUpgradeHandler,
Vm.Wallet memory _governorWallet,
bytes32 upgradeId
) internal returns (bytes memory) {
address securityCouncilAddr = _protocolUpgradeHandler.securityCouncil();
bytes32 securityCouncilDigest;
{
securityCouncilDigest = EIP712Utils.buildDomainHash(securityCouncilAddr, "SecurityCouncil", "1");
}

bytes[] memory securityCouncilRawSignatures = new bytes[](12);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment why 12 - and maybe do a constant?

address[] memory securityCouncilMembers = new address[](12);
{
{
IMultisig securityCouncil = IMultisig(_protocolUpgradeHandler.securityCouncil());
for (uint256 i = 0; i < 12; i++) {
securityCouncilMembers[i] = securityCouncil.members(i);
}
}
for (uint256 i = 0; i < securityCouncilMembers.length; i++) {
bytes32 safeDigest;
{
bytes32 digest = EIP712Utils.buildDigest(
securityCouncilDigest,
keccak256(abi.encode(APPROVE_UPGRADE_SECURITY_COUNCIL_TYPEHASH, upgradeId))
);
safeDigest = ISafe(securityCouncilMembers[i]).getMessageHash(abi.encode(digest));
}
{
(uint8 v, bytes32 r, bytes32 s) = vm.sign(_governorWallet, safeDigest);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

so we're using governor's wallet 12 times ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, this is the case for the staging env

securityCouncilRawSignatures[i] = abi.encodePacked(r, s, v);
}
}
}

{
vm.startBroadcast(msg.sender);
ISecurityCouncil(securityCouncilAddr).approveUpgradeSecurityCouncil(
upgradeId,
securityCouncilMembers,
securityCouncilRawSignatures
);
vm.stopBroadcast();
}
}

function adminExecute(
address _admin,
address _accessControlRestriction,
Expand Down
26 changes: 26 additions & 0 deletions l1-contracts/deploy-scripts/interfaces/ISecurityCouncil.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;

/// @author Matter Labs
/// @custom:security-contact [email protected]
interface ISecurityCouncil {
function approveUpgradeSecurityCouncil(
bytes32 _id,
address[] calldata _signers,
bytes[] calldata _signatures
) external;

function softFreeze(uint256 _validUntil, address[] calldata _signers, bytes[] calldata _signatures) external;

function hardFreeze(uint256 _validUntil, address[] calldata _signers, bytes[] calldata _signatures) external;

function unfreeze(uint256 _validUntil, address[] calldata _signers, bytes[] calldata _signatures) external;

function setSoftFreezeThreshold(
uint256 _threshold,
uint256 _validUntil,
address[] calldata _signers,
bytes[] calldata _signatures
) external;
}
10 changes: 4 additions & 6 deletions l1-contracts/deploy-scripts/upgrade/EcosystemUpgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,14 +961,10 @@ contract EcosystemUpgrade is Script {
uint32 executionDelay = uint32(config.contracts.validatorTimelockExecutionDelay);
bytes memory bytecode = abi.encodePacked(
type(ValidatorTimelock).creationCode,
abi.encode(config.deployerAddress, executionDelay, config.eraChainId)
abi.encode(config.deployerAddress, executionDelay)
);
address contractAddress = deployViaCreate2(bytecode);
notifyAboutDeployment(
contractAddress,
"ValidatorTimelock",
abi.encode(config.deployerAddress, executionDelay, config.eraChainId)
);
notifyAboutDeployment(contractAddress, "ValidatorTimelock", abi.encode(config.deployerAddress, executionDelay));
addresses.validatorTimelock = contractAddress;
}

Expand Down Expand Up @@ -1673,6 +1669,8 @@ contract EcosystemUpgrade is Script {
);
vm.serializeAddress("deployed_addresses", "l1_gateway_upgrade", addresses.gatewayUpgrade);
vm.serializeAddress("deployed_addresses", "l1_transitionary_owner", addresses.transitionaryOwner);
vm.serializeAddress("deployed_addresses", "l1_rollup_da_manager", addresses.daAddresses.rollupDAManager);
vm.serializeAddress("deployed_addresses", "l1_governance_upgrade_timer", addresses.upgradeTimer);

string memory deployedAddresses = vm.serializeAddress(
"deployed_addresses",
Expand Down
Loading
Loading