Merge branch 'develop' into enhancement/memo-format

Cargo.toml

@@ -10,4 +10,10 @@ default-members = [
     "libzkbob-rs",
     "libzkbob-rs-node",
     "libs/kvdb-web",
-]
+]
+
+[patch."https://github.com/zkbob/libzeropool-zkbob"]
+libzeropool = { git = "https://github.com/zkbob//libzeropool-zkbob", branch = "devel", package = "libzeropool-zkbob" }
+
+[patch.crates-io]
+libzeropool = { git = "https://github.com/zkbob//libzeropool-zkbob", branch = "devel", package = "libzeropool-zkbob" }

libzkbob-rs-node/Cargo.toml

@@ -11,8 +11,8 @@ exclude = ["index.node"]
 crate-type = ["cdylib"]
 
 [dependencies]
-libzkbob-rs = { version = "1.4.0", features = ["native"] }
-#libzkbob-rs = { path = "../libzkbob-rs", features = ["native"] }
+#libzkbob-rs = { version = "1.4.0", features = ["native"] }
+libzkbob-rs = { path = "../libzkbob-rs", features = ["native"] }
 neon = { version = "0.10.0", default-features = false, features = ["channel-api", "napi-6", "promise-api", "task-api"] }
 # FIXME: Using a random fork for now
 neon-serde = { package = "neon-serde3", version = "0.10" }

libzkbob-rs-wasm/src/client/mod.rs

@@ -479,6 +479,7 @@ impl UserAccount {
             .into_iter()
             .map(|bulk| -> Vec<ParseResult> {
                 let eta = &self.inner.borrow().keys.eta;
+                let kappa = &self.inner.borrow().keys.kappa;
                 let params = &self.inner.borrow().params;
                 let range = from_index.unwrap_or(0)..to_index.unwrap_or(u64::MAX);
                 let bulk_results: Vec<ParseResult> = vec_into_iter(bulk.txs)
@@ -490,6 +491,7 @@ impl UserAccount {
                             &tx.memo,
                             Some(&tx.tx_hash),
                             eta,
+                            kappa,
                             params
                         ).ok()
                     })