Merge branch 'testnet' into feat/bump-sp1-version

Author: JuArce

Makefile

@@ -139,14 +139,10 @@ lint_contracts:
 	@cd contracts && npm run lint:sol
 
 anvil_start:
-	@echo "Starting Anvil..."
-	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json
-
-anvil_start_with_block_time:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json --block-time 7
 
-anvil_start_with_block_time_with_more_prefunded_accounts:
+anvil_start_with_more_prefunded_accounts:
 	@echo "Starting Anvil..."
 	anvil --load-state contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json --block-time 7 -a 2000
 
@@ -1154,7 +1150,7 @@ setup_local_aligned_all:
 	tmux new-session -d -s aligned_layer
 
 	tmux new-window -t aligned_layer -n anvil
-	tmux send-keys -t aligned_layer 'make anvil_start_with_block_time' C-m
+	tmux send-keys -t aligned_layer 'make anvil_start' C-m
 
 	tmux new-window -t aligned_layer -n aggregator
 	tmux send-keys -t aligned_layer:aggregator 'make aggregator_start' C-m

alerts/sender_with_alert.sh

@@ -111,11 +111,11 @@ do
     --proof "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.proof" \
     --public_input "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.pub" \
     --vk "./scripts/test_files/gnark_groth16_bn254_infinite_script/infinite_proofs/ineq_${x}_groth16.vk" \
-    --proof_generator_addr $SENDER_ADDRESS \
     --private_key $PRIVATE_KEY \
     --rpc_url $RPC_URL \
     --network $NETWORK \
     --max_fee 0.004ether \
+    --random_address \
     2>&1)
 
   echo "$submit"

batcher/aligned-task-sender/README.md

@@ -42,7 +42,7 @@ NUM_WALLETS=<N> make task_sender_generate_and_fund_wallets_holesky_stage
 ### In Devnet:
 Run anvil with more prefunded accounts, using the following make target:
 ```bash
-make anvil_start_with_block_time_with_more_prefunded
+make anvil_start_with_more_prefunded_accounts
 ```
 
 Then run the following make target, with `NUM_WALLETS` being the amount of wallets you want to deposit funds to aligned payment service, up to 1000.

batcher/aligned/src/main.rs

@@ -88,42 +88,61 @@ pub struct SubmitArgs {
         default_value = "http://localhost:8545"
     )]
     eth_rpc_url: String,
+
     #[arg(name = "Proving system", long = "proving_system")]
     proving_system_flag: ProvingSystemArg,
+
     #[arg(name = "Proof file path", long = "proof")]
     proof_file_name: PathBuf,
+
     #[arg(name = "Public input file name", long = "public_input")]
     pub_input_file_name: Option<PathBuf>,
+
     #[arg(name = "Verification key file name", long = "vk")]
     verification_key_file_name: Option<PathBuf>,
+
     #[arg(name = "VM prgram code file name", long = "vm_program")]
     vm_program_code_file_name: Option<PathBuf>,
+
     #[arg(
         name = "Number of repetitions",
         long = "repetitions",
         default_value = "1"
     )]
     repetitions: usize,
+
     #[arg(
         name = "Proof generator address",
         long = "proof_generator_addr",
         default_value = "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
     )] // defaults to anvil address 1
     proof_generator_addr: String,
+
     #[arg(
         name = "Aligned verification data directory Path",
         long = "aligned_verification_data_path",
         default_value = "./aligned_verification_data/"
     )]
     batch_inclusion_data_directory_path: String,
+
     #[command(flatten)]
     private_key_type: PrivateKeyType,
+
     #[arg(name = "Nonce", long = "nonce")]
     nonce: Option<String>, // String because U256 expects hex
+
     #[clap(flatten)]
     network: NetworkArg,
+
     #[command(flatten)]
     fee_type: FeeType,
+
+    #[arg(
+        name = "Random Address",
+        long = "random_address",
+        default_value = "false"
+    )]
+    random_address: bool,
 }
 
 impl SubmitArgs {
@@ -516,7 +535,15 @@ async fn main() -> Result<(), AlignedError> {
 
             let verification_data = verification_data_from_args(&submit_args)?;
 
-            let verification_data_arr = vec![verification_data; repetitions];
+            let mut verification_data_arr = vec![verification_data; repetitions];
+
+            // If random_address flag is enabled, change every address with a random value
+            if submit_args.random_address {
+                info!("Randomizing proof generator address for each proof...");
+                for verification_data in verification_data_arr.iter_mut() {
+                    verification_data.proof_generator_addr = Address::random();
+                }
+            }
 
             info!("Submitting proofs to the Aligned batcher...");
 

docs/3_guides/6_setup_aligned.md

@@ -33,7 +33,7 @@ This will:
 To start anvil, a local Ethereum devnet with all necessary contracts already deployed and ready to be interacted with, run:
 
 ```shell
-make anvil_start_with_block_time
+make anvil_start
 ```
 
 <details>

docs/3_guides/9_aligned_cli.md

@@ -86,7 +86,8 @@ Submit a proof to the Aligned Layer batcher.
   - `--default_fee_estimate`: Specifies a `max_fee` equivalent to the cost of 1 proof in a batch of size 10.
   - `--instant_fee_estimate`: Specifies a `max_fee` that ensures the proof is included instantly, equivalent to the cost of a proof in a batch of size 1.
   - `--custom_fee_estimate <amount_of_proofs_in_batch>`: Specifies a `max_fee` equivalent to the cost of 1 proof in a batch of size `num_proofs_in_batch`.
-
+- `random_address`: If set, random addresses will be used as `proof_generator_addr` for each proof.  
+  - Default: `false`
 
 #### Example:
 

scripts/fund_operator_devnet.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Check that OPERATOR_ADDRESS is not empty
-if [[ "$OPERATOR_ADDRESS" -eq "" ]]; then
+if [[ -z "$OPERATOR_ADDRESS" ]]; then
   echo "OPERATOR_ADDRESS is empty, using default value 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
   OPERATOR_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 fi;

scripts/mint_mock_token.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # check that OPERATOR_ADDRESS is not empty
-if [[ "$OPERATOR_ADDRESS" -eq "" ]]; then
+if [[ -z "$OPERATOR_ADDRESS" ]]; then
   echo "OPERATOR_ADDRESS is empty, using default value 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
   OPERATOR_ADDRESS="0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
 fi;
@@ -17,7 +17,7 @@ mock_token_address=$(cast call "$mock_strategy_address" "underlyingToken()")
 
 operator_address=$(cat "$1" | yq -r '.operator.address')
 
-if [[ "$mock_token_address" -eq "" ]]; then
+if [[-z  "$mock_token_address" ]]; then
   echo "Mock token address is empty, please deploy the contracts first"
   exit 1
 fi;

scripts/user_fund_payment_service_devnet.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Check that OPERATOR_ADDRESS is not empty
-if [[ "$USER_ADDRESS" -eq "" ]]; then
+if [[ -z "$USER_ADDRESS" ]]; then
   echo "USER_ADDRESS is empty, using default value 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266"
   USER_ADDRESS=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
   USER_PRIVATE_KEY=0xac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80