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.

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

feat(eigen-client-m1): Add validators #40

Open
wants to merge 6 commits into
base: eigen-client-m1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
29 changes: 29 additions & 0 deletions da-contracts/contracts/da-layers/eigenda/EigenDAL1Validator.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;

import {IL1DAValidator, L1DAValidatorOutput} from "../../IL1DAValidator.sol";
import {ValL1DAWrongInputLength} from "../../DAContractsErrors.sol";

contract EigenDAL1Validator is IL1DAValidator {
function checkDA(
uint256, // _chainId
uint256, // _batchNumber
bytes32, // _l2DAValidatorOutputHash
bytes calldata _operatorDAInput,
uint256 maxBlobsSupported
) external override returns (L1DAValidatorOutput memory output) {
// TODO: Implement real validation logic.
// For Validiums, we expect the operator to just provide the data for us.
// We don't need to do any checks with regard to the l2DAValidatorOutputHash.
if (_operatorDAInput.length < 32) {
revert ValL1DAWrongInputLength(_operatorDAInput.length, 32);
}
bytes32 stateDiffHash = abi.decode(_operatorDAInput[:32], (bytes32));

output.stateDiffHash = stateDiffHash;

output.blobsLinearHashes = new bytes32[](maxBlobsSupported);
output.blobsOpeningCommitments = new bytes32[](maxBlobsSupported);
}
}
22 changes: 22 additions & 0 deletions l1-contracts/deploy-scripts/DeployL1.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,15 @@ contract DeployL1Script is Script, DeployUtils {
);
}

function getEigenDAL2ValidatorAddress() internal returns (address) {
return
Utils.getL2AddressViaCreate2Factory(
bytes32(0),
L2ContractHelper.hashL2Bytecode(L2ContractsBytecodesLib.readEigenDAL2ValidatorBytecode()),
hex""
);
}

