contract/consensus: pushed halo2_proofs to 0.3.0

Cargo.lock

@@ -1196,7 +1196,7 @@ dependencies = [
  "futures",
  "futures-rustls 0.24.0",
  "halo2_gadgets",
- "halo2_proofs 0.3.0",
+ "halo2_proofs",
  "hex",
  "indexmap",
  "indicatif",
@@ -1242,7 +1242,7 @@ dependencies = [
  "darkfi-sdk",
  "darkfi-serial",
  "getrandom",
- "halo2_proofs 0.2.0",
+ "halo2_proofs",
  "log",
  "rand",
  "simplelog",
@@ -1262,7 +1262,7 @@ dependencies = [
  "darkfi-sdk",
  "darkfi-serial",
  "getrandom",
- "halo2_proofs 0.3.0",
+ "halo2_proofs",
  "log",
  "rand",
  "simplelog",
@@ -1300,7 +1300,7 @@ dependencies = [
  "darkfi-sdk",
  "darkfi-serial",
  "getrandom",
- "halo2_proofs 0.3.0",
+ "halo2_proofs",
  "log",
  "rand",
  "simplelog",
@@ -1319,12 +1319,12 @@ dependencies = [
  "chacha20poly1305",
  "darkfi-serial",
  "halo2_gadgets",
- "halo2_proofs 0.3.0",
+ "halo2_proofs",
  "incrementalmerkletree",
  "lazy_static",
  "num-bigint",
  "num-traits",
- "pasta_curves 0.5.1",
+ "pasta_curves",
  "rand",
  "rand_core 0.6.4",
  "sha2",
@@ -1340,7 +1340,7 @@ dependencies = [
  "darkfi-derive",
  "futures-lite",
  "incrementalmerkletree",
- "pasta_curves 0.5.1",
+ "pasta_curves",
  "url",
 ]
 
@@ -1925,17 +1925,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "ff"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160"
-dependencies = [
- "bitvec",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "ff"
 version = "0.13.0"
@@ -2347,24 +2336,13 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "group"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7"
-dependencies = [
- "ff 0.12.1",
- "rand_core 0.6.4",
- "subtle",
-]
-
 [[package]]
 name = "group"
 version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
- "ff 0.13.0",
+ "ff",
  "rand_core 0.6.4",
  "subtle",
 ]
@@ -2377,11 +2355,11 @@ checksum = "126a150072b0c38c7b573fe3eaf0af944a7fed09e154071bf2436d3f016f7230"
 dependencies = [
  "arrayvec",
  "bitvec",
- "ff 0.13.0",
- "group 0.13.0",
- "halo2_proofs 0.3.0",
+ "ff",
+ "group",
+ "halo2_proofs",
  "lazy_static",
- "pasta_curves 0.5.1",
+ "pasta_curves",
  "plotters",
  "proptest",
  "rand",
@@ -2389,21 +2367,6 @@ dependencies = [
  "uint",
 ]
 
-[[package]]
-name = "halo2_proofs"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cff771b9a2445cd2545c9ef26d863c290fbb44ae440c825a20eb7156f67a949a"
-dependencies = [
- "blake2b_simd",
- "ff 0.12.1",
- "group 0.12.1",
- "pasta_curves 0.4.1",
- "rand_core 0.6.4",
- "rayon",
- "tracing",
-]
-
 [[package]]
 name = "halo2_proofs"
 version = "0.3.0"
@@ -2411,10 +2374,10 @@ source = "git+https://github.com/parazyd/halo2?branch=v3#09c57c6b6531f212ad687cd
 dependencies = [
  "backtrace",
  "blake2b_simd",
- "ff 0.13.0",
- "group 0.13.0",
+ "ff",
+ "group",
  "maybe-rayon",
- "pasta_curves 0.5.1",
+ "pasta_curves",
  "plotters",
  "rand_core 0.6.4",
  "tabbycat",
@@ -3127,21 +3090,6 @@ dependencies = [
  "windows-sys 0.45.0",
 ]
 
-[[package]]
-name = "pasta_curves"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc65faf8e7313b4b1fbaa9f7ca917a0eed499a9663be71477f87993604341d8"
-dependencies = [
- "blake2b_simd",
- "ff 0.12.1",
- "group 0.12.1",
- "lazy_static",
- "rand",
- "static_assertions",
- "subtle",
-]
-
 [[package]]
 name = "pasta_curves"
 version = "0.5.1"
@@ -3149,8 +3097,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d3e57598f73cc7e1b2ac63c79c517b31a0877cd7c402cdcaa311b5208de7a095"
 dependencies = [
  "blake2b_simd",
- "ff 0.13.0",
- "group 0.13.0",
+ "ff",
+ "group",
  "lazy_static",
  "rand",
  "static_assertions",

src/contract/consensus/Cargo.toml

@@ -18,7 +18,7 @@ thiserror = "1.0.38"
 # probably shouldn't be in WASM
 chacha20poly1305 = { version = "0.10.1", optional = true }
 darkfi = { path = "../../../", features = ["zk", "rpc", "blockchain"], optional = true }
-halo2_proofs = { version = "0.2.0", optional = true }
+halo2_proofs = { version = "0.3.0", optional = true }
 log = { version = "0.4.17", optional = true }
 rand = { version = "0.8.5", optional = true }
 

src/contract/consensus/src/entrypoint.rs

@@ -21,8 +21,6 @@ use darkfi_money_contract::{
     CONSENSUS_CONTRACT_COINS_TREE, CONSENSUS_CONTRACT_COIN_MERKLE_TREE,
     CONSENSUS_CONTRACT_COIN_ROOTS_TREE, CONSENSUS_CONTRACT_DB_VERSION,
     CONSENSUS_CONTRACT_INFO_TREE, CONSENSUS_CONTRACT_NULLIFIERS_TREE,
-    CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1, MONEY_CONTRACT_ZKAS_BURN_NS_V1,
-    MONEY_CONTRACT_ZKAS_MINT_NS_V1,
 };
 use darkfi_sdk::{
     crypto::{ContractId, MerkleTree},

src/contract/consensus/tests/harness.rs

@@ -31,13 +31,9 @@ use darkfi::{
 };
 use darkfi_money_contract::client::OwnCoin;
 use darkfi_sdk::{
-<<<<<<< HEAD
     crypto::{
         Keypair, MerkleTree, PublicKey, CONSENSUS_CONTRACT_ID, DARK_TOKEN_ID, MONEY_CONTRACT_ID,
     },
-<<<<<<< HEAD
-=======
-    crypto::{Keypair, MerkleTree, PublicKey, DARK_TOKEN_ID, MONEY_CONTRACT_ID},
     pasta::pallas,
     ContractCall,
 };