Skip to content

fix: fix RegisterZKChain script #2046

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
kelemeno merged 9 commits into from
Feb 23, 2026
Merged

fix: fix RegisterZKChain script #2046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bff0e04
fix: fix RegisterZKChain script
AntonD3 Feb 20, 2026
e5f5a63
fmt
AntonD3 Feb 20, 2026
caf1dec
Update hashes
AntonD3 Feb 20, 2026
cc10631
Update zkstack out
AntonD3 Feb 20, 2026
b5f69f1
Merge branch 'draft-v31' into ad-fix-draft-v31-script
AntonD3 Feb 20, 2026
296c6fb
Fix review
AntonD3 Feb 20, 2026
fbd2c1e
fmt
AntonD3 Feb 20, 2026
1862738
update selectors
AntonD3 Feb 21, 2026
66b0d9e
Merge branch 'draft-v31' into ad-fix-draft-v31-script
AntonD3 Feb 22, 2026
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
180 changes: 90 additions & 90 deletions AllContractsHashes.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions l1-contracts/contracts/state-transition/ChainTypeManagerBase.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,10 @@ abstract contract ChainTypeManagerBase is IChainTypeManager, ReentrancyGuard, Ow
_;
}

/// @return flag whether CTM is for ZKsync OS or Era VM.
/// @dev To be defined in derived contracts.
function isZKsyncOS() external pure virtual returns (bool);

