Merge branch 'testnet' into staging

Author: JuArce

crates/cli/get_proof_test_files.sh

@@ -40,10 +40,10 @@ fi
 
 echo "Downloading SP1 public inputs file..."
 
-if curl -sSf -L "$SP1_PUBLIC_INPUT_NAME" -o "$ALIGNED_TEST_FILES_DIR/$SP1_PUBLIC_INPUT_NAME"; then
+if curl -sSf -L "$SP1_PUBLIC_INPUT_URL" -o "$ALIGNED_TEST_FILES_DIR/$SP1_PUBLIC_INPUT_NAME"; then
     echo "SP1 public inputs downloaded successful"
 else
-    echo "Error: Failed to downloaded $SP1_PUBLIC_INPUT_NAME"
+    echo "Error: Failed to downloaded $SP1_PUBLIC_INPUT_URL"
     exit 1
 fi
 

docs/1_introduction/1_try_aligned.md

@@ -3,13 +3,13 @@
 In this tutorial, you will learn how to send your first SP1 proofs to get verified in Aligned in under 3 minutes.
 
 {% hint style="warning" %}
-This tutorial is for sending proofs on Holesky network.
+This tutorial is for sending proofs on Hoodi network.
 To send proofs on Mainnet, please refer to the [submitting proofs](../3_guides/0_submitting_proofs.md) guide.
 {% endhint %}
 
 ## Quickstart
 
-We will download a previously generated SP1 proof, send it to Aligned for verification, and retrieve the results from Ethereum Holesky testnet.
+We will download a previously generated SP1 proof, send it to Aligned for verification, and retrieve the results from Ethereum Hoodi testnet.
 
 1. Download and install Aligned to send proofs in the testnet:
 
@@ -35,8 +35,8 @@ aligned submit \
 --vm_program ~/.aligned/test_files/sp1_fibonacci_5_0_0.elf \
 --public_input ~/.aligned/test_files/sp1_fibonacci_5_0_0.pub \
 --aligned_verification_data_path ~/.aligned/aligned_verification_data \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 5. You should get a response like this:
@@ -56,8 +56,8 @@ Use the link in the response to check the status of your transaction in the Alig
 ```bash
 aligned verify-proof-onchain \
 --aligned-verification-data ~/.aligned/aligned_verification_data/*.cbor \
---rpc_url https://ethereum-holesky-rpc.publicnode.com \
---network holesky
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com \
+--network hoodi
 ```
 
 This is reading the result of the proof verification in Ethereum.

docs/3_guides/0_submitting_proofs.md

@@ -71,8 +71,8 @@ To use it, you can use the `aligned` CLI, as shown with the following example:
 
 ```bash
 aligned deposit-to-batcher \
---rpc_url https://ethereum-holesky-rpc.publicnode.com \
---network holesky \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com \
+--network hoodi \
 --keystore_path <keystore_path> \
 --amount 0.1ether
 ```
@@ -89,8 +89,8 @@ After depositing funds, you can verify the Service has correctly received them b
 
 ```bash
 aligned get-user-balance \
---rpc_url https://ethereum-holesky-rpc.publicnode.com \
---network holesky \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com \
+--network hoodi \
 --user_addr <user_addr>
 ```
 
@@ -138,8 +138,8 @@ aligned submit \
 --proof_generator_addr [proof_generator_addr] \
 --batch_inclusion_data_directory_path [batch_inclusion_data_directory_path] \
 --keystore_path <path_to_ecdsa_keystore> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 **Example**
@@ -152,8 +152,8 @@ aligned submit \
 --vm_program ./scripts/test_files/sp1/sp1_fibonacci_5_0_0.elf \
 --public_input ./scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
 --keystore_path ~/.aligned_keystore/keystore0 \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ### Risc0 proof
