Merge branch 'testnet' into fix/add-hoodi-support-l2-example

Author: JuArce

examples/verify/.env.example

@@ -1,3 +1,3 @@
 RPC_URL=<rpc_url>
 PRIVATE_KEY=<private_key>
-ALIGNED_DEPLOYMENT_OUTPUT=../../contracts/script/output/holesky/alignedlayer_deployment_output.json # Path to the deployment output file from the aligned layer, relative to verify directory
+ALIGNED_DEPLOYMENT_OUTPUT=../../contracts/script/output/hoodi/alignedlayer_deployment_output.json # Path to the deployment output file from the aligned layer, relative to verify directory

examples/verify/README.md

@@ -20,8 +20,8 @@ First create a `.env` file in the root directory of the project with the followi
 | Variable                    | Value                                                                                                                                                                                                                                   |
 |-----------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | `PRIVATE_KEY`               | Your ethereum private key                                                                                                                                                                                                               |
-| `RPC_URL`                   | Your ethereum RPC url. You can use public node: https://ethereum-holesky-rpc.publicnode.com                                                                                                                                             |
-| `ALIGNED_DEPLOYMENT_OUTPUT` | Path to aligned layer deployment output. This is needed to get service manager address. You can get it from https://github.com/yetanotherco/aligned_layer/blob/main/contracts/script/output/holesky/alignedlayer_deployment_output.json |
+| `RPC_URL`                   | Your ethereum RPC url. You can use public node: https://ethereum-hoodi-rpc.publicnode.com                                                                                                                                             |
+| `ALIGNED_DEPLOYMENT_OUTPUT` | Path to aligned layer deployment output. This is needed to get service manager address. You can get it from https://github.com/yetanotherco/aligned_layer/blob/main/contracts/script/output/hoodi/alignedlayer_deployment_output.json |
 
 Then, you can deploy the contract by running the following command:
 
@@ -49,7 +49,7 @@ Replace `[SENDER_ADDRESS]` with the address of the `BatcherPaymentService` contr
 This will output the encoded call. You can then use this encoded call to check your submitted proof with the associated data is verified in Ethereum by running the following command:
 
 ```bash
-curl -X POST http://localhost:8545 \
+curl -X POST <RPC_URL> \
 -H "Content-Type: application/json" \
 -d '{
     "jsonrpc": "2.0",
@@ -62,16 +62,16 @@ curl -X POST http://localhost:8545 \
 }'
 ```
 
-Replace `<CONTRACT_ADDRESS>` with the address of the contract you deployed earlier (or `0x58F280BeBE9B34c9939C3C39e0890C81f163B623` for Aligned ServiceManager in Holesky), `<CALLDATA>` with the encoded call, 
-and `<RPC_URL>` with the RPC URL of the blockchain you are using.
+Replace `<CONTRACT_ADDRESS>` with the address of the contract you deployed earlier (or `0x87CD431F160e88EC34fA48EC6F6cF7F2C0E8248c` for Aligned ServiceManager in Hoodi), `<CALLDATA>` with the encoded call, 
+and `<RPC_URL>` with the RPC URL of the blockchain you are using (`https://ethereum-hoodi-rpc.publicnode.com` for Hoodi).
 
 The output data should be something like this:
 
 ```json
 {
   "jsonrpc":"2.0",
   "result":"0x0000000000000000000000000000000000000000000000000000000000000001",
-  "id":q
+  "id":1
 }
 ```
 
@@ -96,9 +96,9 @@ Replace `[CONTRACT_ADDRESS]`, `[PATH_TO_ALIGNED_VERIFICATION_DATA]` and `[SENDER
 #### Example Command
 
 ```bash
