From 62160444c1619e4a25e06bcab382436172eb7085 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Fri, 5 Apr 2024 11:32:30 +0900 Subject: [PATCH 1/2] add `programs` moduel in zk-token-sdk --- zk-token-sdk/src/lib.rs | 2 +- zk-token-sdk/src/programs/mod.rs | 1 + zk-token-sdk/src/programs/state.rs | 79 ++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 1 deletion(-) create mode 100644 zk-token-sdk/src/programs/mod.rs create mode 100644 zk-token-sdk/src/programs/state.rs diff --git a/zk-token-sdk/src/lib.rs b/zk-token-sdk/src/lib.rs index f66850e382275c..26e084be467377 100644 --- a/zk-token-sdk/src/lib.rs +++ b/zk-token-sdk/src/lib.rs @@ -31,9 +31,9 @@ mod sigma_proofs; #[cfg(not(target_os = "solana"))] mod transcript; -// TODO: re-organize visibility pub mod curve25519; pub mod instruction; +pub mod programs; pub mod zk_token_elgamal; pub mod zk_token_proof_instruction; pub mod zk_token_proof_program; diff --git a/zk-token-sdk/src/programs/mod.rs b/zk-token-sdk/src/programs/mod.rs new file mode 100644 index 00000000000000..266c62acc7083e --- /dev/null +++ b/zk-token-sdk/src/programs/mod.rs @@ -0,0 +1 @@ +pub mod state; diff --git a/zk-token-sdk/src/programs/state.rs b/zk-token-sdk/src/programs/state.rs new file mode 100644 index 00000000000000..e933734d41461e --- /dev/null +++ b/zk-token-sdk/src/programs/state.rs @@ -0,0 +1,79 @@ +use { + crate::{zk_token_elgamal::pod::PodProofType, zk_token_proof_instruction::ProofType}, + bytemuck::{bytes_of, Pod, Zeroable}, + num_traits::ToPrimitive, + solana_program::{ + instruction::{InstructionError, InstructionError::InvalidAccountData}, + pubkey::Pubkey, + }, + std::mem::size_of, +}; + +/// The context state account addresses intended to be used as parameters to functions +#[derive(Clone, Copy, Debug, PartialEq)] +pub struct ContextStateInfo<'a> { + pub context_state_account: &'a Pubkey, + pub context_state_authority: &'a Pubkey, +} + +/// The proof context account state +#[derive(Clone, Copy, Debug, PartialEq)] +#[repr(C)] +pub struct ProofContextState { + /// The proof context authority that can close the account + pub context_state_authority: Pubkey, + /// The proof type for the context data + pub proof_type: PodProofType, + /// The proof context data + pub proof_context: T, +} + +// `bytemuck::Pod` cannot be derived for generic structs unless the struct is marked +// `repr(packed)`, which may cause unnecessary complications when referencing its fields. Directly +// mark `ProofContextState` as `Zeroable` and `Pod` since since none of its fields has an alignment +// requirement greater than 1 and therefore, guaranteed to be `packed`. +unsafe impl Zeroable for ProofContextState {} +unsafe impl Pod for ProofContextState {} + +impl ProofContextState { + pub fn encode( + context_state_authority: &Pubkey, + proof_type: ProofType, + proof_context: &T, + ) -> Vec { + let mut buf = Vec::with_capacity(size_of::()); + buf.extend_from_slice(context_state_authority.as_ref()); + buf.push(ToPrimitive::to_u8(&proof_type).unwrap()); + buf.extend_from_slice(bytes_of(proof_context)); + buf + } + + /// Interpret a slice as a `ProofContextState`. + /// + /// This function requires a generic parameter. To access only the generic-independent fields + /// in `ProofContextState` without a generic parameter, use + /// `ProofContextStateMeta::try_from_bytes` instead. + pub fn try_from_bytes(input: &[u8]) -> Result<&Self, InstructionError> { + bytemuck::try_from_bytes(input).map_err(|_| InvalidAccountData) + } +} + +/// The `ProofContextState` without the proof context itself. This struct exists to facilitate the +/// decoding of generic-independent fields in `ProofContextState`. +#[derive(Clone, Copy, Debug, PartialEq, Pod, Zeroable)] +#[repr(C)] +pub struct ProofContextStateMeta { + /// The proof context authority that can close the account + pub context_state_authority: Pubkey, + /// The proof type for the context data + pub proof_type: PodProofType, +} + +impl ProofContextStateMeta { + pub fn try_from_bytes(input: &[u8]) -> Result<&Self, InstructionError> { + input + .get(..size_of::()) + .and_then(|data| bytemuck::try_from_bytes(data).ok()) + .ok_or(InvalidAccountData) + } +} From d2a9866eacd13cda356f73c3977852070f538fe9 Mon Sep 17 00:00:00 2001 From: samkim-crypto Date: Fri, 5 Apr 2024 16:59:46 +0900 Subject: [PATCH 2/2] add sigma proof instructions --- zk-token-sdk/src/programs/mod.rs | 1 + .../src/programs/sigma_proof/instruction.rs | 138 ++++++++++++++++++ zk-token-sdk/src/programs/sigma_proof/mod.rs | 6 + 3 files changed, 145 insertions(+) create mode 100644 zk-token-sdk/src/programs/sigma_proof/instruction.rs create mode 100644 zk-token-sdk/src/programs/sigma_proof/mod.rs diff --git a/zk-token-sdk/src/programs/mod.rs b/zk-token-sdk/src/programs/mod.rs index 266c62acc7083e..f90c3ec5b6913a 100644 --- a/zk-token-sdk/src/programs/mod.rs +++ b/zk-token-sdk/src/programs/mod.rs @@ -1 +1,2 @@ +pub mod sigma_proof; pub mod state; diff --git a/zk-token-sdk/src/programs/sigma_proof/instruction.rs b/zk-token-sdk/src/programs/sigma_proof/instruction.rs new file mode 100644 index 00000000000000..15b286e4ffc290 --- /dev/null +++ b/zk-token-sdk/src/programs/sigma_proof/instruction.rs @@ -0,0 +1,138 @@ +use { + crate::{ + instruction::{Pod, ZkProofData}, + programs::{sigma_proof::id, state::ContextStateInfo}, + }, + bytemuck::bytes_of, + num_derive::{FromPrimitive, ToPrimitive}, + num_traits::{FromPrimitive, ToPrimitive}, + solana_program::{ + instruction::{AccountMeta, Instruction}, + pubkey::Pubkey, + }, +}; + +#[derive(Clone, Copy, Debug, FromPrimitive, ToPrimitive, PartialEq, Eq)] +#[repr(u8)] +pub enum SigmaProofInstruction { + /// Close a zero-knowledge proof context state. + /// + /// Accounts expected by this instruction: + /// 0. `[writable]` The proof context account to close + /// 1. `[writable]` The destination account for lamports + /// 2. `[signer]` The context account's owner + /// + /// Data expected by this instruction: + /// None + /// + CloseContextState, + + /// Verify a public key validity zero-knowledge proof. + /// + /// A public key validity proof certifies that an ElGamal public key is well-formed and the + /// prover knows the corresponding secret key. + /// + /// Accounts expected by this instruction: + /// + /// 0. `[]` (Optional) Account to read the proof from + /// 1. `[writable]` (Optional) The proof context account + /// 2. `[]` (Optional) The proof context account owner + /// + /// The instruction expects either: + /// i. `PubkeyValidityData` if proof is provided as instruction data + /// ii. `u32` byte offset if proof is provided as an account + /// + VerifyPubkeyValidity, +} + +/// Create a `CloseContextState` instruction. +pub fn close_context_state( + context_state_info: ContextStateInfo, + destination_account: &Pubkey, +) -> Instruction { + let accounts = vec![ + AccountMeta::new(*context_state_info.context_state_account, false), + AccountMeta::new(*destination_account, false), + AccountMeta::new_readonly(*context_state_info.context_state_authority, true), + ]; + + let data = vec![ToPrimitive::to_u8(&SigmaProofInstruction::CloseContextState).unwrap()]; + + Instruction { + program_id: id(), + accounts, + data, + } +} + +impl SigmaProofInstruction { + pub fn encode_verify_proof( + &self, + context_state_info: Option, + proof_data: &T, + ) -> Instruction + where + T: Pod + ZkProofData, + U: Pod, + { + let accounts = if let Some(context_state_info) = context_state_info { + vec![ + AccountMeta::new(*context_state_info.context_state_account, false), + AccountMeta::new_readonly(*context_state_info.context_state_authority, false), + ] + } else { + vec![] + }; + + let mut data = vec![ToPrimitive::to_u8(self).unwrap()]; + data.extend_from_slice(bytes_of(proof_data)); + + Instruction { + program_id: id(), + accounts, + data, + } + } + + pub fn encode_verify_proof_from_account( + &self, + context_state_info: Option, + proof_account: &Pubkey, + offset: u32, + ) -> Instruction { + let accounts = if let Some(context_state_info) = context_state_info { + vec![ + AccountMeta::new(*proof_account, false), + AccountMeta::new(*context_state_info.context_state_account, false), + AccountMeta::new_readonly(*context_state_info.context_state_authority, false), + ] + } else { + vec![AccountMeta::new(*proof_account, false)] + }; + + let mut data = vec![ToPrimitive::to_u8(self).unwrap()]; + data.extend_from_slice(&offset.to_le_bytes()); + + Instruction { + program_id: id(), + accounts, + data, + } + } + + pub fn instruction_type(input: &[u8]) -> Option { + input + .first() + .and_then(|instruction| FromPrimitive::from_u8(*instruction)) + } + + pub fn proof_data(input: &[u8]) -> Option<&T> + where + T: Pod + ZkProofData, + U: Pod, + { + input + .get(1..) + .and_then(|data| bytemuck::try_from_bytes(data).ok()) + } +} diff --git a/zk-token-sdk/src/programs/sigma_proof/mod.rs b/zk-token-sdk/src/programs/sigma_proof/mod.rs new file mode 100644 index 00000000000000..2d9d44a998ad30 --- /dev/null +++ b/zk-token-sdk/src/programs/sigma_proof/mod.rs @@ -0,0 +1,6 @@ +//! The Sigma Proof program. + +pub mod instruction; + +// Program Id of the Sigma Proof program +solana_program::declare_id!("SigmaProof111111111111111111111111111111111");