function deployDAValidators() internal {
vm.broadcast(msg.sender);
address rollupDAManager = address(new RollupDAManager());
Expand All @@ -202,6 +211,13 @@ contract DeployL1Script is Script, DeployUtils {
addresses.daAddresses.availL1DAValidator = config.contracts.availL1DAValidator;
}

if (config.contracts.eigenDAL1Validator == address(0)) {
addresses.daAddresses.eigenDAL1Validator = deployViaCreate2(Utils.readEigenDAL1ValidatorBytecode(), "");
console.log("EigenDAL1Validator deployed at:", addresses.daAddresses.eigenDAL1Validator);
} else {
addresses.daAddresses.eigenDAL1Validator = config.contracts.eigenDAL1Validator;
}

vm.startBroadcast(msg.sender);
RollupDAManager(rollupDAManager).updateDAPair(address(rollupDAValidator), getRollupL2ValidatorAddress(), true);
vm.stopBroadcast();
Expand Down Expand Up @@ -707,6 +723,11 @@ contract DeployL1Script is Script, DeployUtils {
"avail_l1_da_validator_addr",
addresses.daAddresses.availL1DAValidator
);
vm.serializeAddress(
"deployed_addresses",
"eigenda_l1_validator_addr",
addresses.daAddresses.eigenDAL1Validator
);

string memory deployedAddresses = vm.serializeAddress(
"deployed_addresses",
Expand All @@ -725,6 +746,7 @@ contract DeployL1Script is Script, DeployUtils {
vm.serializeAddress("root", "expected_rollup_l2_da_validator_addr", getRollupL2ValidatorAddress());
vm.serializeAddress("root", "expected_no_da_validium_l2_validator_addr", getNoDAValidiumL2ValidatorAddress());
vm.serializeAddress("root", "expected_avail_l2_da_validator_addr", getAvailL2ValidatorAddress());
vm.serializeAddress("root", "expected_eigenda_l2_validator_addr", getEigenDAL2ValidatorAddress());
string memory toml = vm.serializeAddress("root", "owner_address", config.ownerAddress);

vm.writeToml(toml, outputPath);
Expand Down
2 changes: 1 addition & 1 deletion l1-contracts/deploy-scripts/DeployL2Contracts.sol
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ contract DeployL2Script is Script {
} else if (config.validatorType == DAValidatorType.Avail) {
bytecode = L2ContractsBytecodesLib.readAvailL2DAValidatorBytecode();
} else if (config.validatorType == DAValidatorType.EigenDA) {
bytecode = L2ContractsBytecodesLib.readNoDAL2DAValidatorBytecode(); // TODO: update to EigenDA
bytecode = L2ContractsBytecodesLib.readEigenDAL2ValidatorBytecode();
} else {
revert("Invalid DA validator type");
}
Expand Down
6 changes: 6 additions & 0 deletions l1-contracts/deploy-scripts/DeployUtils.s.sol
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ struct DataAvailabilityDeployedAddresses {
address l1RollupDAValidator;
address noDAValidiumL1DAValidator;
address availL1DAValidator;
address eigenDAL1Validator;
}

// solhint-disable-next-line gas-struct-packing
Expand Down Expand Up @@ -165,6 +166,7 @@ struct ContractsConfig {
bytes32 bootloaderHash;
bytes32 defaultAAHash;
address availL1DAValidator;
address eigenDAL1Validator;
}

struct TokensConfig {
Expand Down Expand Up @@ -240,6 +242,10 @@ contract DeployUtils is Script {
config.contracts.availL1DAValidator = toml.readAddress("$.contracts.avail_l1_da_validator");
}

if (vm.keyExistsToml(toml, "$.contracts.eigenda_l1_validator")) {
config.contracts.eigenDAL1Validator = toml.readAddress("$.contracts.eigenda_l1_validator");
}

config.tokens.tokenWethAddress = toml.readAddress("$.tokens.token_weth_address");
}

Expand Down
6 changes: 6 additions & 0 deletions l1-contracts/deploy-scripts/L2ContractsBytecodesLib.sol
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,12 @@ library L2ContractsBytecodesLib {
return Utils.readZKFoundryBytecodeL2("AvailL2DAValidator.sol", "AvailL2DAValidator");
}

/// @notice Reads the bytecode of the ValidiumL2DAValidator contract for EigenDA.
/// @return The bytecode of the ValidiumL2DAValidator contract.
function readEigenDAL2ValidatorBytecode() internal view returns (bytes memory) {
return Utils.readZKFoundryBytecodeL2("EigenDAL2Validator.sol", "EigenDAL2Validator");
}

/// @notice Reads the bytecode of the ValidiumL2DAValidator contract for NoDA validium.
/// @return The bytecode of the ValidiumL2DAValidator contract.
function readNoDAL2DAValidatorBytecode() internal view returns (bytes memory) {
Expand Down
4 changes: 4 additions & 0 deletions l1-contracts/deploy-scripts/Utils.sol
Original file line number Diff line number Diff line change
Expand Up @@ -1031,6 +1031,10 @@ library Utils {
bytecode = readFoundryBytecode("/../da-contracts/out/DummyAvailBridge.sol/DummyAvailBridge.json");
}

function readEigenDAL1ValidatorBytecode() internal view returns (bytes memory bytecode) {
bytecode = readFoundryBytecode("/../da-contracts/out/EigenDAL1Validator.sol/EigenDAL1Validator.json");
}

// add this to be excluded from coverage report
function test() internal {}
}
28 changes: 28 additions & 0 deletions l2-contracts/contracts/data-availability/EigenDAL2Validator.sol
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
// SPDX-License-Identifier: MIT

pragma solidity 0.8.24;

import {IL2DAValidator} from "../interfaces/IL2DAValidator.sol";

/// Rollup DA validator. It will publish data that would allow to use either calldata or blobs.
contract EigenDAL2Validator is IL2DAValidator {
function validatePubdata(
// The rolling hash of the user L2->L1 logs.
bytes32,
// The root hash of the user L2->L1 logs.
bytes32,
// The chained hash of the L2->L1 messages
bytes32,
// The chained hash of uncompressed bytecodes sent to L1
bytes32,
// Operator data, that is related to the DA itself
bytes calldata
) external returns (bytes32 outputHash) {
// Since we do not need to publish anything to L1, we can just return 0.
// Note, that Rollup validator sends the hash of uncompressed state diffs, since the
// correctness of the publish pubdata depends on it. However Validium doesn't sent anything,
// so we don't need to publish even that.
// TODO: Implement real validation logic.
outputHash = bytes32(0);
}
}
Loading