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

support proof recorder in host merkle #246

Open
wants to merge 1 commit into
base: host-ops-1.7
Choose a base branch
from
Open

support proof recorder in host merkle #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ halo2_proofs = { git = "https://github.com/DelphinusLab/halo2-gpu-specific.git",
parity-wasm = { version = "0.42.0", features = ["sign_ext"] }
wasmi = { path = "third-party/wasmi" }
circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher.git" }
zkwasm-host-circuits = { git = "https://github.com/DelphinusLab/zkWasm-host-circuits.git" }
zkwasm-host-circuits = { git = "https://github.com/DelphinusLab/zkWasm-host-circuits.git", branch="synthesize-helper" }

[profile.dev]
opt-level = 3
2 changes: 2 additions & 0 deletions crates/cli/src/app_builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ pub trait AppBuilder: CommandBuilder {
context_outputs: context_output.clone(),
indexed_witness: Rc::new(RefCell::new(HashMap::new())),
tree_db: None,
merkle_proof_recorder: None,
},
HostEnvConfig::default(),
)?;
Expand Down Expand Up @@ -255,6 +256,7 @@ pub trait AppBuilder: CommandBuilder {
context_outputs: context_out.clone(),
indexed_witness: Rc::new(RefCell::new(HashMap::new())),
tree_db: None,
merkle_proof_recorder: None,
},
HostEnvConfig::default(),
)?;
Expand Down
8 changes: 4 additions & 4 deletions crates/cli/test_cli.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ rm -rf params/*.data
rm -rf output/*.data

# Single test
RUST_LOG=info cargo run --release --features cuda -- --host default -k 18 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm setup
RUST_LOG=info cargo run --release --features cuda -- --host default -k 18 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm checksum
RUST_LOG=info cargo run --release --features cuda -- --host default -k 22 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm setup
RUST_LOG=info cargo run --release --features cuda -- --host default -k 22 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm checksum

RUST_LOG=info cargo run --release --features cuda -- --host default -k 18 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm single-prove --public 133:i64 --public 2:i64
RUST_LOG=info cargo run --release --features cuda -- --host default -k 18 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm single-verify
RUST_LOG=info cargo run --release --features cuda -- --host default -k 22 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm single-prove --public 133:i64 --public 2:i64
RUST_LOG=info cargo run --release --features cuda -- --host default -k 22 --function zkmain --param ./params --output ./output --wasm ../zkwasm/wasm/wasm_output.wasm single-verify
37 changes: 30 additions & 7 deletions crates/host/src/host/merkle_helper/merkle.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use delphinus_zkwasm::runtime::host::ForeignContext;
use delphinus_zkwasm::runtime::host::ForeignStatics;
use halo2_proofs::pairing::bn256::Fr;
use std::cell::RefCell;
use std::io::Write;
use std::rc::Rc;
use wasmi::tracer::Observer;
use zkwasm_host_circuits::circuits::host::HostOpSelector;
Expand All @@ -19,6 +20,7 @@ use zkwasm_host_circuits::host::ForeignInst::MerkleSet;
use zkwasm_host_circuits::host::ForeignInst::MerkleSetRoot;
use zkwasm_host_circuits::host::Reduce;
use zkwasm_host_circuits::host::ReduceRule;
use zkwasm_host_circuits::proof::write_merkle_proof;

const MERKLE_TREE_HEIGHT: usize = 32;

Expand All @@ -33,6 +35,7 @@ pub struct MerkleContext {
pub mongo_merkle: Option<merklehelper::MongoMerkle<MERKLE_TREE_HEIGHT>>,
pub mongo_datahash: datahelper::MongoDataHash,
pub tree_db: Option<Rc<RefCell<dyn TreeDB>>>,
pub proof_recorder: Option<Rc<RefCell<dyn Write>>>,
pub used_round: usize,
}

Expand All @@ -41,7 +44,10 @@ fn new_reduce(rules: Vec<ReduceRule<Fr>>) -> Reduce<Fr> {
}

impl MerkleContext {
pub fn new(tree_db: Option<Rc<RefCell<dyn TreeDB>>>) -> Self {
pub fn new(
tree_db: Option<Rc<RefCell<dyn TreeDB>>>,
proof_recorder: Option<Rc<RefCell<dyn Write>>>,
) -> Self {
MerkleContext {
set_root: new_reduce(vec![ReduceRule::Bytes(vec![], 4)]),
get_root: new_reduce(vec![ReduceRule::Bytes(vec![], 4)]),
Expand All @@ -53,6 +59,7 @@ impl MerkleContext {
mongo_merkle: None,
mongo_datahash: datahelper::MongoDataHash::construct([0; 32], tree_db.clone()),
tree_db,
proof_recorder,
used_round: 0,
}
}
Expand Down Expand Up @@ -112,8 +119,13 @@ impl MerkleContext {
.as_mut()
.expect("merkle db not initialized");
let hash = self.set.rules[0].bytes_value().unwrap();
mt.update_leaf_data_with_proof(index, &hash)
let proof = mt
.update_leaf_data_with_proof(index, &hash)
.expect("Unexpected failure: update leaf with proof fail");
self.proof_recorder.as_mut().map(|v| {
let mut writer = v.borrow_mut();
write_merkle_proof(&mut *writer, proof);
});
}
}

Expand All @@ -124,9 +136,15 @@ impl MerkleContext {
.mongo_merkle
.as_ref()
.expect("merkle db not initialized");
let (leaf, _) = mt
let (leaf, proof) = mt
.get_leaf_with_proof(index)
.expect("Unexpected failure: get leaf fail");

self.proof_recorder.as_mut().map(|v| {
let mut writer = v.borrow_mut();
write_merkle_proof(&mut *writer, proof);
});

let values = leaf.data_as_u64();
if self.data_cursor == 0 {
self.data = values;
Expand All @@ -149,10 +167,15 @@ impl ForeignContext for MerkleContext {
}

use specs::external_host_call_table::ExternalHostCallSignature;
pub fn register_merkle_foreign(env: &mut HostEnv, tree_db: Option<Rc<RefCell<dyn TreeDB>>>) {
let foreign_merkle_plugin = env
.external_env
.register_plugin("foreign_merkle", Box::new(MerkleContext::new(tree_db)));
pub fn register_merkle_foreign(
env: &mut HostEnv,
tree_db: Option<Rc<RefCell<dyn TreeDB>>>,
proof_recorder: Option<Rc<RefCell<dyn Write>>>,
) {
let foreign_merkle_plugin = env.external_env.register_plugin(
"foreign_merkle",
Box::new(MerkleContext::new(tree_db, proof_recorder)),
);

env.external_env.register_function(
"merkle_setroot",
Expand Down
20 changes: 16 additions & 4 deletions crates/host/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ use delphinus_zkwasm::runtime::host::HostEnvBuilder;
use serde::Deserialize;
use serde::Serialize;
use std::collections::HashMap;
use std::io::Write;
use std::sync::Arc;
use std::sync::Mutex;
use zkwasm_host_circuits::host::db::TreeDB;
Expand All @@ -32,6 +33,8 @@ pub struct ExecutionArg {
pub indexed_witness: Rc<RefCell<HashMap<u64, Vec<u64>>>>,
/// db src
pub tree_db: Option<Rc<RefCell<dyn TreeDB>>>,
/// merkle_proof_tracker:
pub merkle_proof_recorder: Option<Rc<RefCell<dyn Write>>>,
}

impl ContextOutput for ExecutionArg {
Expand Down Expand Up @@ -60,7 +63,12 @@ impl Default for HostEnvConfig {
}

impl HostEnvConfig {
fn register_ops(&self, env: &mut HostEnv, tree_db: Option<Rc<RefCell<dyn TreeDB>>>) {
fn register_ops(
&self,
env: &mut HostEnv,
tree_db: Option<Rc<RefCell<dyn TreeDB>>>,
merkle_proof_recorder: Option<Rc<RefCell<dyn Write>>>,
) {
for op in &self.ops {
match op {
OpType::BLS381PAIR => host::ecc_helper::bls381::pair::register_blspair_foreign(env),
Expand All @@ -69,7 +77,11 @@ impl HostEnvConfig {
OpType::BN256SUM => host::ecc_helper::bn254::sum::register_bn254sum_foreign(env),
OpType::POSEIDONHASH => host::hash_helper::poseidon::register_poseidon_foreign(env),
OpType::MERKLE => {
host::merkle_helper::merkle::register_merkle_foreign(env, tree_db.clone());
host::merkle_helper::merkle::register_merkle_foreign(
env,
tree_db.clone(),
merkle_proof_recorder.clone(),
);
host::merkle_helper::datacache::register_datacache_foreign(
env,
tree_db.clone(),
Expand All @@ -96,7 +108,7 @@ impl HostEnvBuilder for StandardHostEnvBuilder {
register_require_foreign(&mut env);
register_log_foreign(&mut env);
register_context_foreign(&mut env, vec![], Arc::new(Mutex::new(vec![])));
envconfig.register_ops(&mut env, None);
envconfig.register_ops(&mut env, None, None);
host::witness_helper::register_witness_foreign(
&mut env,
Rc::new(RefCell::new(HashMap::new())),
Expand All @@ -114,7 +126,7 @@ impl HostEnvBuilder for StandardHostEnvBuilder {
register_log_foreign(&mut env);
register_context_foreign(&mut env, arg.context_inputs, arg.context_outputs);
host::witness_helper::register_witness_foreign(&mut env, arg.indexed_witness);
envconfig.register_ops(&mut env, arg.tree_db);
envconfig.register_ops(&mut env, arg.tree_db, arg.merkle_proof_recorder);
env.finalize();

(env, wasm_runtime_io)
Expand Down
Loading