Merge remote-tracking branch 'origin/main' into tamir/audit_fixes

Author: ratankaliani

client/src/request.rs

@@ -38,7 +38,7 @@ struct OffchainInput {
 }
 
 #[allow(non_snake_case)]
-#[derive(Serialize, Deserialize)]
+#[derive(Serialize, Deserialize, Debug)]
 /// Proof data for a Succinct X function call.
 /// This is the data that is returned from the Succinct X API.
 struct SuccinctProofData {
@@ -81,6 +81,7 @@ const LOCAL_PROOF_FOLDER: &str = "./proofs";
 
 /// Client to interact with the Succinct X API.
 #[allow(dead_code)]
+#[derive(Clone)]
 pub struct SuccinctClient {
     /// HTTP client.
     client: Client,
@@ -386,6 +387,13 @@ impl SuccinctClient {
             let client = Arc::new(SignerMiddleware::new(provider, wallet.clone()));
 
             let address = get_gateway_address(succinct_proof_data.chain_id);
+            if address.is_none() {
+                info!(
+                    "Could not find canonical gateway address for chain {}",
+                    succinct_proof_data.chain_id
+                );
+            }
+
             // If gateway_address is provided, use that instead of the canonical gateway address.
             let mut gateway_address = gateway_address.or(address).expect(
                 "Gateway address must be provided when relaying a proof in local mode

client/src/utils.rs

@@ -1,10 +1,11 @@
 // List of Succinct Gateway addresses for chains.
-const GATEWAY_ADDRESSES: [(u32, &str); 6] = [
+const GATEWAY_ADDRESSES: [(u32, &str); 7] = [
     (1, "0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803"),
     (5, "0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803"),
     (100, "0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803"),
-    (420, "0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803"),
     (17000, "0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803"),
+    (42161, "0x2d27182206f0442885989626934ca9dd5290f979"),
+    (421614, "0x2d27182206f0442885989626934ca9dd5290f979"),
     (11155111, "0xaea9288f0b7a8c605c4d474c56e5e74f96bfd4b3"),
 ];
 

contracts/README.md

@@ -25,6 +25,18 @@ forge test
 SUCCINCT_GATEWAY=[0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803](https://etherscan.io/address/0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803)
 SUCCINCT_FEE_VAULT=[0x5999d401444f15d262fdce310bb68bd234de11aa](https://etherscan.io/address/0x5999d401444f15d262fdce310bb68bd234de11aa)
 
+| Chain            | Chain ID | Address                                                                                                          |
+|------------------|----------|------------------------------------------------------------------------------------------------------------------|
+| Mainnet          | 1        | [0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803](https://etherscan.io/address/0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803)            |
+| Goerli           | 5        | [0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803](https://goerli.etherscan.io/address/0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803)     |
+| Gnosis           | 100      | [0x6e4f1e9eA315EBFd69d18C2DB974EEf6105FB803](https://gnosisscan.io/address/0x6e4f1e9eA315EBFd69d18C2DB974EEf6105FB803)           |
+| Holesky          | 17000    | [0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803](https://holesky.etherscan.io/address/0x6e4f1e9ea315ebfd69d18c2db974eef6105fb803)    |
+| Arbitrum         | 42161    | [0x2d27182206f0442885989626934ca9dd5290f979](https://arbiscan.io/address/0x2d27182206f0442885989626934ca9dd5290f979)             |
+| Arbitrum Sepolia | 421614   | [0x2d27182206f0442885989626934ca9dd5290f979](https://sepolia.arbiscan.io/address/0x2d27182206f0442885989626934ca9dd5290f979)     |
+| Sepolia          | 11155111 | [0xaea9288f0b7a8c605c4d474c56e5e74f96bfd4b3](https://sepolia.etherscan.io/address/0xaea9288f0b7a8c605c4d474c56e5e74f96bfd4b3)    |
+
+
+
 ## Deploying
 
 Each contract has it's own deployment file in the form of `script/deploy/{Contract}.s.sol`. Inside each, there is a `Deploy{Contract}` script that will deploy the contract. This allows for programmatic cross-chain deployment of contracts using `script/deploy.sh`.
@@ -44,7 +56,7 @@ Contract verification will be automatically applied during deployment. However,
 For example, to verify both the proxy and implementation contract of SuccinctGateway (both of which have no `constructor_args`) on Chains 5, 420, 84531, and 421613, you would run:
 
 ```sh
-./script/verify.sh "SuccinctGateway" "5 420 84531 421613" "true" 
+./script/verify.sh "SuccinctGateway" "5 420 84531 421613" "true"
 ```
 
 ## Upgrading
@@ -59,7 +71,7 @@ Timelocked upgrades take place in two parts (`schedule` and then `execute` after
 
 #### Step 1: Deploy a new implementation contract
 
-Re-deploy the new contract via `script/deploy.sh`. This will generate a new `*_IMPL` implementation contract address with the current contract code. 
+Re-deploy the new contract via `script/deploy.sh`. This will generate a new `*_IMPL` implementation contract address with the current contract code.
 
 #### Step 2: Schedule the upgrade