@@ -172,8 +172,8 @@ aligned submit \
 --proof_generator_addr [proof_generator_addr] \
 --batch_inclusion_data_directory_path [batch_inclusion_data_directory_path] \
 --keystore_path <path_to_ecdsa_keystore> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 **NOTE**: As said above, Aligned currently supports Risc0 proofs from `risc0-zkvm` version `v3.0.3`. For generating proofs using `cargo risc-zero` please ensure you are using `v3.0.3` or your proof will not be verified. 
@@ -198,8 +198,8 @@ aligned submit \
 --public_input ./scripts/test_files/risc_zero/fibonacci_proof_generator/risc_zero_fibonacci_3_0_3.pub \
 --aligned_verification_data_path ~/.aligned/aligned_verification_data \
 --keystore_path ~/.aligned_keystore/keystore0 \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ### GnarkPlonkBn254, GnarkPlonkBls12_381 and GnarkGroth16Bn254
@@ -216,8 +216,8 @@ aligned submit \
 --proof_generator_addr [proof_generator_addr] \
 --batch_inclusion_data_directory_path [batch_inclusion_data_directory_path] \
 --keystore_path <path_to_ecdsa_keystore> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 **Examples**:
@@ -230,8 +230,8 @@ aligned submit \
 --public_input ./scripts/test_files/gnark_plonk_bn254_script/gnark_plonk_pub_input_0_12_0.pub \
 --vk ./scripts/test_files/gnark_plonk_bn254_script/gnark_plonk_0_12_0.vk \
 --keystore_path ~/.aligned_keystore/keystore0 \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ```bash
@@ -242,8 +242,8 @@ aligned submit \
 --public_input ./scripts/test_files/gnark_plonk_bls12_381_script/gnark_plonk_pub_input_0_12_0.pub \
 --vk ./scripts/test_files/gnark_plonk_bls12_381_script/gnark_plonk_0_12_0.vk \
 --keystore_path ~/.aligned_keystore/keystore0 \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ```bash
@@ -254,8 +254,8 @@ aligned submit \
 --public_input ./scripts/test_files/gnark_groth16_bn254_script/gnark_groth16_0_12_0.pub \
 --vk ./scripts/test_files/gnark_groth16_bn254_script/gnark_groth16_0_12_0.vk \
 --keystore_path ~/.aligned_keystore/keystore0 \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ### CircomGroth16Bn256
@@ -272,8 +272,8 @@ aligned submit \
 --proof_generator_addr [proof_generator_addr] \
 --batch_inclusion_data_directory_path [batch_inclusion_data_directory_path] \
 --keystore_path <path_to_ecdsa_keystore> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 **Example**
 
@@ -285,6 +285,6 @@ aligned submit \
 --public_input ./scripts/test_files/circom_groth16_bn256_script/public.json \
 --vk ./scripts/test_files/circom_groth16_bn256_script/verification_key.json \
 --keystore_path ~/.aligned_keystore/keystore0 \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```

docs/3_guides/4_generating_proofs.md

@@ -41,7 +41,7 @@ aligned submit \
 --vm_program <vm_program_path> \
 --batcher_url wss://batcher.alignedlayer.com \
 --proof_generator_addr <proof_generator_addr> \
---rpc_url https://ethereum-holesky-rpc.publicnode.com 
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com 
 ```
 
 Where `proof_path` is the path to the proof file, `vm_program_path` is the path to the ELF file. `proof_generator_addr` is an optional parameter that works as a helper for some applications where you can be frontrunned.
@@ -90,7 +90,7 @@ aligned submit \
 --vk <verification_key_path> \
 --batcher_url wss://batcher.alignedlayer.com \
 --proof_generator_addr <proof_generator_addr> \
---rpc_url https://ethereum-holesky-rpc.publicnode.com 
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com 
 ```
 
 Where proof path is the path to the proof file, `public_input_path` is the path to the public input file,
@@ -168,7 +168,7 @@ aligned submit \
   --public_input <pub_input_file_path> \
   --batcher_url wss://batcher.alignedlayer.com \
   --proof_generator_addr <proof_generator_addr> \
-  --rpc_url https://ethereum-holesky-rpc.publicnode.com \
+  --rpc_url https://ethereum-hoodi-rpc.publicnode.com \
   --payment_service_addr 0x815aeCA64a974297942D2Bbf034ABEe22a38A003
 ```
 

