Move crypto/proof to zk/proof.

bin/drk/src/rpc_transfer.rs

@@ -18,10 +18,9 @@
 
 use anyhow::{anyhow, Result};
 use darkfi::{
-    crypto::proof::ProvingKey,
     tx::Transaction,
     util::parse::{decode_base10, encode_base10},
-    zk::{vm::ZkCircuit, vm_stack::empty_witnesses},
+    zk::{proof::ProvingKey, vm::ZkCircuit, vm_stack::empty_witnesses},
     zkas::ZkBinary,
 };
 use darkfi_money_contract::{

bin/faucetd/src/main.rs

@@ -22,9 +22,8 @@ use async_std::sync::{Arc, Mutex, RwLock};
 use async_trait::async_trait;
 use chrono::Utc;
 use darkfi::{
-    crypto::proof::ProvingKey,
     tx::Transaction,
-    zk::{vm::ZkCircuit, vm_stack::empty_witnesses},
+    zk::{proof::ProvingKey, vm::ZkCircuit, vm_stack::empty_witnesses},
     zkas::ZkBinary,
 };
 use darkfi_money_contract::{

src/consensus/lead_info.rs

@@ -24,7 +24,7 @@ use darkfi_serial::{SerialDecodable, SerialEncodable};
 use log::error;
 
 use crate::{
-    crypto::proof::{Proof, VerifyingKey},
+    zk::proof::{Proof, VerifyingKey},
     Result,
 };
 

src/consensus/leadcoin.rs

@@ -33,8 +33,11 @@ use rand::rngs::OsRng;
 use super::constants::EPOCH_LENGTH;
 use crate::{
     consensus::{constants, TransferStx, TxRcpt},
-    crypto::{proof::ProvingKey, Proof},
-    zk::{vm::ZkCircuit, vm_stack::Witness},
+    zk::{
+        proof::{Proof, ProvingKey},
+        vm::ZkCircuit,
+        vm_stack::Witness,
+    },
     zkas::ZkBinary,
     Result,
 };

src/consensus/state.rs

@@ -46,7 +46,6 @@ use super::{
 
 use crate::{
     blockchain::Blockchain,
-    crypto::proof::{ProvingKey, VerifyingKey},
     net,
     rpc::jsonrpc::JsonNotification,
     runtime::vm_runtime::Runtime,
@@ -54,7 +53,11 @@ use crate::{
     tx::Transaction,
     util::time::Timestamp,
     wallet::WalletPtr,
-    zk::{vm::ZkCircuit, vm_stack::empty_witnesses},
+    zk::{
+        proof::{ProvingKey, VerifyingKey},
+        vm::ZkCircuit,
+        vm_stack::empty_witnesses,
+    },
     zkas::ZkBinary,
     Error, Result,
 };

src/consensus/stx.rs

@@ -22,7 +22,7 @@ use darkfi_sdk::{
 };
 
 use crate::{
-    crypto::{proof::VerifyingKey, Proof},
+    zk::{proof::VerifyingKey, Proof},
     Error, Result,
 };
 use darkfi_serial::{SerialDecodable, SerialEncodable};

src/contract/money/src/client.rs

@@ -27,8 +27,11 @@
 
 use chacha20poly1305::{AeadInPlace, ChaCha20Poly1305, KeyInit};
 use darkfi::{
-    crypto::proof::{Proof, ProvingKey},
-    zk::{vm::ZkCircuit, vm_stack::Witness},
+    zk::{
+        proof::{Proof, ProvingKey},
+        vm::ZkCircuit,
+        vm_stack::Witness,
+    },
     zkas::ZkBinary,
     ClientFailed, Error, Result,
 };

src/contract/money/tests/contract_exec.rs

@@ -27,11 +27,10 @@ use darkfi::{
         constants::{TESTNET_GENESIS_HASH_BYTES, TESTNET_GENESIS_TIMESTAMP},
         ValidatorState,
     },
-    crypto::proof::ProvingKey,
     tx::Transaction,
     util::parse::decode_base10,
     wallet::WalletDb,
-    zk::{vm::ZkCircuit, vm_stack::empty_witnesses},
+    zk::{proof::ProvingKey, vm::ZkCircuit, vm_stack::empty_witnesses},
     zkas::ZkBinary,
     Result,
 };

src/crypto/mod.rs

@@ -18,7 +18,3 @@
 
 /// VDF (Verifiable Delay Function) using MiMC
 pub mod mimc_vdf;
-
-/// Halo2 proof API abstractions
-pub mod proof;
-pub use proof::Proof;

src/tx/mod.rs

@@ -32,7 +32,7 @@ use log::{debug, error};
 use rand::{CryptoRng, RngCore};
 
 use crate::{
-    crypto::{proof::VerifyingKey, Proof},
+    zk::{proof::VerifyingKey, Proof},
     Error, Result, VerifyFailed,
 };
 

src/zk/gadget/arithmetic.rs

@@ -187,13 +187,13 @@ impl ArithInstruction<pallas::Base> for ArithChip {
 mod tests {
     use super::*;
     use crate::{
-        crypto::{
-            proof::{ProvingKey, VerifyingKey},
-            Proof,
+        zk::{
+            assign_free_advice,
+            proof::{Proof, ProvingKey, VerifyingKey},
         },
-        zk::assign_free_advice,
         Result,
     };
+
     use halo2_proofs::{
         circuit::{floor_planner, Value},
         dev::{CircuitLayout, MockProver},

src/zk/mod.rs

@@ -23,6 +23,10 @@ pub mod vm_stack;
 /// ZK gadget implementations
 pub mod gadget;
 
+/// Proof creation API
+pub mod proof;
+pub use proof::Proof;
+
 use halo2_proofs::{
     arithmetic::Field,
     circuit::{AssignedCell, Layouter, Value},