refactor(example): enhance example for public inputs validation 2

batcher/aligned-sdk/src/core/types.rs

@@ -1,5 +1,3 @@
-use std::str::FromStr;
-
 use ethers::core::k256::ecdsa::SigningKey;
 use ethers::signers::Signer;
 use ethers::signers::Wallet;
@@ -14,6 +12,7 @@ use lambdaworks_crypto::merkle_tree::{
 };
 use serde::{Deserialize, Serialize};
 use sha3::{Digest, Keccak256};
+use std::str::FromStr;
 
 use super::errors::VerifySignatureError;
 

examples/validating-public-input/Makefile

@@ -1,11 +1,44 @@
-generate_risc_zero_fibonacci_proof:
+generate_risc0_fibonacci_proof:
 	@cd risc_zero/fibonacci_proof_generator && \
-		cargo run && \
+		cargo run --release && \
 		echo "Fibonacci proof, pub input and image ID generated in risc_zero folder"
 
-submit_fibonacci_proof:
+generate_sp1_fibonacci_proof:
+	@cd sp1/fibonacci/script && \
+		cargo run --release && \
+		echo "Fibonacci proof, pub input and image ID generated in sp1 folder"
+
+
+submit_fibonacci_sp1_proof_devnet:
+	@cd aligned-integration && \
+	RUST_LOG=info cargo run --release -- --proving-system "SP1" --network "devnet" --batcher-url "ws://localhost:8080" --rpc-url "http://localhost:8545"
+
+submit_fibonacci_sp1_proof:
 	@cd aligned-integration && \
-	RUST_LOG=info cargo run --release -- --keystore-path $(KEYSTORE_PATH)
+	RUST_LOG=info cargo run --release -- --keystore-path $(KEYSTORE_PATH) --proving-system "SP1"
+
+submit_fibonacci_risc0_proof_devnet:
+	@cd aligned-integration && \
+	RUST_LOG=info cargo run --release -- --proving-system "Risc0" --network "devnet" --batcher-url "ws://localhost:8080" --rpc-url "http://localhost:8545"
+
+submit_fibonacci_risc0_proof:
+	@cd aligned-integration && \
+	RUST_LOG=info cargo run --release -- --keystore-path $(KEYSTORE_PATH) --proving-system "Risc0"
+
+verify_sp1_batch_inclusion:
+	@. ./contracts/.env  && . ./contracts/validate_batch_inclusion.sh $(FIBONACCI_VALIDATOR_ADDRESS) $(DATA_FILE_NAME) SP1
+
+verify_risc0_batch_inclusion:
+	@. ./contracts/.env  && . ./contracts/validate_batch_inclusion.sh $(FIBONACCI_VALIDATOR_ADDRESS) $(DATA_FILE_NAME) Risc0
+
+verify_risc0_batch_inclusion_devnet:
+	@. ./contracts/.env.devnet  && . ./contracts/validate_batch_inclusion.sh $(FIBONACCI_VALIDATOR_ADDRESS) $(DATA_FILE_NAME) Risc0
+
+verify_sp1_batch_inclusion_devnet:
+	@. ./contracts/.env.devnet  && . ./contracts/validate_batch_inclusion.sh $(FIBONACCI_VALIDATOR_ADDRESS) $(DATA_FILE_NAME) SP1
 
 deploy_fibonacci_validator:
 	@. ./contracts/.env && . ./contracts/deploy.sh
+
+deploy_fibonacci_validator_devnet:
+	@. ./contracts/.env.devnet && . ./contracts/deploy.sh

examples/validating-public-input/README.md

