Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add v3.0.0 + chores #14

Merged
merged 4 commits into from
Dec 16, 2024
Merged

feat: add v3.0.0 + chores #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0507a0
add 3.0.0 vkey and clean up workspace
yuwen01 Dec 10, 2024
f185783
use crates.io agave
yuwen01 Dec 16, 2024
d187123
fix conflict
yuwen01 Dec 16, 2024
ce999e2
nit
yuwen01 Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3,870 changes: 2,836 additions & 1,034 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

18 changes: 7 additions & 11 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,23 @@ sp1-solana = { path = "verifier" }
fibonacci-verifier-contract = { path = "example/program" }

# solana
solana-program = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e" }
solana-program-test = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e" }
solana-sdk = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e" }
solana-program = { version = "=2.1.6" }
solana-program-test = { version = "=2.1.6" }
solana-sdk = { version = "=2.1.6" }
borsh = "1.5.1"

# light protocol groth16 verifier
groth16-solana = { git = "https://github.com/sp1-patches/groth16-solana", branch = "patch-v0.0.3" }

# misc
num-bigint = "0.4.6"
num-traits = "0.2.19"
tokio = "1.40.0"
sha2 = "0.10.8"

# sp1
sp1-sdk = { version = "3.0.0", default-features = false }
sp1-sdk = { version = "3.0.0" }
sp1-zkvm = { version = "3.0.0" }
sp1-build = { version = "3.0.0" }

[patch.crates-io]
# See https://github.com/anza-xyz/agave/blob/master/Cargo.toml#L551-L586
solana-curve25519 = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e"}
solana-program = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e"}
solana-bn254 = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e" }
solana-zk-sdk = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e" }
solana-zk-token-sdk = { git = "https://github.com/anza-xyz/agave", rev = "6e62af0f0de6a40e4e22628cbbcf63b1a6da560e"}

9 changes: 3 additions & 6 deletions example/program/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ use solana_program::{
use sp1_solana::verify_proof;

#[cfg(not(feature = "no-entrypoint"))]
use solana_program::entrypoint;

#[cfg(not(feature = "no-entrypoint"))]
entrypoint!(process_instruction);
solana_program::entrypoint!(process_instruction);

#[cfg(not(doctest))]
/// Derived as follows:
Expand All @@ -20,7 +17,7 @@ entrypoint!(process_instruction);
/// let vkey_hash = vk.bytes32();
/// ```
const FIBONACCI_VKEY_HASH: &str =
"0x0054c0e58911dd8b993c6d8f249aa50a2e523114ec4b7ef9dd355c5f6bfbf3ce";
"0x007a04fa063e8b4a76f65e95923df3319e13e2187c0543368aeb372609555f83";

/// The instruction data for the program.
#[derive(BorshDeserialize, BorshSerialize)]
Expand All @@ -39,7 +36,7 @@ pub fn process_instruction(
.map_err(|_| ProgramError::InvalidInstructionData)?;

// Get the SP1 Groth16 verification key from the `sp1-solana` crate.
let vk = sp1_solana::GROTH16_VK_2_0_0_BYTES;
let vk = sp1_solana::GROTH16_VK_3_0_0_BYTES;

// Verify the proof.
verify_proof(
Expand Down
Loading