Merge pull request #443 from a16z/fix/guest-toolchain

Point to updated toolchain
a16z · Aug 9, 2024 · d323674 · d323674
2 parents 15bc8f7 + 00d6d08
commit d323674
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 9 deletions.
diff --git a/.jolt.rust.toolchain-tag b/.jolt.rust.toolchain-tag
@@ -1 +1 @@
-nightly-3c5f0ec3f4f98a2d211061a83bade8d62c6a6135
+nightly-e1f7f2bced08d7f582e0fe747372dca74310f346
diff --git a/jolt-core/src/host/mod.rs b/jolt-core/src/host/mod.rs
@@ -111,7 +111,7 @@ impl Program {
                 "-C",
                 &format!("link-arg=-T{}", self.linker_path()),
                 "-C",
-                "passes=loweratomic",
+                "passes=lower-atomic",
                 "-C",
                 "panic=abort",
             ];

diff --git a/jolt-core/src/poly/commitment/kzg.rs b/jolt-core/src/poly/commitment/kzg.rs
@@ -10,9 +10,6 @@ use rand_core::{CryptoRng, RngCore};
 use std::marker::PhantomData;
 use std::sync::Arc;
 
-#[cfg(feature = "ark-msm")]
-use ark_ec::VariableBaseMSM;
-
 #[derive(Clone, Debug)]
 pub struct SRS<P: Pairing> {
     pub g1_powers: Vec<P::G1Affine>,

diff --git a/jolt-core/src/poly/structured_poly.rs b/jolt-core/src/poly/structured_poly.rs
@@ -27,7 +27,7 @@ pub trait StructuredOpeningProof<F, C, Polynomials>:
 where
     F: JoltField,
     C: CommitmentScheme<Field = F>,
-    Polynomials: StructuredCommitment<C> + ?Sized,
+    Polynomials: StructuredCommitment<C>,
 {
     type Preprocessing = NoPreprocessing;
     type Proof: Sync + CanonicalSerialize + CanonicalDeserialize;

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,4 +1,3 @@
 [toolchain]
-channel = "nightly-2024-04-20"
+channel = "nightly-2024-08-01"
 targets = ["riscv32i-unknown-none-elf"]
-
diff --git a/tracer/src/emulator/cpu.rs b/tracer/src/emulator/cpu.rs
@@ -902,7 +902,7 @@ impl Cpu {
 						((halfword >> 1) & 0x3c0) | // nzuimm{9:6] <= [10:7]
 						((halfword >> 4) & 0x4) | // nzuimm[2] <= [6]
 						((halfword >> 2) & 0x8); // nzuimm[3] <= [5]
-                         // nzuimm == 0 is reserved instruction
+                               // nzuimm == 0 is reserved instruction
                     if nzuimm != 0 {
                         return (nzuimm << 20) | (2 << 15) | ((rd + 8) << 7) | 0x13;
                     }