From 937353c836e7a1991bbdf560523f19cf2024c3a0 Mon Sep 17 00:00:00 2001 From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com> Date: Tue, 7 Jan 2025 17:25:24 -0300 Subject: [PATCH 1/4] Update branch --- Cargo.lock | 2 +- Cargo.toml | 2 +- contracts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 24b1c9af949e..594e6cc9c865 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3475,7 +3475,7 @@ dependencies = [ [[package]] name = "eigen-client" version = "0.1.0" -source = "git+https://github.com/lambdaclass/eigenda-client-rs?branch=m1-client#68b6136563552ee78114c89923998025b0ac5c61" +source = "git+https://github.com/lambdaclass/eigenda-client-rs?branch=m1-client-improved-merkle-proof#68602c521ecfc2eb980a63bd40f9428090a85889" dependencies = [ "ark-bn254", "async-trait", diff --git a/Cargo.toml b/Cargo.toml index a7f98a45d854..7925e14f22c7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -223,7 +223,7 @@ tonic = { version = "0.11.0", default-features = false } pbjson-types = "0.6.0" # Eigen -eigenda-client-rs = {git = "https://github.com/lambdaclass/eigenda-client-rs", branch = "m1-client", package = "eigen-client"} +eigenda-client-rs = {git = "https://github.com/lambdaclass/eigenda-client-rs", branch = "m1-client-improved-merkle-proof", package = "eigen-client"} # Here and below: # We *always* pin the latest version of protocol to disallow accidental changes in the execution logic. # However, for the historical version of protocol crates, we have lax requirements. Otherwise, diff --git a/contracts b/contracts index 9cc2eb1d289b..da387dd432ab 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 9cc2eb1d289b327836cbbb1265a62aad1eb0a5df +Subproject commit da387dd432ab874197ab14e0efcf05f1c7144cb0 From bf6e60af2f42e23bea2fa885750268ea2324d394 Mon Sep 17 00:00:00 2001 From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com> Date: Tue, 7 Jan 2025 18:07:17 -0300 Subject: [PATCH 2/4] Update contracts --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index da387dd432ab..4a5a54fc5ebb 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit da387dd432ab874197ab14e0efcf05f1c7144cb0 +Subproject commit 4a5a54fc5ebbf817a4774ae5e1decc583551e614 From 69a418b8eb4f014e8ab90af4c13826a7601f78be Mon Sep 17 00:00:00 2001 From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com> Date: Tue, 7 Jan 2025 18:56:21 -0300 Subject: [PATCH 3/4] Update contracts --- contracts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contracts b/contracts index 4a5a54fc5ebb..b25f258f1234 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit 4a5a54fc5ebbf817a4774ae5e1decc583551e614 +Subproject commit b25f258f12344a02378f9df5d2e50b8ae2a40dbb From 43a690f899321bb35b3d2baeec090b756639eba1 Mon Sep 17 00:00:00 2001 From: Gianbelinche <39842759+gianbelinche@users.noreply.github.com> Date: Wed, 8 Jan 2025 17:55:27 -0300 Subject: [PATCH 4/4] Add blob verifier --- contracts | 2 +- .../config/src/forge_interface/deploy_ecosystem/input.rs | 2 ++ zkstack_cli/crates/types/src/l1_network.rs | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/contracts b/contracts index b25f258f1234..f15ccb83184d 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit b25f258f12344a02378f9df5d2e50b8ae2a40dbb +Subproject commit f15ccb83184d60f6ca451729469f261c40458a64 diff --git a/zkstack_cli/crates/config/src/forge_interface/deploy_ecosystem/input.rs b/zkstack_cli/crates/config/src/forge_interface/deploy_ecosystem/input.rs index 25556a7661e8..720b5ba91b9f 100644 --- a/zkstack_cli/crates/config/src/forge_interface/deploy_ecosystem/input.rs +++ b/zkstack_cli/crates/config/src/forge_interface/deploy_ecosystem/input.rs @@ -169,6 +169,7 @@ impl DeployL1Config { .validator_timelock_execution_delay, avail_l1_da_validator_addr: l1_network.avail_l1_da_validator_addr(), eigenda_l1_validator_addr: l1_network.eigenda_l1_validator_addr(), + eigenda_blob_verifier_addr: l1_network.eigenda_blob_verifier_addr(), }, tokens: TokensDeployL1Config { token_weth_address: initial_deployment_config.token_weth_address, @@ -207,6 +208,7 @@ pub struct ContractsDeployL1Config { pub avail_l1_da_validator_addr: Option
, #[serde(skip_serializing_if = "Option::is_none")] pub eigenda_l1_validator_addr: Option
, + pub eigenda_blob_verifier_addr: Address, } #[derive(Debug, Deserialize, Serialize, Clone)] diff --git a/zkstack_cli/crates/types/src/l1_network.rs b/zkstack_cli/crates/types/src/l1_network.rs index 0578f685b6ec..15f3c3c9a5ea 100644 --- a/zkstack_cli/crates/types/src/l1_network.rs +++ b/zkstack_cli/crates/types/src/l1_network.rs @@ -59,4 +59,8 @@ impl L1Network { L1Network::Mainnet => None, // TODO: add mainnet address after it is known } } + + pub fn eigenda_blob_verifier_addr(&self) -> Address { + Address::from_str("0x00CfaC4fF61D52771eF27d07c5b6f1263C2994A1").unwrap() // Modify this for your current blob verifier (This should be erased once we have the bridge in a separate repository) + } }