@@ -0,0 +1,95 @@
+# Validating public input
+
+## Testing locally
+
+Set up all the components of aligned locally following the [aligned setup guide](../../docs/3_guides/6_setup_aligned.md).
+
+This example is designed to do either with SP1 or risc0 proofs these are the commands to use depending on which verifier want to be used.
+
+### Risc0
+
+1. `make generate_risc0_fibonacci_proof`
+
+2. `make submit_fibonacci_risc0_proof_devnet`
+
+> The batch needs at least two proofs to be selaed, in another terminal run `make batcher_send_risc0_task` to actually submit the batch to aligned.
+
+The command will log the file where all the aligned verification data was saved like so:
+
+```
+[2024-10-09T15:54:42Z INFO  aligned_integration] Saved batch inclusion data to ".../aligned_test/examples/validating-public-input/aligned-integration/batch_inclusion_data/<DATA_FILE_NAME>"
+```
+
+Save the name since it will be necessary, you can see it in `aligned-layer/examples/validating-public-input/batch_inclusion_data` otherwise.
+
+3. `make deploy_fibonacci_validator_devnet`
+
+The command will log the address where the validator was deployed:
+
+```
+##### anvil-hardhat
+✅  [Success]Hash: 0xe0c216a3a24d5bd0551924592e42c6d96a889e3082ba3d7fff413336fba66815
+Contract Address: 0x5081a39b8A5f0E35a8D959395a630b68B74Dd30f
+Block: 585
+Paid: 0.000000000005889224 ETH (736153 gas * 0.000000008 gwei)
+```
+
+save the contract address for the next command.
+
+4. `make verify_risc0_batch_inclusion_devnet FIBONACCI_VALIDATOR_ADDRESS=<FIBONACCI_VALIDATOR_ADDRESS> DATA_FILE_NAME=<DATA_FILE_NAME>`
+
+Where `FIBONACCI_VALIDATOR_ADDRESS` is the address of the deployed validator contract and `DATA_FILE_NAME` the name of the file where the aligned verification data was saved (including the extension `.json`).
+
+If everything goes well you should see a transaction receipt with a `success` label in the status:
+
+```
+...
+root                    <ROOT_HASH>
+status                  1 (success)
+transactionHash         <TX_HASH>
+...
+```
+
+### SP1
+
+1. `make generate_sp1_fibonacci_proof`
+
+2. `make submit_fibonacci_sp1_proof_devnet`
+
+> The batch needs at least two proofs to be selaed, in another terminal run `make batcher_send_sp1_task` to actually submit the batch to aligned.
+
+The command will log the file where all the aligned verification data was saved like so:
+
+```
+[2024-10-09T15:54:42Z INFO  aligned_integration] Saved batch inclusion data to ".../aligned_test/examples/validating-public-input/aligned-integration/batch_inclusion_data/<DATA_FILE_NAME>"
+```
+
+Save the name since it will be necessary, you can see it in `aligned-layer/examples/validating-public-input/batch_inclusion_data` otherwise.
+
+3. `make deploy_fibonacci_validator_devnet`
+
+The command will log the address where the validator was deployed:
+
+```
+##### anvil-hardhat
+✅  [Success]Hash: 0xe0c216a3a24d5bd0551924592e42c6d96a889e3082ba3d7fff413336fba66815
+Contract Address: 0x5081a39b8A5f0E35a8D959395a630b68B74Dd30f
+Block: 585
+Paid: 0.000000000005889224 ETH (736153 gas * 0.000000008 gwei)
+```
+
+save the contract address for the next command.
+
+4. `make verify_sp1_batch_inclusion_devnet FIBONACCI_VALIDATOR_ADDRESS=<FIBONACCI_VALIDATOR_ADDRESS> DATA_FILE_NAME=<DATA_FILE_NAME>`
+
+Where `FIBONACCI_VALIDATOR_ADDRESS` is the address of the deployed validator contract and `DATA_FILE_NAME` the name of the file where the aligned verification data was saved (including the extension `.json`).
+
+If everything goes well you should see a transaction receipt with a `success` label in the status:
+
+```
+...
+root                    <ROOT_HASH>
+status                  1 (success)
+transactionHash         <TX_HASH>
+...
+```