Charms v0.8.0

Update to
- SP1 v5.1.0
- protocol version 6
- Rust 1.88

Author: imikushin

Cargo.lock

@@ -9,8 +9,8 @@ edition.workspace = true
 license.workspace = true
 
 [workspace.package]
-version = "0.7.0"
-edition = "2021"
+version = "0.8.0"
+edition = "2024"
 authors = ["Ivan Mikushin <ivan@charms.dev>"]
 license = "MIT"
 
@@ -21,17 +21,17 @@ axum-macros = { version = "0.5.0" }
 bincode = { version = "1.3.3" }
 bitcoin = { workspace = true, features = ["rand", "rand-std"] }
 bitcoincore-rpc = { version = "0.19.0" }
-charms-app-runner = { path = "./charms-app-runner", version = "0.7.0" }
-charms-client = { path = "./charms-client", version = "0.7.0" }
-charms-data = { path = "./charms-data", version = "0.7.0" }
-clap = { version = "4.5.40", features = ["derive"] }
-clap_complete = { version = "4.5.54" }
+charms-app-runner = { path = "./charms-app-runner", version = "0.8.0" }
+charms-client = { path = "./charms-client", version = "0.8.0" }
+charms-data = { path = "./charms-data", version = "0.8.0" }
+clap = { version = "4.5.41", features = ["derive"] }
+clap_complete = { version = "4.5.55" }
 cml-chain = { workspace = true }
 hex = { workspace = true }
-reqwest = { version = "0.12.20", features = ["json"] }
+reqwest = { version = "0.12.22", features = ["json"] }
 serde = { workspace = true, features = ["derive"] }
 serde_json = { workspace = true }
-serde_with = { version = "3.13.0", features = ["base64"] }
+serde_with = { version = "3.14.0", features = ["base64"] }
 serde_yaml = { workspace = true }
 sha2 = { workspace = true }
 sp1-core-executor = { workspace = true }
@@ -40,7 +40,7 @@ sp1-cuda = { workspace = true }
 sp1-primitives = { workspace = true }
 sp1-prover = { workspace = true }
 sp1-sdk = { workspace = true }
-tokio = { version = "1.45", features = ["full"] }
+tokio = { version = "1.47", features = ["full"] }
 toml = { version = "0.8.23" }
 tower-http = { version = "0.6.6", features = ["cors"] }
 tracing = { workspace = true }
@@ -66,7 +66,7 @@ members = [
     "charms-spell-checker",
 ]
 
-resolver = "2"
+resolver = "3"
 
 [workspace.dependencies]
 anyhow = { version = "1.0.98" }
@@ -78,17 +78,17 @@ hex = { version = "0.4.3" }
 proptest = { version = "1.7.0" }
 proptest-derive = { version = "0.5.1" }
 serde = { version = "1.0" }
-serde_json = { version = "1.0.140" }
+serde_json = { version = "1.0.141" }
 serde_yaml = { version = "0.9.34" }
-sha2 = { version = "0.10.8" }
-sp1-core-executor = { version = "5.0.5" }
-sp1-core-machine = { version = "5.0.5" }
-sp1-cuda = { version = "5.0.5" }
-sp1-primitives = { version = "5.0.5" }
-sp1-prover = { version = "5.0.5" }
-sp1-sdk = { version = "5.0.6" }
-sp1-verifier = { version = "5.0.5" }
-sp1-zkvm = { version = "5.0.5" }
+sha2 = { version = "0.10.9" }
+sp1-core-executor = { version = "5.1.0" }
+sp1-core-machine = { version = "5.1.0" }
+sp1-cuda = { version = "5.1.0" }
+sp1-primitives = { version = "5.1.0" }
+sp1-prover = { version = "5.1.0" }
+sp1-sdk = { version = "5.1.0" }
+sp1-verifier = { version = "5.1.0" }
+sp1-zkvm = { version = "5.1.0" }
 test-strategy = { version = "0.4.3" }
 tracing = { version = "0.1" }
 
@@ -103,5 +103,4 @@ strip = "debuginfo"
 
 [patch.crates-io]
 secp256k1 = { git = "https://github.com/sp1-patches/rust-secp256k1", tag = "patch-0.29.1-sp1-5.0.0" }
-sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.8-sp1-4.0.0" }
-wasmi = { git = "https://github.com/imikushin/wasmi", branch = "rust-1.85" }
+sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.9-sp1-4.0.0" }

Cargo.toml

@@ -7,9 +7,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-charms-app-runner = { path = "../charms-app-runner", version = "0.7.0" }
-charms-data = { path = "../charms-data", version = "0.7.0" }
-charms-client = { path = "../charms-client", version = "0.7.0" }
-serde = { workspace = true, features = ["derive"] }
-sp1-primitives = { workspace = true }
-sp1-zkvm = { workspace = true, features = ["verify"] }
+charms-app-runner = { path = "../charms-app-runner", version = "0.8.0" }
+charms-data = { path = "../charms-data", version = "0.8.0" }
+sp1-zkvm = { workspace = true }