-python3 verify.py --contract-address 0x58F280BeBE9B34c9939C3C39e0890C81f163B623 --aligned-verification-data ../../aligned_verification_data/b8c17406_4.json --sender-address 0x815aeCA64a974297942D2Bbf034ABEe22a38A003
+python3 verify.py --contract-address 0x87CD431F160e88EC34fA48EC6F6cF7F2C0E8248c --aligned-verification-data ../../aligned_verification_data/b8c17406_4.json --sender-address 0x041af25Fce2413570aaa0029D36DeA1eFdeff083
 ```
 
-In this case, `--contract-address` is the address of the `AlignedLayerServiceManager` and `--sender-address` is the address of the `BatcherPaymentService` in Holesky Testnet.
+In this case, `--contract-address` is the address of the `AlignedLayerServiceManager` and `--sender-address` is the address of the `BatcherPaymentService` in Hoodi Testnet.
 
 You need to replace the `--aligned-verification-data` with the path to the JSON file containing the verification data. This is the output when submitting a proof.

examples/verify/verify.py

@@ -5,8 +5,8 @@
 
 def main():
     parser = ArgumentParser()
-    parser.add_argument('--rpc-url', default='https://ethereum-holesky-rpc.publicnode.com',
-                        help='RPC URL (default: https://ethereum-holesky-rpc.publicnode.com)')
+    parser.add_argument('--rpc-url', default='https://ethereum-hoodi-rpc.publicnode.com',
+                        help='RPC URL (default: https://ethereum-hoodi-rpc.publicnode.com)')
     parser.add_argument('--aligned-verification-data', help='Path to JSON file with the verification data',
                         required=True)
     parser.add_argument('--contract-address', help='Verifier Contract address', required=True)

examples/zkquiz/Makefile

@@ -6,15 +6,15 @@ deploy_verifier:
 deploy_verifier_devnet:
 	. ./contracts/.devnet.env && . ./contracts/deploy.sh
 
-CONTRACT_ADDRESS=0x1adFb00CC74Ff26bB05419953006c66B1abFCD45
+CONTRACT_ADDRESS=0xAD607c7DA33BDD310307E57830bf426b16f32AD1
 STAGE_CONTRACT_ADDRESS=0xc4da6fcfa317eaf166b09ef276c0bdf43648a65f
-RPC_URL=https://ethereum-holesky-rpc.publicnode.com
+RPC_URL=https://ethereum-hoodi-rpc.publicnode.com
 
 answer_quiz:
 	@cd quiz/script && cargo run -r -- \
 		--keystore-path $(KEYSTORE_PATH) \
  		--rpc-url $(RPC_URL) \
-		--network holesky \
+		--network hoodi \
   		--verifier-contract-address $(CONTRACT_ADDRESS)
 
 answer_quiz_stage:

examples/zkquiz/contracts/.env.example

@@ -1,5 +1,5 @@
 RPC_URL=<rpc_url>
 PRIVATE_KEY=<private_key>
-ALIGNED_SERVICE_MANAGER_ADDRESS=<aligned_service_manager_addr># 0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
-BATCHER_PAYMENT_SERVICE_ADDRESS=<batcher_payment_service_addr># 0x815aeCA64a974297942D2Bbf034ABEe22a38A003
+ALIGNED_SERVICE_MANAGER_ADDRESS=<aligned_service_manager_addr># 0x87CD431F160e88EC34fA48EC6F6cF7F2C0E8248c for Hoodi
+BATCHER_PAYMENT_SERVICE_ADDRESS=<batcher_payment_service_addr># 0x041af25Fce2413570aaa0029D36DeA1eFdeff083
 ETHERSCAN_API_KEY=<etherscan_api_key>

examples/zkquiz/quiz/script/src/main.rs

@@ -24,7 +24,7 @@ struct Args {
     #[arg(
         short,
         long,
-        default_value = "https://ethereum-holesky-rpc.publicnode.com"
+        default_value = "https://ethereum-hoodi-rpc.publicnode.com"
     )]
     rpc_url: String,
     #[clap(flatten)]
@@ -38,6 +38,7 @@ enum NetworkNameArg {
     Devnet,
     Holesky,
     HoleskyStage,
+    Hoodi,
     Mainnet,
 }
 
@@ -49,9 +50,10 @@ impl FromStr for NetworkNameArg {
             "devnet" => Ok(NetworkNameArg::Devnet),
             "holesky" => Ok(NetworkNameArg::Holesky),
             "holesky-stage" => Ok(NetworkNameArg::HoleskyStage),
+            "hoodi" => Ok(NetworkNameArg::Hoodi),
             "mainnet" => Ok(NetworkNameArg::Mainnet),
             _ => Err(
-                "Unknown network. Possible values: devnet, holesky, holesky-stage, mainnet"
+                "Unknown network. Possible values: devnet, holesky, holesky-stage, mainnet, hoodi"
                     .to_string(),
             ),
         }
@@ -64,7 +66,7 @@ struct NetworkArg {
         name = "The working network's name",
         long = "network",
         default_value = "devnet",
-        help = "[possible values: devnet, holesky, holesky-stage, mainnet]"
+        help = "[possible values: devnet, holesky, holesky-stage, mainnet, hoodi]",
     )]
     network: Option<NetworkNameArg>,
     #[arg(
@@ -115,6 +117,7 @@ impl From<NetworkArg> for Network {
             Some(NetworkNameArg::Devnet) => Network::Devnet,
             Some(NetworkNameArg::Holesky) => Network::Holesky,
             Some(NetworkNameArg::HoleskyStage) => Network::HoleskyStage,
+            Some(NetworkNameArg::Hoodi) => Network::Hoodi,
             Some(NetworkNameArg::Mainnet) => Network::Mainnet,
         }
     }