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

fix: add correct holesky + sepolia addrs #145

Merged
merged 2 commits into from
Feb 6, 2025
Merged

fix: add correct holesky + sepolia addrs #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d000963
fix: add correct holesky + sepolia addrs
MaxMustermann2 Jan 27, 2025
ced8e52
add comment about default integration test values
MaxMustermann2 Jan 27, 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
18 changes: 17 additions & 1 deletion script/deployedContracts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"bootstrapLogic": "0xB97A39004Ba6900FAE801Ac04F8ce4DA70689879",
"capsuleBeacon": "0xB8D032a30a3B950CBcc6c1689E2381ab4290D4BB",
"capsuleImplementation": "0x8638502De2001e0dF71BbB5dd503E2008b2Ae948",
"clientGatewayLogic": "0x92A645a44DFf3e5499F9e6A1d6738520971267AA",
"clientGatewayLogic": "0x591433Ba4bD17973bbD02F201D4256e42fed141B",
MaxMustermann2 marked this conversation as resolved.
Show resolved Hide resolved
"lzEndpoint": "0x6EDCE65403992e310A62460808c4b910D972f10f",
"proxyAdmin": "0x4317A7f62dA871E4512424Df8CaE91A6Ccc2afEA",
"rewardVaultBeacon": "0xEe75FF2f3A6E49a7cfd0aa2F729563F8c0F7707b",
Expand All @@ -15,6 +15,22 @@
"vaultImplementation": "0xce7f4AC8D00f5e4aB3BEd9fDD1EDB9cD20516477",
"wstETH": "0xB82381A3fBD3FaFA77B3a7bE693342618240067b"
},
"holesky": {
"beaconOracle": "0x80E5bb3A04554E54b40Dd6e14ca0F97212d9428d",
"beaconProxyBytecode": "0x76E4eF0feDE653FCa008C1DdB0784a54E1ee93ad",
"bootstrap": "0x38674073a3713dd2C46892f1d2C5Dadc5Bb14172",
"bootstrapLogic": "0xCdA750418AFE2d2aD0f1052E8e997a52C2AA6861",
"capsuleBeacon": "0xafc8e60Ab69735C5097c47e5E3A7ED5E63ce5001",
"capsuleImplementation": "0x954B9BC52C4394984390065830500006805Db9C9",
"clientGatewayLogic": "0x7944cd287F2Fcd03F4Cdc0B17801e29F1317c386",
"erc20Token": "0x1E867667Ef16111047C2c7f6ADf4612bDf80064D",
"lzEndpoint": "0x6EDCE65403992e310A62460808c4b910D972f10f",
"proxyAdmin": "0x5cF0d7F7ae1085705DBD86f24b7E8000181a4190",
"rewardVaultBeacon": "0x1b4B4D6abE71a49e7bb13774F3e1cb721a21Af8B",
"rewardVaultImplementation": "0x1283b551058bC8303c04B578c9AbA4727714808b",
"vaultBeacon": "0x9a7bc99d90D5B8D8a47Bd6F8DBb5407fE3b51668",
"vaultImplementation": "0x9A6735c19f293500C24886cC829870cD725a98b6"
},
"exocore": {
"exocoreGateway": "0xEAf4E4D09b9CeB936492518A852026c914beb11E",
"exocoreGatewayLogic": "0x651a66c43F6A257a878F62BD124c668D5F3bd1AF",
Expand Down
17 changes: 13 additions & 4 deletions script/integration/1_DeployBootstrap.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ contract DeployContracts is Script {

uint256[] validators;
uint256[] stakers;
string[] exos;
// also the owner of the contracts
uint256 contractDeployer;
uint256 nstDepositor;
Expand Down Expand Up @@ -140,11 +139,19 @@ contract DeployContracts is Script {
require(slotsPerEpoch_ <= type(uint64).max, "Slots per epoch must be less than or equal to uint64 max");
slotsPerEpoch = uint64(slotsPerEpoch_);
// then, the Ethereum-native validator configuration
pubkey = vm.envBytes("INTEGRATION_PUBKEY");
pubkey = vm.envOr(
"INTEGRATION_PUBKEY",
hex"98db81971df910a5d46314d21320f897060d76fdf137d22f0eb91a8693a4767d2a22730a3aaa955f07d13ad604f968e9"
);
require(pubkey.length == 48, "Pubkey must be 48 bytes");
signature = vm.envBytes("INTEGRATION_SIGNATURE");
signature = vm.envOr(
"INTEGRATION_SIGNATURE",
hex"922a316bdc3516bfa66e88259d5e93e339ef81bc85b70e6c715542222025a28fa1e3644c853beb8c3ba76a2c5c03b726081bf605bde3a16e1f33f902cc1b6c01093c19609de87da9383fa4b1f347bd2d4222e1ae5428727a7896c8e553cc8071"
);
require(signature.length == 96, "Signature must be 96 bytes");
depositDataRoot = vm.envBytes32("INTEGRATION_DEPOSIT_DATA_ROOT");
depositDataRoot = vm.envOr(
"INTEGRATION_DEPOSIT_DATA_ROOT", bytes32(0x456934ced8f08ff106857418a6d885ba69d31e1b7fab9a931be06da25490cd1d)
);
require(depositDataRoot != bytes32(0), "Deposit data root must be set");
}

Expand Down Expand Up @@ -235,6 +242,8 @@ contract DeployContracts is Script {
// the default deposit params are created using exocapsule address 0x90618D1cDb01bF37c24FC012E70029DA20fCe971
// which is made using the default NST_DEPOSITOR + bootstrap address 0xF801fc13AA08876F343fEBf50dFfA52A78180811
// if you get a DepositDataRoot or related error, check these addresses first.
// if these addresses match, check that the DepositDataRoot, the Signature and the Pubkey match the default
// in setUp().
proxyAdmin.initialize(address(bootstrap));
rewardVaultImplementation = new RewardVault();
rewardVaultBeacon = new UpgradeableBeacon(address(rewardVaultImplementation));
Expand Down
Loading