docs/3_guides/9_aligned_cli.md

@@ -102,8 +102,8 @@ aligned submit  \
 --repetitions <BURST_SIZE> \
 --keystore_path <KEYSTORE_PATH> \
 --batcher_url wss://batcher.alignedlayer.com \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com \
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com \
 --max_fee 0.0013ether
 ```
 
@@ -141,8 +141,8 @@ Check if a proof was verified by Aligned on Ethereum.
 ```bash
 aligned verify-proof-onchain \
 --aligned-verification-data ./aligned_verification_data/<VERIFICATION_DATA_FILE> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ---
@@ -200,8 +200,8 @@ Deposits Ethereum into the Aligned Layer's `BatcherPaymentService.sol` contract.
 
 ```bash
 aligned deposit-to-batcher \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com \
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com \
 --amount 0.5ether \
 --keystore_path <KEYSTORE_PATH>
 ```
@@ -242,8 +242,8 @@ Retrieves the user's balance in the Aligned Layer's contract.
 ```bash
 aligned get-user-balance \
 --user_addr <WALLET_ADDRESS> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ---
@@ -275,7 +275,7 @@ Retrieves the user's current nonce from the Batcher.
 ```bash
 aligned get-user-nonce \
 --user_addr <USER_ETH_ADDRESS> \
---network holesky
+--network hoodi
 ```
 
 ---
@@ -313,8 +313,8 @@ Retrieves the user's current nonce from the Blockhain, in the Batcher Payment Se
 ```bash
 aligned get-user-nonce-from-ethereum \
 --user_addr <USER_ETH_ADDRESS> \
---network holesky \
---rpc_url https://ethereum-holesky-rpc.publicnode.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 ---
@@ -323,7 +323,7 @@ aligned get-user-nonce-from-ethereum \
 
 #### Description:
 
-Retrieves the user's amount of queued proofs in the Batcher.
+Retrieves the number of proofs currently queued for a given user in the Batcher.
 
 #### Command:
 
@@ -332,28 +332,28 @@ Retrieves the user's amount of queued proofs in the Batcher.
 #### Options:
 
 - `--user_addr <user_address>`: User's Ethereum address.
-- `--network <working_network_name>`: Network name to interact with.  
-  - Default: `devnet`  
-  - Possible values: `devnet`, `holesky`, `mainnet`, `hoodi`
-- `--rpc_url <RPC_provider_url>`: User's Ethereum RPC provider connection address. 
+- Specify which network to interact with, using one of the following options:
+  - `--network <working_network_name>`: Network name to interact with.  
+    - Default: `devnet`  
+    - Possible values: `devnet`, `holesky`, `mainnet`, `hoodi`
+  - For a custom network, instead of `--network`, provide the following flags:
+    - `--aligned_service_manager <aligned_service_manager_contract_address>`: Address of the Aligned Service Manager contract.
+    - `--batcher_payment_service <batcher_payment_service_contract_address>`: Address of the Batcher Payment Service contract.
+    - `--batcher_url <batcher_websocket_url>`: WebSocket URL for the Aligned batcher.
+- `--rpc_url <rpc_provider_url>`: Ethereum RPC provider URL.  
   - Default: `http://localhost:8545`
   - Mainnet: `https://ethereum-rpc.publicnode.com`
   - Holesky: `https://ethereum-holesky-rpc.publicnode.com`
   - Hoodi: `https://ethereum-hoodi-rpc.publicnode.com`
