chore: Get everything working and rebuilt for sphinx#186

argumentcomputer · Oct 21, 2024 · 31eb0ad · 31eb0ad
1 parent 42624ff
commit 31eb0ad
Show file tree

Hide file tree

Showing 40 changed files with 1,870 additions and 2,894 deletions.
diff --git a/aptos/Cargo.lock b/aptos/Cargo.lock
diff --git a/aptos/Cargo.toml b/aptos/Cargo.toml
@@ -29,7 +29,7 @@ axum = "0.7.5"
 backoff = { version = "0.4.0", features = ["tokio"] }
 # From https://github.com/aptos-labs/aptos-core/blob/aptos-node-v1.14.0/Cargo.toml#L485
 bcs = { git = "https://github.com/aptos-labs/bcs.git", rev = "d31fab9d81748e2594be5cd5cdf845786a30562d" }
-bls12_381 = { git = "https://github.com/argumentcomputer/bls12_381.git", branch = "zkvm" }
+bls12_381 = { git = "https://github.com/argumentcomputer/bls12_381.git", branch = "update-sphinx" }
 bytes = "1.5.0"
 chrono = "0.4.38"
 cfg-if = "1.0.0"
@@ -52,11 +52,11 @@ sha2 = "0.9"
 thiserror = "1.0.58"
 tiny-keccak = "2.0.2"
 url = "2.5.0"
-sphinx-derive = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_44" }
-sphinx-sdk = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_44", features = ["plonk"] }
-sphinx-zkvm = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_44" }
-sphinx-helper = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_44" }
-sphinx-prover = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_44" }
+sphinx-derive = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_48" }
+sphinx-sdk = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_48", features = ["plonk"] }
+sphinx-zkvm = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_48" }
+sphinx-helper = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_48" }
+sphinx-prover = { git = "https://github.com/argumentcomputer/sphinx", branch = "forward_ports_48" }
 tokio = "1.37"
 tokio-stream = "0.1"
 alloy-sol-types = "0.7.2"

diff --git a/aptos/aptos-programs/artifacts/benchmarks/signature-verification-program b/aptos/aptos-programs/artifacts/benchmarks/signature-verification-program
diff --git a/aptos/aptos-programs/artifacts/epoch-change-program b/aptos/aptos-programs/artifacts/epoch-change-program
diff --git a/aptos/aptos-programs/artifacts/inclusion-program b/aptos/aptos-programs/artifacts/inclusion-program
diff --git a/aptos/light-client/benches/e2e.rs b/aptos/light-client/benches/e2e.rs
@@ -27,7 +27,7 @@ use aptos_lc_core::crypto::hash::{CryptoHash, HashValue};
 use aptos_lc_core::types::trusted_state::{EpochChangeProof, TrustedState, TrustedStateChange};
 use aptos_lc_core::types::validator::ValidatorVerifier;
 use serde::Serialize;
-use sphinx_sdk::install::try_install_plonk_bn254_artifacts;
+use sphinx_sdk::artifacts::try_install_plonk_bn254_artifacts;
 use sphinx_sdk::utils::setup_logger;
 use sphinx_sdk::{ProverClient, SphinxProofWithPublicValues, SphinxStdin};
 use std::env;
@@ -199,7 +199,7 @@ fn main() {
     set_snark_environment();
 
     // Install PLONK artifacts.
-    try_install_plonk_bn254_artifacts();
+    try_install_plonk_bn254_artifacts(false);
 
     // Execute snark generation for epoch change.
     let start_epoch_change_snark_proving = Instant::now();

diff --git a/aptos/light-client/src/epoch_change.rs b/aptos/light-client/src/epoch_change.rs
@@ -95,7 +95,7 @@ fn prove_epoch_change(
 mod test {
     use crate::epoch_change::setup_assets;
     use crate::error::LightClientError;
-    use sphinx_sdk::install::try_install_plonk_bn254_artifacts;
+    use sphinx_sdk::artifacts::try_install_plonk_bn254_artifacts;
     use sphinx_sdk::utils::setup_logger;
     use sphinx_sdk::{ProverClient, SphinxStdin};
 
@@ -180,7 +180,7 @@ mod test {
         let stdin = generate_stdin(trusted_state.as_slice(), &epoch_change_proof);
 
         // Install PLONK artifacts.
-        try_install_plonk_bn254_artifacts();
+        try_install_plonk_bn254_artifacts(false);
 
         let start = Instant::now();
         println!("Starting generation of prove_epoch_change proof...");

diff --git a/aptos/light-client/src/inclusion.rs b/aptos/light-client/src/inclusion.rs
@@ -215,7 +215,7 @@ mod test {
         setup_assets, SparseMerkleProofAssets, TransactionProofAssets, ValidatorVerifierAssets,
     };
     use aptos_lc_core::types::validator::ValidatorVerifier;
-    use sphinx_sdk::install::try_install_plonk_bn254_artifacts;
+    use sphinx_sdk::artifacts::try_install_plonk_bn254_artifacts;
     use sphinx_sdk::utils::setup_logger;
     use sphinx_sdk::{ProverClient, SphinxStdin};
 
@@ -333,7 +333,7 @@ mod test {
         );
 
         // Install PLONK artifacts.
-        try_install_plonk_bn254_artifacts();
+        try_install_plonk_bn254_artifacts(false);
 
         let start = Instant::now();
         println!("Starting generation of inclusion proof...");