charms-app-checker/Cargo.toml

@@ -1,4 +1,4 @@
-use charms_client::{AppProverInput, AppProverOutput};
+use charms_app_runner::{AppProverInput, AppProverOutput};
 use charms_data::util;
 
 pub fn main() {

charms-app-checker/src/bin.rs

@@ -9,6 +9,7 @@ license.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
-charms-data = { path = "../charms-data", version = "0.7.0" }
+charms-data = { path = "../charms-data", version = "0.8.0" }
+serde = { workspace = true, features = ["derive"] }
 sha2 = { workspace = true }
 wasmi = { version = "0.48.0", default-features = false, features = ["std", "prefer-btree-collections"] }

charms-app-runner/Cargo.toml

@@ -1,5 +1,6 @@
-use anyhow::{bail, ensure, Result};
-use charms_data::{is_simple_transfer, util, App, Data, Transaction, B32};
+use anyhow::{Result, bail, ensure};
+use charms_data::{App, B32, Data, Transaction, is_simple_transfer, util};
+use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::{
     collections::BTreeMap,
@@ -8,6 +9,21 @@ use std::{
 };
 use wasmi::{Caller, Config, Engine, Extern, Linker, Memory, Module, Store};
 
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct AppProverInput {
+    pub app_binaries: BTreeMap<B32, Vec<u8>>,
+    pub tx: Transaction,
+    pub app_public_inputs: BTreeMap<App, Data>,
+    pub app_private_inputs: BTreeMap<App, Data>,
+}
+
+#[derive(Clone, Debug, Serialize, Deserialize)]
+pub struct AppProverOutput {
+    pub tx: Transaction,
+    pub app_public_inputs: BTreeMap<App, Data>,
+    pub cycles: Vec<u64>,
+}
+
 #[derive(Clone)]
 pub struct AppRunner {
     pub engine: Engine,

charms-app-runner/src/lib.rs

@@ -10,17 +10,18 @@ license.workspace = true
 [dependencies]
 anyhow = { workspace = true }
 bitcoin = { workspace = true, features = ["serde"] }
-charms-data = { path = "../charms-data", version = "0.7.0" }
+charms-app-runner = { path = "../charms-app-runner", version = "0.8.0" }
+charms-data = { path = "../charms-data", version = "0.8.0" }
 cml-chain = { workspace = true }
 enum_dispatch = { version = "0.3.13" }
 hex = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
-serde_with = { version = "3.13.0" }
+serde_with = { version = "3.14.0" }
 sha2 = { workspace = true }
 sp1-primitives = { workspace = true }
 sp1-verifier = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
 ciborium = { version = "0.2.2" }
-serde_json = { version = "1.0.140" }
+serde_json = { version = "1.0.141" }

charms-client/Cargo.toml

@@ -1,15 +1,17 @@
-use crate::tx::{extract_and_verify_spell, EnchantedTx, Tx};
-use charms_data::{check, App, Charms, Data, Transaction, TxId, UtxoId, B32};
+use crate::tx::{EnchantedTx, Tx, extract_and_verify_spell};
+use charms_data::{App, B32, Charms, Data, Transaction, TxId, UtxoId, check};
 use serde::{Deserialize, Serialize};
 use sha2::{Digest, Sha256};
 use std::collections::{BTreeMap, BTreeSet};
 
+pub use charms_app_runner::{AppProverInput, AppProverOutput};
+
 pub mod bitcoin_tx;
 pub mod cardano_tx;
 pub mod tx;
 
 pub const APP_VK: [u32; 8] = [
-    487454586, 357291639, 225001263, 1885191303, 293126599, 491099374, 3759322, 1460462146,
+    773139792, 1871461666, 1172442063, 346922495, 1779450904, 263758648, 121652725, 113479979,
 ];
 
 /// Verification key for version `0` of the protocol implemented by `charms-spell-checker` binary.
@@ -22,6 +24,8 @@ pub const V2_SPELL_VK: &str = "0x00bd312b6026dbe4a2c16da1e8118d4fea31587a4b572b6
 pub const V3_SPELL_VK: &str = "0x0034872b5af38c95fe82fada696b09a448f7ab0928273b7ac8c58ba29db774b9";
 /// Verification key for version `4` of the protocol implemented by `charms-spell-checker` binary.
 pub const V4_SPELL_VK: &str = "0x00c707a155bf8dc18dc41db2994c214e93e906a3e97b4581db4345b3edd837c5";
+/// Verification key for version `5` of the protocol implemented by `charms-spell-checker` binary.
+pub const V5_SPELL_VK: &str = "0x00e98665c417bd2e6e81c449af63b26ed5ad5c400ef55811b592450bf62c67cd";
 
 /// Version `0` of the protocol.
 pub const V0: u32 = 0u32;
@@ -35,9 +39,11 @@ pub const V3: u32 = 3u32;
 pub const V4: u32 = 4u32;
 /// Version `5` of the protocol.
 pub const V5: u32 = 5u32;
+/// Version `6` of the protocol.
+pub const V6: u32 = 6u32;
 
 /// Current version of the protocol.
-pub const CURRENT_VERSION: u32 = V5;
+pub const CURRENT_VERSION: u32 = V6;
 
 /// Maps the index of the charm's app (in [`NormalizedSpell`].`app_public_inputs`) to the charm's
 /// data.
@@ -270,21 +276,6 @@ pub struct SpellProverInput {
     pub app_prover_output: Option<AppProverOutput>, // proof is provided in input stream data
 }
 
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AppProverInput {
-    pub app_binaries: BTreeMap<B32, Vec<u8>>,
-    pub tx: Transaction,
-    pub app_public_inputs: BTreeMap<App, Data>,
-    pub app_private_inputs: BTreeMap<App, Data>,
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct AppProverOutput {
-    pub tx: Transaction,
-    pub app_public_inputs: BTreeMap<App, Data>,
-    pub cycles: Vec<u64>,
-}
-
 #[cfg(test)]
 mod test {
     #[test]

charms-client/src/lib.rs

@@ -1,12 +1,12 @@
 use crate::{
-    bitcoin_tx::BitcoinTx, cardano_tx::CardanoTx, NormalizedSpell, CURRENT_VERSION, V0,
-    V0_SPELL_VK, V1, V1_SPELL_VK, V2, V2_SPELL_VK, V3, V3_SPELL_VK, V4, V4_SPELL_VK,
+    CURRENT_VERSION, NormalizedSpell, V0, V0_SPELL_VK, V1, V1_SPELL_VK, V2, V2_SPELL_VK, V3,
+    V3_SPELL_VK, V4, V4_SPELL_VK, V5, V5_SPELL_VK, bitcoin_tx::BitcoinTx, cardano_tx::CardanoTx,
 };
 use anyhow::bail;
-use charms_data::{util, TxId};
+use charms_data::{TxId, util};
 use enum_dispatch::enum_dispatch;
 use serde::{Deserialize, Serialize};
-use serde_with::{serde_as, IfIsHumanReadable};
+use serde_with::{IfIsHumanReadable, serde_as};
 use sp1_primitives::io::SP1PublicValues;
 
 #[enum_dispatch]
@@ -72,6 +72,7 @@ pub fn extract_and_verify_spell(spell_vk: &str, tx: &Tx) -> anyhow::Result<Norma
 pub fn vks(spell_version: u32, spell_vk: &str) -> anyhow::Result<(&str, &[u8])> {
     match spell_version {
         CURRENT_VERSION => Ok((spell_vk, CURRENT_GROTH16_VK_BYTES)),
+        V5 => Ok((V5_SPELL_VK, V5_GROTH16_VK_BYTES)),
         V4 => Ok((V4_SPELL_VK, V4_GROTH16_VK_BYTES)),
         V3 => Ok((V3_SPELL_VK, V3_GROTH16_VK_BYTES)),
         V2 => Ok((V2_SPELL_VK, V2_GROTH16_VK_BYTES)),
@@ -87,12 +88,13 @@ pub const V2_GROTH16_VK_BYTES: &'static [u8] = V1_GROTH16_VK_BYTES;
 pub const V3_GROTH16_VK_BYTES: &'static [u8] = V1_GROTH16_VK_BYTES;
 pub const V4_GROTH16_VK_BYTES: &'static [u8] = include_bytes!("../vk/v4/groth16_vk.bin");
 pub const V5_GROTH16_VK_BYTES: &'static [u8] = V4_GROTH16_VK_BYTES;
-pub const CURRENT_GROTH16_VK_BYTES: &'static [u8] = V5_GROTH16_VK_BYTES;
+pub const V6_GROTH16_VK_BYTES: &'static [u8] = V5_GROTH16_VK_BYTES;
+pub const CURRENT_GROTH16_VK_BYTES: &'static [u8] = V6_GROTH16_VK_BYTES;
 
 pub fn to_sp1_pv<T: Serialize>(spell_version: u32, t: &T) -> SP1PublicValues {
     let mut pv = SP1PublicValues::new();
     match spell_version {
-        CURRENT_VERSION | V4 | V3 | V2 | V1 => {
+        CURRENT_VERSION | V5 | V4 | V3 | V2 | V1 => {
             // we commit to CBOR-encoded tuple `(spell_vk, n_spell)`
             pv.write_slice(util::write(t).unwrap().as_slice());
         }

charms-client/src/tx.rs

@@ -8,4 +8,4 @@ authors.workspace = true
 license.workspace = true
 
 [dependencies]
-charms-data = { path = "../charms-data", version = "0.7.0" }
+charms-data = { path = "../charms-data", version = "0.8.0" }