Willem/multiproof experiments (#18)

* avoid recomputing proof indices

* add pivot feature to builder

* remove progress bar and add features to support different chains

* update with simplfied api

* add faster strat for multiproof builder

Author: willemolding

.gitignore

@@ -20,6 +20,7 @@ target/
 .idea
 *.bin
 *.input
+*.proof
 *.pb
 
 contracts/dependencies/

.vscode/settings.json

@@ -1,8 +1,8 @@
 {
     "rust-analyzer.linkedProjects": [
         "./Cargo.toml",
-        // "./guests/membership/guest/Cargo.toml",
-        // "./guests/balance_and_exits/guest/Cargo.toml",
+        "./guests/membership/guest/Cargo.toml",
+        "./guests/balance_and_exits/guest/Cargo.toml",
     ],
     "rust-analyzer.check.extraEnv": {
         "RISC0_SKIP_BUILD": "1",

Cargo.lock

@@ -107,7 +107,15 @@ cargo risczero --version
 
 This repo uses [just](https://github.com/casey/just) as a command runner. Installation instructions [here](https://github.com/casey/just?tab=readme-ov-file#installation)
 
-It also uses git-lfs to manage cached inputs. Ensure this is installed.
+## Running tests
+
+Use
+
+```shell
+just test
+```
+
+Attempting to run tests with `cargo test` will fail unless they can generate proofs locally.
 
 ## Usage
 
@@ -142,62 +150,55 @@ See the [deployment guide](./docs/deployment-guide.md) for instructions on deplo
 
 ### Simple Usage via CLI
 
-Using the justfile scripts provides a simple way to get started and examples of using the CLI. These will write intermediate files into the current directory.
+Using the justfile scripts provides a simple way to get started and examples of using the CLI. These will write intermediate proof files into the current directory.
 These are mostly included for example usage of the CLI. For a production deployment use the CLI directly as required.
 
 #### Initial membership proof
 
-The repo comes with the mainnet inputs built for slot 11494239.
-
 To create a proof run
 
 ```shell
-just prove_membership_init 11494239
+just prove_membership_init <slot>
 ```
 
 #### Updating a membership proof
 
-Update an existing membership proof to a newer beacon chain slot, e.g. to slot 11495000, you will need to build the inputs and then build a proof. Run
+Update an existing membership proof to a newer beacon chain slot you will need to build the inputs and then build a proof. Run
 
 ```shell
-just build_input_continuation 11494239 11495000
-just prove_membership_continuation 11494239 11495000
+just prove_membership_continuation <slot> <new_slot>
 ```
 
-This will write a new proof that composes the old one and proves the membership of all validators up to slot 11495000. There is no need to update membership proofs but it is a good way to save proving cycles.
+This will write a new proof that composes the old one and proves the membership of all validators up to slot `new_slot`. There is no need to update membership proofs but it is a good way to save proving cycles.
 
 #### Building an aggregate oracle proof
 
 To build a proof at this new slot ready to submit on-chain run:
 
 ```shell
-just build_input_aggregation 11495000
-just prove_aggregate 11495000
+just prove_aggregate <slot>
 ```
 
-This requires that a membership proof (either initial or continuation) for slot 1100 has already been created. It will write to file a proof and report ready to submit on-chain
+This requires that a membership proof (either initial or continuation) for `slot` has already been created. It will write to file a proof and report ready to submit on-chain
 
-> [!NOTE]
-> For slots containing many Lido validators this will take a long time to build the SSZ proof input locally (hours) and to generate the proof (minutes on Bonsai)
 
 Submit on-chain with:
 
 ```shell
-just submit 11495000
+just submit <slot>
 ```
 
 #### More advanced usage
 
 Using the CLI directly provides more flexibility. See the help and subcommands help
 
 ```
-> cargo run --help
+> cargo run -- --help
 CLI for generating and submitting Lido oracle proofs
 
 Usage: cli [OPTIONS] --slot <SLOT> <COMMAND>
 
 Commands:
-  build   Build an input for a proof
   prove   Generate a proof from a given input
   submit  Submit an aggregation proof to the oracle contract
   help    Print this message or the help of the given subcommand(s)

README.md

@@ -9,7 +9,7 @@ sepolia = ["guest-io/sepolia", "membership_builder/sepolia"]
 
 [dependencies]
 ssz-multiproofs.workspace = true
-guest-io = { workspace = true, features = ["builder", "progress-bar"] }
+guest-io = { workspace = true, features = ["builder"] }
 membership_builder.workspace = true
 balance_and_exits_builder.workspace = true
 beacon-state = { workspace = true }

cli/Cargo.toml

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use alloy::hex::FromHex;
+use alloy_primitives::B256;
 use beacon_state::mainnet::BeaconState;
 use ethereum_consensus::{
     phase0::SignedBeaconBlockHeader, primitives::Root, types::mainnet::BeaconBlock, Fork,
@@ -119,12 +121,15 @@ impl BeaconClient {
         Ok(result.data.header)
     }
 
-    /// Retrieves block details for given block id.
+    /// Retrieves block hash for given beacon block id (e.g. slot).
     #[tracing::instrument(skip(self), fields(block_id = %block_id))]
-    pub async fn get_block(&self, block_id: impl Display) -> Result<BeaconBlock, Error> {
+    pub async fn get_eth1_block_hash_at_slot(&self, block_id: impl Display) -> Result<B256, Error> {
         let path = format!("eth/v2/beacon/blocks/{block_id}");
-        let result: Response<GetBlockResponse> = self.http_get(&path).await?;
-        Ok(result.data.message)
+        let result: serde_json::Value = self.http_get(&path).await?;
+        let hash_str = result["data"]["message"]["body"]["eth1_data"]["block_hash"]
+            .as_str()
+            .unwrap();
+        Ok(B256::from_hex(&hash_str.trim_start_matches("0x")).unwrap())
     }
 
     #[tracing::instrument(skip(self), fields(state_id = %state_id))]