Browse Source

chore: updated to latest versions

skoupidi 2 months ago
parent
commit
acec629364
4 changed files with 259 additions and 160 deletions
  1. 251 155
      Cargo.lock
  2. 3 3
      Cargo.toml
  3. 2 2
      client/main.rs
  4. 3 0
      src/lib.rs

File diff suppressed because it is too large
+ 251 - 155
Cargo.lock


+ 3 - 3
Cargo.toml

@@ -13,7 +13,7 @@ crate-type = ["cdylib", "lib"]
 [dependencies]
 # The main smart contract dependencies necessary for each/most contracts
 darkfi-sdk = { git = "https://codeberg.org/darkrenaissance/darkfi", features = ["wasm"] }
-darkfi-serial = { version = "0.5.1", features = ["derive", "crypto"] }
+darkfi-serial = { git = "https://codeberg.org/darkrenaissance/darkfi", features = ["derive", "crypto"] }
 
 # The client-side dependencies used for transaction creation. These aren't
 # needed in WASM so they are optional, and enabled through the `client`
@@ -40,5 +40,5 @@ name = "membership"
 path = "client/main.rs"
 
 [patch.crates-io]
-halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v032"}
-halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v032"}
+halo2_proofs = {git="https://github.com/parazyd/halo2", branch="v050"}
+halo2_gadgets = {git="https://github.com/parazyd/halo2", branch="v050"}

+ 2 - 2
client/main.rs

@@ -48,7 +48,7 @@ fn register(argv0: &str, cid: ContractId, secret_key: Option<String>) {
     };
 
     // Let's parse the compiled ZK circuit and create a proof.
-    let zkbin = ZkBinary::decode(ZKBIN).unwrap();
+    let zkbin = ZkBinary::decode(ZKBIN, false).unwrap();
 
     // For the membership, we will use our secret key.
     // We'll decode it from the input.
@@ -119,7 +119,7 @@ fn deregister(argv0: &str, cid: ContractId, secret_key: Option<String>) {
         return usage(argv0);
     };
 
-    let zkbin = ZkBinary::decode(ZKBIN).unwrap();
+    let zkbin = ZkBinary::decode(ZKBIN, false).unwrap();
 
     let secret_key = SecretKey::from_str(&secret_key).unwrap();
     let keypair = Keypair::new(secret_key);

+ 3 - 0
src/lib.rs

@@ -3,6 +3,9 @@ use darkfi_sdk::crypto::PublicKey;
 use darkfi_sdk::ContractError;
 use darkfi_serial::{SerialDecodable, SerialEncodable};
 
+#[cfg(feature = "client")]
+use darkfi_serial::async_trait;
+
 #[cfg(not(feature = "no-entrypoint"))]
 /// WASM entrypoint functions
 pub mod entrypoint;

Some files were not shown because too many files changed in this diff