/// @return The tuple of (major, minor, patch) protocol version.
function getSemverProtocolVersion() external view returns (uint32, uint32, uint32) {
// slither-disable-next-line unused-return
Expand Down
5 changes: 5 additions & 0 deletions l1-contracts/contracts/state-transition/EraChainTypeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ contract EraChainTypeManager is ChainTypeManagerBase {
address _permissionlessValidator
) ChainTypeManagerBase(_bridgehub, _interopCenter, _l1BytecodesSupplier, _permissionlessValidator) {}

/// @return flag whether CTM is for ZKsync OS or Era VM.
function isZKsyncOS() external pure override returns (bool) {
return false;
}

/// @notice Updates the parameters with which a new chain is created
/// @param _chainCreationParams The new chain creation parameters
function _setChainCreationParams(ChainCreationParams calldata _chainCreationParams) internal override {
Expand Down
2 changes: 2 additions & 0 deletions l1-contracts/contracts/state-transition/IChainTypeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,8 @@ interface IChainTypeManager {
/// @notice Verifier address changed for a protocol version
event NewProtocolVersionVerifier(uint256 indexed protocolVersion, address indexed verifier);

function isZKsyncOS() external pure returns (bool);

function BRIDGE_HUB() external view returns (address);

function PERMISSIONLESS_VALIDATOR() external view returns (address);
Expand Down
5 changes: 5 additions & 0 deletions l1-contracts/contracts/state-transition/ZKsyncOSChainTypeManager.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ contract ZKsyncOSChainTypeManager is ChainTypeManagerBase {
address _permissionlessValidator
) ChainTypeManagerBase(_bridgehub, _interopCenter, _l1BytecodesSupplier, _permissionlessValidator) {}

/// @return flag whether CTM is for ZKsync OS or Era VM.
function isZKsyncOS() external pure override returns (bool) {
return true;
}

/// @notice Updates the parameters with which a new chain is created
/// @param _chainCreationParams The new chain creation parameters
function _setChainCreationParams(ChainCreationParams calldata _chainCreationParams) internal override {
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/deploy-scripts/upgrade/default-upgrade/DefaultCTMUpgrade.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ contract DefaultCTMUpgrade is Script, CTMUpgradeBase {
// V29 introspection returns zero for bytecodesSupplier, overwrite with correct value
ctmAddresses.stateTransition.proxies.bytecodesSupplier = _bytecodesSupplier;
} else {
ctmAddresses = AddressIntrospector.getCTMAddresses(ChainTypeManagerBase(ctm), config.isZKsyncOS);
ctmAddresses = AddressIntrospector.getCTMAddresses(ChainTypeManagerBase(ctm));
coreAddresses = AddressIntrospector.getCoreDeployedAddresses(bridgehubAddr);
}

Expand Down
9 changes: 1 addition & 8 deletions l1-contracts/deploy-scripts/utils/AddressIntrospector.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,14 +197,7 @@ library AddressIntrospector {
// ============ CTM Addresses ============

function getCTMAddresses(ChainTypeManagerBase _ctm) public view returns (CTMDeployedAddresses memory info) {
return _getCTMAddressesInternal(address(_ctm), false, false);
}

function getCTMAddresses(
ChainTypeManagerBase _ctm,
bool isZKsyncOS
) public view returns (CTMDeployedAddresses memory info) {
return _getCTMAddressesInternal(address(_ctm), false, isZKsyncOS);
return _getCTMAddressesInternal(address(_ctm), false, _ctm.isZKsyncOS());
}

function getCTMAddressesV29(
Expand Down
12 changes: 12 additions & 0 deletions l1-contracts/selectors
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,6 +1379,8 @@ ChainTypeManagerBase
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | initialize((address,address,(address,bytes32,uint64,bytes32,((address,uint8,bool,bytes4[])[],address,bytes),bytes),uint256,address,address)) | 0xef80bee2 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | isZKsyncOS() | 0x64fb62a0 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | l1GenesisUpgrade() | 0x3437949a |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | newChainCreationParamsBlock(uint256) | 0x544fed26 |
Expand Down Expand Up @@ -2363,6 +2365,8 @@ DummyChainTypeManager
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | initialize((address,address,(address,bytes32,uint64,bytes32,((address,uint8,bool,bytes4[])[],address,bytes),bytes),uint256,address,address)) | 0xef80bee2 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | isZKsyncOS() | 0x64fb62a0 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | l1GenesisUpgrade() | 0x3437949a |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | newChainCreationParamsBlock(uint256) | 0x544fed26 |
Expand Down Expand Up @@ -2577,6 +2581,8 @@ DummyChainTypeManagerWBH
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | initialize((address,address,(address,bytes32,uint64,bytes32,((address,uint8,bool,bytes4[])[],address,bytes),bytes),uint256,address,address)) | 0xef80bee2 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | isZKsyncOS() | 0x64fb62a0 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | l1GenesisUpgrade() | 0x3437949a |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | newChainCreationParamsBlock(uint256) | 0x544fed26 |
Expand Down Expand Up @@ -3119,6 +3125,8 @@ EraChainTypeManager
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | initialize((address,address,(address,bytes32,uint64,bytes32,((address,uint8,bool,bytes4[])[],address,bytes),bytes),uint256,address,address)) | 0xef80bee2 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | isZKsyncOS() | 0x64fb62a0 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | l1GenesisUpgrade() | 0x3437949a |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | newChainCreationParamsBlock(uint256) | 0x544fed26 |
Expand Down Expand Up @@ -4678,6 +4686,8 @@ IChainTypeManager
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | initialize((address,address,(address,bytes32,uint64,bytes32,((address,uint8,bool,bytes4[])[],address,bytes),bytes),uint256,address,address)) | 0xef80bee2 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | isZKsyncOS() | 0x64fb62a0 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | l1GenesisUpgrade() | 0x3437949a |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | protocolVersion() | 0x2ae9c600 |
Expand Down Expand Up @@ -12409,6 +12419,8 @@ ZKsyncOSChainTypeManager
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | initialize((address,address,(address,bytes32,uint64,bytes32,((address,uint8,bool,bytes4[])[],address,bytes),bytes),uint256,address,address)) | 0xef80bee2 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | isZKsyncOS() | 0x64fb62a0 |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | l1GenesisUpgrade() | 0x3437949a |
|----------+----------------------------------------------------------------------------------------------------------------------------------------------------------------+--------------------------------------------------------------------|
| Function | newChainCreationParamsBlock(uint256) | 0x544fed26 |
Expand Down
13 changes: 13 additions & 0 deletions l1-contracts/zkstack-out/IChainTypeManager.sol/IChainTypeManager.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,6 +565,19 @@
"outputs": [],
"stateMutability": "nonpayable"
},
{
"type": "function",
"name": "isZKsyncOS",
"inputs": [],
"outputs": [
{
"name": "",
"type": "bool",
"internalType": "bool"
}
],
"stateMutability": "pure"
},
{
"type": "function",
"name": "l1GenesisUpgrade",
Expand Down
Loading