-  - Also, you can use your own Ethereum RPC providers.
-- `--batcher_url <batcher_connection_address>`: Websocket URL for the Aligned Layer batcher  
-  - Default: `ws://localhost:8080`  
-  - Mainnet: `wss://mainnet.batcher.alignedlayer.com`
-  - Holesky: `wss://batcher.alignedlayer.com`
-  - Hoodi: `wss://hoodi.batcher.alignedlayer.com`
+  - You can also specify your own RPC provider URL
 
 #### Example:
 
 ```bash
 aligned get-user-amount-of-queued-proofs  \
 --user_addr <USER_ETH_ADDRESS> \
---network holesky \
---batcher_url wss://batcher.alignedlayer.com
+--network hoodi \
+--rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```
 
 
@@ -377,25 +377,23 @@ Verifies if your proof has been verified by the `Aggregation Mode`.
 - `--network <working_network_name>`: Network name to interact with.  
   - Default: `devnet`  
   - Possible values: `devnet`, `holesky`, `mainnet`, `hoodi`
-- `--rpc_url <RPC_provider_url>`: User's Ethereum RPC provider connection address. 
+- `--rpc_url <RPC_provider_url>`: User's Ethereum RPC provider connection address.
   - Default: `http://localhost:8545`
   - Mainnet: `https://ethereum-rpc.publicnode.com`
   - Holesky: `https://ethereum-holesky-rpc.publicnode.com`
   - Hoodi: `https://ethereum-hoodi-rpc.publicnode.com`
   - Also, you can use your own Ethereum RPC providers.
 - `--beacon_client_url <BEACON_CLIENT_URL>`: User's Ethereum Consensus provider connection address. Public nodes don't support this method.
 
-
-
 #### Example:
 
 ```bash
 aligned verify-agg-proof \
-  --network holesky \
+  --network hoodi \
   --from-block 3638552 \
   --proving_system SP1 \
   --public_input ../../scripts/test_files/sp1/sp1_fibonacci_5_0_0.pub \
   --vk ./scripts/test_files/sp1/sp1_fibonacci_5_0_0.vk \
   --beacon_url <YOUR_BEACON_CLIENT> \
-  --rpc_url https://ethereum-holesky-rpc.publicnode.com
+  --rpc_url https://ethereum-hoodi-rpc.publicnode.com
 ```

examples/circom/.env.example

@@ -3,4 +3,4 @@ ETH_RPC_URL=<RPC_URL>
 PRIVATE_KEY=<PRIVATE_KEY>
 # Deploy the contract with make deploy_contract_devnet
 FIBONACCI_CONTRACT_ADDRESS=<FIBONACCI_CONTRACT_ADDRESS>
-NETWORK=<devnet|holesky|holeksy-stage|mainnet>
+NETWORK=<devnet|holesky|holeksy-stage|mainnet|hoodi>

examples/circom/src/config.rs

@@ -32,6 +32,7 @@ impl EnvConfig {
             "holesky-stage" => Network::HoleskyStage,
             "holesky" => Network::Holesky,
             "mainnet" => Network::Mainnet,
+            "hoodi" => Network::Hoodi,
             _ => panic!("Unsupported NETWORK value"),
         };
 

examples/l2/.env.holesky examples/l2/.env.hoodiexamples/l2/.env.holesky renamed to examples/l2/.env.hoodi

@@ -1,7 +1,7 @@
-# .env example for holesky network
-NETWORK=holesky
-ETH_RPC_URL=https://ethereum-holesky-rpc.publicnode.com
-WS_ETH_RPC_URL=wss://ethereum-holesky-rpc.publicnode.com
+# .env example for hoodi network
+NETWORK=hoodi
+ETH_RPC_URL=https://ethereum-hoodi-rpc.publicnode.com
+WS_ETH_RPC_URL=wss://ethereum-hoodi-rpc.publicnode.com
 BEACON_CLIENT_URL=<YOUR_BEACON_CLIENT_URL> # This can't be a public one as we need to retrieve blobs and they don't support that method
 PRIVATE_KEY_STORE_PATH=<PATH_TO_STATE_TRANSITION_OWNER_KEYSTORE>
 PRIVATE_KEY_STORE_PASSWORD=<STATE_TRANSITION_OWNER_KEYSTORE_PASSWORD>