fix: ci tests

axiom-crypto · Apr 16, 2024 · dae8623 · dae8623
1 parent 39ed32f
commit dae8623
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 24 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -11,6 +11,9 @@ jobs:
     runs-on: ubuntu-latest-64core-256ram
     steps:
       - uses: actions/checkout@v3
+      - name: Configure Git for submodules
+        run: |
+          git config --global url."https://github.com/".insteadOf "[email protected]:"
       - name: Build rust client
         run: |
           cargo build --verbose
@@ -19,9 +22,11 @@ jobs:
           mkdir params
           for k in {5..21}
           do
-            wget "https://axiom-crypto.s3.amazonaws.com/challenge_0078/kzg_bn254_${k}.srs"
+            wget "https://axiom-crypto.s3.amazonaws.com/challenge_0085/kzg_bn254_${k}.srs"
           done
           mv *.srs params/
+          mkdir circuit/params
+          cp params/*.srs circuit/params/
       - name: Test rust client
         run: |
           export PROVIDER_URI=${{ secrets.PROVIDER_URI_SEPOLIA }}
@@ -30,11 +35,11 @@ jobs:
         run: |
           export PROVIDER_URI=${{ secrets.PROVIDER_URI_SEPOLIA }}
           mkdir data
-          cargo run --example keccak -- --input sdk/data/keccak_input.json -k 15 -c sdk/data/keccak_config.json keygen
-          cargo run --example keccak -- --input sdk/data/keccak_input.json -k 15 -c sdk/data/keccak_config.json run
-          cargo run --example rlc -- --input sdk/data/rlc_input.json -k 15 -c sdk/data/rlc_config.json keygen
-          cargo run --example rlc -- --input sdk/data/rlc_input.json -k 15 -c sdk/data/rlc_config.json run
-          cargo run --example account_age -- --input sdk/data/account_age_input.json -k 15 keygen
-          cargo run --example account_age -- --input sdk/data/account_age_input.json -k 15 run
-          cargo run --example quickstart -- --input sdk/data/quickstart_input.json -k 15 keygen
-          cargo run --example quickstart -- --input sdk/data/quickstart_input.json -k 15 run
+          cargo run --example keccak -- --input sdk/data/keccak_input.json --config sdk/data/keccak_config.json --aggregate --auto-config-aggregation keygen
+          cargo run --example keccak -- --input sdk/data/keccak_input.json --config sdk/data/keccak_config.json --aggregate run
+          cargo run --example rlc -- -c sdk/data/rlc_config.json keygen
+          cargo run --example rlc -- --input sdk/data/rlc_input.json run
+          cargo run --example account_age -- -k 15 keygen
+          cargo run --example account_age -- --input sdk/data/account_age_input.json run
+          cargo run --example quickstart -- -k 15 keygen
+          cargo run --example quickstart -- --input sdk/data/quickstart_input.json run
diff --git a/circuit/Cargo.toml b/circuit/Cargo.toml
@@ -8,9 +8,9 @@ license = "MIT"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-axiom-codec = { git = "ssh://git@github.com/axiom-crypto/axiom-eth-working.git", branch = "develop" }
-axiom-query = { git = "ssh://git@github.com/axiom-crypto/axiom-eth-working.git", branch = "develop" }
-axiom-components = { git = "ssh://git@github.com/axiom-crypto/axiom-eth-working.git", branch = "develop" }
+axiom-codec = { git = "https://github.com/axiom-crypto/axiom-eth.git", branch = "develop" }
+axiom-query = { git = "https://github.com/axiom-crypto/axiom-eth.git", branch = "develop" }
+axiom-components = { git = "https://github.com/axiom-crypto/axiom-eth.git", branch = "develop" }
 ethers = { version = "2.0", features = ["optimism"] }
 anyhow = "1.0.75"
 tokio = "1.34.0"

diff --git a/sdk/data/keccak_config.json b/sdk/data/keccak_config.json
@@ -1,5 +1,5 @@
 {
-    "k": 15,
+    "k": 17,
     "num_advice_per_phase": [
         5,
         0
@@ -11,12 +11,12 @@
     ],
     "lookup_bits": 14,
     "num_rlc_columns": 0,
-    "keccak_rows_per_round": 50,
+    "keccak_rows_per_round": 20,
     "agg_params": {
-        "degree": 16,
-        "num_advice": 11,
-        "num_lookup_advice": 1,
+        "degree": 20,
+        "num_advice": 13,
+        "num_lookup_advice": 2,
         "num_fixed": 1,
-        "lookup_bits": 15
+        "lookup_bits": 19
     }
 }
diff --git a/sdk/examples/account_age.rs b/sdk/examples/account_age.rs
@@ -3,6 +3,7 @@ use std::fmt::Debug;
 use axiom_sdk::{
     axiom::{AxiomAPI, AxiomComputeFn, AxiomComputeInput, AxiomResult},
     axiom_compute_prover_server,
+    cmd::run_cli,
     ethers::types::Address,
     halo2_base::{
         gates::{GateInstructions, RangeInstructions},
@@ -48,8 +49,8 @@ impl AxiomComputeFn for AccountAgeInput {
     }
 }
 
-axiom_compute_prover_server!(AccountAgeInput);
+// axiom_compute_prover_server!(AccountAgeInput);
 
-// fn main() {
-//     run_cli::<AccountAgeInput>();
-// }
+fn main() {
+    run_cli::<AccountAgeInput>();
+}
diff --git a/sdk/src/cmd/mod.rs b/sdk/src/cmd/mod.rs
@@ -68,11 +68,17 @@ pub fn run_cli_on_scaffold<
             if cli.degree.is_none() && cli.config.is_none() {
                 panic!("The `degree` argument is required for the selected command.");
             }
+            if cli.degree.is_some() && cli.config.is_some() {
+                warn!("The `degree` argument is ignored when a `config` file is provided.");
+            }
         }
         _ => {
             if cli.degree.is_some() {
                 warn!("The `degree` argument is not used for the selected command.");
             }
+            if cli.config.is_some() {
+                warn!("The `config` argument is not used for the selected command.");
+            }
         }
     }
     let input: Option<A::InputValue> = cli.input_path.map(|input_path| {
@@ -127,8 +133,16 @@ pub fn run_cli_on_scaffold<
             AxiomCircuitParams::Base(base_params)
         }
     } else {
+        let degree = if cli.command == SnarkCmd::Run {
+            // The k will be read from the pinning file instead
+            12
+        } else {
+            cli.degree
+                .expect("The `degree` argument is required for the selected command.")
+                as usize
+        };
         AxiomCircuitParams::Base(BaseCircuitParams {
-            k: cli.degree.unwrap() as usize,
+            k: degree,
             num_advice_per_phase: vec![4],
             num_fixed: 1,
             num_lookup_advice_per_phase: vec![1],

diff --git a/sdk/src/cmd/types.rs b/sdk/src/cmd/types.rs
@@ -5,7 +5,7 @@ pub use clap::Parser;
 use clap::Subcommand;
 use serde::{Deserialize, Serialize};
 
-#[derive(Clone, Copy, Debug, Subcommand)]
+#[derive(Clone, Copy, Debug, Subcommand, PartialEq)]
 /// Circuit CLI commands
 pub enum SnarkCmd {
     /// Run the mock prover