feat: versioned execution

.gitignore

@@ -16,3 +16,4 @@ images/**/manifest.json
 stark
 MyLogFile.log
 *_generated.rs
+.pnpm-store

Cargo.toml

@@ -46,6 +46,11 @@ risc0-circuit-recursion = { git = "https://github.com/anagrambuild/risc0", branc
 risc0-sys = { git = "https:m//github.com/anagrambuild/risc0", branch = "v1.0.1-bonsai-fix" }
 tokio-test = "0.4.3"
 
+bonsol-interface = { path = "./onchain/interface" }
+bonsol-schema = { path = "./schemas-rust" }
+bonsol-cli = { path = "./cli" }
+bonsol-sdk = { path = "./sdk" }
+
 [workspace.lints.clippy]
 clone_on_ref_ptr = "deny"
 missing_const_for_fn = "deny"

cli/Cargo.toml

@@ -44,3 +44,5 @@ solana-rpc-client = { workspace = true }
 solana-sdk = { workspace = true }
 tera = "1.17.1"
 tokio = { version = "1.38.0", features = ["full"] }
+
+bonsol-interface.workspace = true

cli/src/execute.rs

@@ -171,7 +171,6 @@ pub async fn execute(
     println!("Execution expiry {}", expiry);
     println!("current block {}", current_block);
     indicator.set_message("Building transaction");
-
     let ixs = sdk
         .execute_v1(
             &signer,
@@ -190,6 +189,7 @@ pub async fn execute(
             expiry,
             execution_config,
             callback_config.map(|c| c.into()),
+            None, // A future cli change can implement prover version selection
         )
         .await?;
     indicator.finish_with_message("Sending transaction");

docs/docs/contributing/contributing.mdx

@@ -70,7 +70,7 @@ cargo run -p bonsol-cli build -z images/simple
 ```
 5. Use the bonsol cli to deploy a zkprogram (here is a example already uploaded for you)
 ```bash
-cargo run -p bonsol-cli deploy -m images/simple/manifest.json -t url --url https://bonsol-public-images.s3.amazonaws.com/simple-68f4b0c5f9ce034aa60ceb264a18d6c410a3af68fafd931bcfd9ebe7c1e42960
+cargo run -p bonsol-cli deploy -m images/simple/manifest.json -t url --url https://bonsol-public-images.s3.us-east-1.amazonaws.com/simple-68f4b0c5f9ce034aa60ceb264a18d6c410a3af68fafd931bcfd9ebe7c1e42960
 ```
 6. Use the bonsol cli to execute a zkprogram
 ```bash

node/Cargo.toml

@@ -21,7 +21,6 @@ ark-relations = { version = "0.4.0" }
 ark-serialize = "0.4.0"
 ark-std = { version = "0.4.0" }
 async-trait = "0.1.80"
-bonsol-interface = { path = "../onchain/interface" }
 bonsol-prover = { path = "../prover" }
 bytemuck = "1.15.0"
 byteorder = "1.5.0"
@@ -81,6 +80,8 @@ tracing-subscriber = { version = "0.3.18", features = [
 yellowstone-grpc-client = { workspace = true }
 yellowstone-grpc-proto = { workspace = true }
 
+bonsol-interface.workspace = true
+
 [dev-dependencies]
 expect-test = "1.5.0"
 

node/src/main.rs

@@ -19,7 +19,7 @@ use {
     rlimit::Resource,
     solana_rpc_client::nonblocking::rpc_client::RpcClient,
     solana_sdk::{pubkey::Pubkey, signature::read_keypair_file, signer::Signer},
-    std::{path::Path, str::FromStr, sync::Arc},
+    std::{str::FromStr, sync::Arc},
     thiserror::Error,
     tokio::{select, signal},
     tracing::{error, info},

node/src/observe/mod.rs

@@ -26,6 +26,7 @@ pub enum MetricEvents {
     ProofSegments,
     BonsolStartup,
     SignaturesInFlight,
+    IncompatibleProverVersion,
 }
 
 macro_rules! emit_event {

node/src/prover/mod.rs

@@ -1,4 +1,6 @@
 mod utils;
+pub mod verify_prover_version;
+
 use {solana_sdk::instruction::AccountMeta, utils::check_stark_compression_tools_path};
 
 use {
@@ -9,7 +11,10 @@ use {
         prover::utils::async_to_json,
         MissingImageStrategy,
     },
-    bonsol_interface::bonsol_schema::{ClaimV1, DeployV1, ExecutionRequestV1},
+    bonsol_interface::{
+        bonsol_schema::{ClaimV1, DeployV1, ExecutionRequestV1},
+        prover_version::{ProverVersion, VERSION_V1_0_1},
+    },
     dashmap::DashMap,
     risc0_binfmt::MemoryImage,
     risc0_zkvm::{ExitCode, Journal, SuccinctReceipt},
@@ -46,9 +51,13 @@ use {
     tokio::{
         fs::File, io::AsyncReadExt, process::Command, sync::mpsc::UnboundedSender, task::JoinHandle,
     },
-    tracing::{error, info},
+    tracing::{error, info, warn},
 };
 
+use verify_prover_version::verify_prover_version;
+
+const REQUIRED_PROVER: ProverVersion = VERSION_V1_0_1;
+
 #[derive(Debug, Error)]
 pub enum Risc0RunnerError {
     #[error("Empty instruction")]
@@ -143,6 +152,8 @@ impl Risc0Runner {
     // Break into Image handling, Input handling, Execution Request
     // Inputs and Image should be service used by this prover.
     pub fn start(&mut self) -> Result<UnboundedSender<BonsolInstruction>> {
+        verify_prover_version(REQUIRED_PROVER)
+            .expect("Bonsol build conflict: prover version is not supported");
         let (tx, mut rx) = tokio::sync::mpsc::unbounded_channel::<BonsolInstruction>();
         let loaded_images = self.loaded_images.clone();
         // TODO: move image handling out of prover
@@ -402,6 +413,15 @@ async fn handle_execution_request<'a>(
     exec: ExecutionRequestV1<'a>,
     accounts: &[Pubkey],
 ) -> Result<()> {
+    if !can_execute(exec) {
+        warn!(
+            "Execution request for incompatible prover version: {:?}",
+            exec.prover_version()
+        );
+        emit_event!(MetricEvents::IncompatibleProverVersion, execution_id => exec.execution_id().unwrap_or_default());
+        return Ok(());
+    }
+
     // current naive implementation is to accept everything we have pending capacity for on this node, but this needs work
     let inflight = in_flight_proofs.len();
     emit_event!(MetricEvents::ExecutionRequest, execution_id => exec.execution_id().unwrap_or_default());
@@ -685,3 +705,16 @@ async fn risc0_compress_proof(
         Err(Risc0RunnerError::ProofCompressionError.into())
     }
 }
+
+fn can_execute(exec: ExecutionRequestV1) -> bool {
+    let version = exec.prover_version().try_into();
+    if version.is_ok() {
+        let is_matching = match version.unwrap() {
+            REQUIRED_PROVER => true,
+            _ => false,
+        };
+        is_matching
+    } else {
+        false
+    }
+}

node/src/prover/verify_prover_version.rs

@@ -0,0 +1,54 @@
+use {anyhow::Result, tracing::info};
+
+use risc0_zkvm::{sha::Digestible, Groth16ReceiptVerifierParameters};
+
+use bonsol_interface::prover_version::ProverVersion;
+
+pub fn verify_prover_version(required: ProverVersion) -> Result<()> {
+    let actual_digest = Groth16ReceiptVerifierParameters::default().digest();
+    let prover_digest = actual_digest.to_string();
+
+    match required {
+        ProverVersion::V1_0_1 {
+            verifier_digest, ..
+        } => {
+            if verifier_digest != prover_digest {
+                return Err(anyhow::anyhow!(
+                    "Prover version mismatch, expected: {}, got: {}",
+                    verifier_digest,
+                    prover_digest
+                ));
+            }
+            info!("Risc0 Prover with digest {}", verifier_digest);
+        }
+        _ => {
+            return Err(anyhow::anyhow!("Unsupported prover version"));
+        }
+    }
+    Ok(())
+}
+
+#[cfg(test)]
+mod tests {
+    use {super::*, bonsol_interface::prover_version::VERSION_V1_0_1};
+
+    #[test]
+    fn test_verify_prover_version() {
+        assert!(verify_prover_version(VERSION_V1_0_1).is_ok());
+    }
+
+    #[test]
+    fn test_verify_prover_version_fail() {
+        let version_malade = ProverVersion::V1_0_1 {
+            verifier_digest: "malade",
+        };
+        let result = verify_prover_version(version_malade);
+        assert!(result.is_err());
+    }
+
+    #[test]
+    fn test_verify_default_prover_version_is_supported() {
+        let result = verify_prover_version(ProverVersion::default());
+        assert!(result.is_ok());
+    }
+}

onchain/example-program-on-bonsol/src/lib.rs

@@ -88,6 +88,7 @@ fn main<'a>(
                         AccountMeta::new_readonly(EA3, false),
                     ],
                 }),
+                None,
             )
             .map_err(|_| ProgramError::InvalidInstructionData)?;
             invoke_signed(&ix, accounts, &[&[execution_id.as_bytes(), &[bump]]])?;

onchain/interface/Cargo.toml

@@ -12,7 +12,7 @@ idl-build = ["anchor-lang/idl-build"]
 
 [dependencies]
 arrayref = "0.3.6"
-bonsol-schema = { path = "../../schemas-rust", version = "0.2.1" }
+base64 = "0.21.2"
 bytemuck = { version = "1.15.0", features = ["derive"] }
 flatbuffers = { workspace = true }
 hex = "0.4.3"
@@ -23,6 +23,8 @@ solana-program = { workspace = true, optional = true }
 solana-sdk = { workspace = true, optional = true }
 thiserror = { workspace = true }
 
+bonsol-schema.workspace = true
+
 [dependencies.anchor-lang]
 optional = true
 version = ">=0.28"

onchain/interface/src/instructions.rs

@@ -1,7 +1,7 @@
 use bonsol_schema::{
     Account, ChannelInstruction, ChannelInstructionArgs, ChannelInstructionIxType, DeployV1,
     DeployV1Args, ExecutionRequestV1, ExecutionRequestV1Args, InputBuilder, InputT, InputType,
-    ProgramInputType,
+    ProgramInputType, ProverVersion,
 };
 use flatbuffers::{FlatBufferBuilder, WIPOffset};
 
@@ -220,6 +220,7 @@ pub fn execute_v1<'a>(
     expiration: u64,
     config: ExecutionConfig<'a>,
     callback: Option<CallbackConfig>,
+    prover_version: Option<ProverVersion>,
 ) -> Result<Instruction, ClientError> {
     let (execution_account, _) = execution_address(requester, execution_id.as_bytes());
     let (deployment_account, _) = deployment_address(image_id);
@@ -235,6 +236,7 @@ pub fn execute_v1<'a>(
         expiration,
         config,
         callback,
+        prover_version,
     )
 }
 /// Executes a bonsol program with the provided accounts
@@ -252,6 +254,7 @@ pub fn execute_v1_with_accounts<'a>(
     expiration: u64,
     config: ExecutionConfig,
     callback: Option<CallbackConfig>,
+    prover_version: Option<ProverVersion>,
 ) -> Result<Instruction, ClientError> {
     config.validate()?;
     let mut fbb = FlatBufferBuilder::new();
@@ -318,6 +321,10 @@ pub fn execute_v1_with_accounts<'a>(
     } else {
         None
     };
+
+    // typically cli will pass None for the optional prover_version indicating bonsol should handle
+    // the default case here
+    let prover_version = prover_version.unwrap_or(ProverVersion::default());
     let fbb_execute = ExecutionRequestV1::create(
         &mut fbb,
         &ExecutionRequestV1Args {
@@ -332,6 +339,7 @@ pub fn execute_v1_with_accounts<'a>(
             max_block_height: expiration,
             input_digest,
             callback_extra_accounts: extra_accounts,
+            prover_version: prover_version,
         },
     );
     fbb.finish(fbb_execute, None);

onchain/interface/src/lib.rs

@@ -5,6 +5,7 @@ pub mod callback;
 pub mod claim_state;
 pub mod error;
 pub mod instructions;
+pub mod prover_version;
 pub mod util;
 
 pub use bonsol_schema;