diff --git a/contracts/docs/StatusNetwork.md b/contracts/docs/StatusNetwork.md index 2b696e46..4944ab0e 100644 --- a/contracts/docs/StatusNetwork.md +++ b/contracts/docs/StatusNetwork.md @@ -8,11 +8,11 @@ These are the official contract deployments on the **Holesky** for L1 and Status | Chain | Contract | Address | |---------|----------------------------------|-----------------------------------------------------------------------------------------------------| -| Holesky | **Yield Manager** | [0xcaf71dee9d59d0095ec37c1ffa7e4b8fd3114bc2](https://holesky.etherscan.io/address/0xcaf71dee9d59d0095ec37c1ffa7e4b8fd3114bc2#code)| -| Holesky | **L1ETHBridge (Proxy)** | [0xF62923E542BdEA2DeC8Da020480197A54c4CE53A](https://holesky.etherscan.io/address/0xF62923E542BdEA2DeC8Da020480197A54c4CE53A#code)| -| Holesky | **L1ETHBridge (Implementation)** | [0x99751ad60328abf73e8c938c0b7a9f9fd370f453](https://holesky.etherscan.io/address/0x99751ad60328abf73e8c938c0b7a9f9fd370f453#code)| -| Status Devnet | **L2ETHBridge (Proxy)** | [0x99751AD60328ABf73e8c938c0B7A9F9FD370f453](https://pumpi-blockscout.eu-north-2.gateway.fm/address/0x99751AD60328ABf73e8c938c0B7A9F9FD370f453)| -| Status Devnet | **L2ETHBridge (Implementation)** | [0xCaF71dEe9d59d0095eC37c1FFa7E4b8fD3114Bc2](https://pumpi-blockscout.eu-north-2.gateway.fm/address/0xCaF71dEe9d59d0095eC37c1FFa7E4b8fD3114Bc2)| +| Hoodi | **Yield Manager** | [0xF62923E542BdEA2DeC8Da020480197A54c4CE53A](https://hoodi.etherscan.io/address/0xF62923E542BdEA2DeC8Da020480197A54c4CE53A#code)| +| Hoodi | **L1ETHBridge (Proxy)** | [0x0958faaa350be3d11c9f9a2ba366af3dab16c792](https://hoodi.etherscan.io/address/0x0958faaa350be3d11c9f9a2ba366af3dab16c792#code)| +| Hoodi | **L1ETHBridge (Implementation)** | [0x968b487d38d93fd5a36aed69da52febcc043c3e7](https://hoodi.etherscan.io/address/0x968b487d38d93fd5a36aed69da52febcc043c3e7#code)| +| Status Devnet | **L2ETHBridge (Proxy)** | [0x99751AD60328ABf73e8c938c0B7A9F9FD370f453](https://sunti-blockscout.eu-north-2.gateway.fm/address/0x99751AD60328ABf73e8c938c0B7A9F9FD370f453?tab=contract)| +| Status Devnet | **L2ETHBridge (Implementation)** | [0xCaF71dEe9d59d0095eC37c1FFa7E4b8fD3114Bc2](https://sunti-blockscout.eu-north-2.gateway.fm/address/0xCaF71dEe9d59d0095eC37c1FFa7E4b8fD3114Bc2?tab=contract)| @@ -27,7 +27,7 @@ export ETH_FROM=0xD631542acd56eeBe466F16CBfEb937637b8b43c1 forge script \ script/yield/bridge/l1/DeployDummyYieldManager.s.sol \ - --rpc-url https://ethereum-holesky-rpc.publicnode.com \ + --rpc-url https://rpc.hoodi.ethpandaops.io \ --private-key $STATUS_DEVNET_DEPLOYER_KEY \ --broadcast ``` @@ -35,7 +35,7 @@ forge script \ Verify the contract on Etherscan: ```bash -forge verify-contract --chain holesky CONTRACT_ADDRESS ETHYieldManagerMock +forge verify-contract --chain hoodi CONTRACT_ADDRESS ETHYieldManagerMock ``` ### L1ETHBridge @@ -51,11 +51,17 @@ export ETH_FROM=0xD631542acd56eeBe466F16CBfEb937637b8b43c1 forge script \ script/yield/bridge/l1/DeployL1ETHBridge.s.sol \ - --rpc-url https://ethereum-holesky-rpc.publicnode.com \ + --rpc-url https://rpc.hoodi.ethpandaops.io \ --private-key $STATUS_DEVNET_DEPLOYER_KEY \ --broadcast ``` +Verify the implementation contract on Blockscout: + +```bash +forge verify-contract --chain hoodi CONTRACT_ADDRESS L1ETHBridge +``` + ### L2ETHBridge @@ -67,7 +73,7 @@ export ETH_FROM=0xD631542acd56eeBe466F16CBfEb937637b8b43c1 forge script \ script/yield/bridge/l2/DeployL2ETHBridge.s.sol \ - --rpc-url https://pumpi-rpc.eu-north-2.gateway.fm/ \ + --rpc-url https://sunti-rpc.eu-north-2.gateway.fm/ \ --private-key $STATUS_DEVNET_DEPLOYER_KEY \ --broadcast ``` @@ -78,8 +84,8 @@ Verify the implementation contract on Blockscout: forge verify-contract \ --verifier blockscout \ --compilation-profile london \ - --verifier-url https://pumpi-blockscout.eu-north-2.gateway.fm/api \ - --chain 762355666 \ + --verifier-url https://sunti-blockscout.eu-north-2.gateway.fm/api \ + --chain 1706707152 \ IMPLEMENTATION_ADDRESS \ L2ETHBridge ``` @@ -90,8 +96,8 @@ Verify the proxy contract in case it hasn't been verified yet automatically by B forge verify-contract \ --verifier blockscout \ --compilation-profile london \ - --verifier-url https://pumpi-blockscout.eu-north-2.gateway.fm/api \ - --chain 762355666 \ + --verifier-url https://sunti-blockscout.eu-north-2.gateway.fm/api \ + --chain 1706707152 \ PROXY_ADDRESS \ node_modules/@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol:ERC1967Proxy ``` diff --git a/contracts/script/yield/bridge/l1/DeploymentConfig.s.sol b/contracts/script/yield/bridge/l1/DeploymentConfig.s.sol index 5dc76c61..907b3a18 100644 --- a/contracts/script/yield/bridge/l1/DeploymentConfig.s.sol +++ b/contracts/script/yield/bridge/l1/DeploymentConfig.s.sol @@ -10,13 +10,13 @@ contract DeploymentConfig is Script { error DeploymentConfig_NoConfigForChain(uint256); // solhint-disable-next-line var-name-mixedcase - address internal LINEA_ROLLUP_ADDRESS_HOLESKY = 0xA12cc7568d08f848869707996dF47877C506466f; + address internal LINEA_ROLLUP_ADDRESS_HOODI = 0x5274A83F118e8E330933c8fa4c1F2746289c8555; // solhint-disable-next-line var-name-mixedcase address internal L2_ETH_BRIDGE_ADDRESS_DEVNET = 0x0000000000000000000000000000000000000001; // solhint-disable-next-line var-name-mixedcase - address internal YIELD_MANAGER_ADDRESS_HOLESKY = 0xCaF71dEe9d59d0095eC37c1FFa7E4b8fD3114Bc2; // ETHYieldManagerMock + address internal YIELD_MANAGER_ADDRESS_HOODI = 0xF62923E542BdEA2DeC8Da020480197A54c4CE53A; // ETHYieldManagerMock struct NetworkConfig { address deployer; @@ -34,8 +34,8 @@ contract DeploymentConfig is Script { deployer = _broadcaster; if (block.chainid == 31_337) { activeNetworkConfig = getOrCreateAnvilEthConfig(deployer); - } else if (block.chainid == 17_000) { - activeNetworkConfig = getOrCreateHoleskyEthConfig(deployer); + } else if (block.chainid == 560048) { + activeNetworkConfig = getOrCreateHoodiEthConfig(deployer); } else { revert DeploymentConfig_NoConfigForChain(block.chainid); } @@ -54,13 +54,13 @@ contract DeploymentConfig is Script { }); } - function getOrCreateHoleskyEthConfig(address _deployer) public returns (NetworkConfig memory) { + function getOrCreateHoodiEthConfig(address _deployer) public returns (NetworkConfig memory) { return NetworkConfig({ deployer: _deployer, - messageService: LINEA_ROLLUP_ADDRESS_HOLESKY, + messageService: LINEA_ROLLUP_ADDRESS_HOODI, remoteSender: L2_ETH_BRIDGE_ADDRESS_DEVNET, - yieldManager: YIELD_MANAGER_ADDRESS_HOLESKY + yieldManager: YIELD_MANAGER_ADDRESS_HOODI }); } diff --git a/contracts/script/yield/bridge/l2/DeploymentConfig.s.sol b/contracts/script/yield/bridge/l2/DeploymentConfig.s.sol index 30a40cb9..9a053640 100644 --- a/contracts/script/yield/bridge/l2/DeploymentConfig.s.sol +++ b/contracts/script/yield/bridge/l2/DeploymentConfig.s.sol @@ -19,17 +19,17 @@ contract DeploymentConfig is Script { address private deployer; // solhint-disable-next-line var-name-mixedcase - address internal L2_MESSAGE_SERVICE_ADDRESS_DEVNET = 0x630fA6067c817542E85ADC368f188Fc90E4EB5ce; + address internal L2_MESSAGE_SERVICE_ADDRESS_DEVNET = 0x1722E194Fc02858243b9b1f59ed2b41202cb4351; // solhint-disable-next-line var-name-mixedcase - address internal L1_ETH_BRIDGE_ADDRESS_DEVNET = 0xF62923E542BdEA2DeC8Da020480197A54c4CE53A; + address internal L1_ETH_BRIDGE_ADDRESS_HOODI = 0x0958FAAA350bE3d11C9f9A2BA366af3DAb16C792; constructor(address _broadcaster) { if (_broadcaster == address(0)) revert DeploymentConfig_InvalidDeployerAddress(); deployer = _broadcaster; if (block.chainid == 31_337) { activeNetworkConfig = getOrCreateAnvilEthConfig(deployer); - } else if (block.chainid == 762355666) { + } else if (block.chainid == 1706707152) { activeNetworkConfig = getOrCreateStatusDevnetEthConfig(deployer); } else { revert DeploymentConfig_NoConfigForChain(block.chainid); @@ -50,7 +50,7 @@ contract DeploymentConfig is Script { NetworkConfig({ deployer: _deployer, l2MessageService: L2_MESSAGE_SERVICE_ADDRESS_DEVNET, - l1ETHBridge: L1_ETH_BRIDGE_ADDRESS_DEVNET + l1ETHBridge: L1_ETH_BRIDGE_ADDRESS_HOODI }); }