diff --git a/Makefile b/Makefile index f60d5d4..3e24377 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -.PHONY: fmt check execute prove verify zk +.PHONY: fmt check execute prove prove_ultra_honk verify verify_ultra_honk zk zk_ultra_honk fmt: nargo fmt @@ -9,14 +9,29 @@ check: execute: nargo execute plume -prove: + +prove_ultra_honk: + bb prove_ultra_honk -b ./target/use.json -w ./target/plume.gz -o ./target/proof + +prove: bb prove -b ./target/use.json -w ./target/plume.gz -o ./target/proof + +verify_ultra_honk: + bb write_vk_ultra_honk -b ./target/use.json -o ./target/vk + bb verify_ultra_honk -k ./target/vk -p ./target/proof + verify: bb write_vk -b ./target/use.json -o ./target/vk bb verify -k ./target/vk -p ./target/proof + zk: make execute make prove - make verify \ No newline at end of file + make verify + +zk_ultra_honk: + make execute + make prove_ultra_honk + make verify_ultra_honk \ No newline at end of file diff --git a/crates/use/src/main.nr b/crates/use/src/main.nr index 3ba1e5c..a489dc6 100644 --- a/crates/use/src/main.nr +++ b/crates/use/src/main.nr @@ -8,9 +8,8 @@ pub fn main(msg: [u8; MSG_LEN], c: [u8; 32], s: [u8; 32], pk: [[u8; 32]; 2], nul let nullifier = ( Secpk1Fq::from_le_bytes(to_u8_arr(nullifier[0])), Secpk1Fq::from_le_bytes(to_u8_arr(nullifier[1])) ); - // Choose your plume variant and comment the other - // plume_v1(msg, c, s, pk, nullifier); - plume_v2(msg, c, s, pk, nullifier); + plume_v1(msg, c, s, pk, nullifier); + // plume_v2(msg, c, s, pk, nullifier); } diff --git a/etc/main.sage b/etc/main.sage index d0ae291..460e2dd 100644 --- a/etc/main.sage +++ b/etc/main.sage @@ -45,8 +45,8 @@ def update_prover_toml(filepath, version1: bool, msg_len: int): def update_plume_version(is_v1: bool): path = "../crates/use/src/" - p1_line = 13 - p2_line = 14 + p1_line = 12 + p2_line = 13 with open(path + 'main.nr', 'r') as file: lines = file.readlines()