From ae93b387e5ec78e29c823a0bf451ff36851fcfa5 Mon Sep 17 00:00:00 2001 From: JC Date: Mon, 25 Nov 2024 11:19:39 -0700 Subject: [PATCH] fix: a few adjustments --- .gitignore | 3 ++ components/Header/Header.tsx | 2 +- components/Send/components/Confirm.tsx | 4 +- rust/Cargo.lock | 51 +++++++++++--------------- rust/lib/src/lib.rs | 18 ++++++--- 5 files changed, 40 insertions(+), 38 deletions(-) diff --git a/.gitignore b/.gitignore index 66c019c54..e10d75a46 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,6 @@ buck-out/ # firebase /**/google-services.json /**/GoogleService-Info.plist + +# Binaries +/rust/test_binaries/bins/ \ No newline at end of file diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx index bd088ade1..f6ae47100 100644 --- a/components/Header/Header.tsx +++ b/components/Header/Header.tsx @@ -673,7 +673,7 @@ const Header: React.FunctionComponent = ({ )} - {showShieldButton && !calculateDisableButtonToShield() && setComputingModalVisible && ( + {showShieldButton && !calculateDisableButtonToShield() && setComputingModalVisible && valueTransfers !== null && ( {(translate(`history.shield-legend-${calculatePoolsToShield()}`) as string) + diff --git a/components/Send/components/Confirm.tsx b/components/Send/components/Confirm.tsx index 758df75bf..712ed9e7a 100644 --- a/components/Send/components/Confirm.tsx +++ b/components/Send/components/Confirm.tsx @@ -325,8 +325,8 @@ const Confirm: React.FunctionComponent = ({ - - {translate('send.confirm-privacy-level') as string} + + {translate('send.confirm-privacy-level') as string} {privacyLevel} diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 2b7519a45..1ac25e966 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -246,21 +246,20 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "aws-lc-rs" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe7c2840b66236045acd2607d5866e274380afd87ef99d6226e961e2cb47df45" +checksum = "f47bb8cc16b669d267eeccf585aea077d0882f4777b1c1f740217885d6e6e5a3" dependencies = [ "aws-lc-sys", - "mirai-annotations", "paste", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.23.0" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad3a619a9de81e1d7de1f1186dcba4506ed661a0e483d84410fdef0ee87b2f96" +checksum = "a2101df3813227bbaaaa0b04cd61c534c7954b22bd68d399b440be937dc63ff7" dependencies = [ "bindgen", "cc", @@ -1395,9 +1394,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.15.1" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a9bfc1af68b1726ea47d3d5109de126281def866b33970e10fbab11b5dafab3" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -1809,7 +1808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" dependencies = [ "equivalent", - "hashbrown 0.15.1", + "hashbrown 0.15.2", "serde", ] @@ -1977,9 +1976,9 @@ checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "litemap" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "litrs" @@ -2114,12 +2113,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "mirai-annotations" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9be0862c1b3f26a88803c4a49de6889c10e608b3ee9344e6ef5b45fb37ad3d1" - [[package]] name = "multimap" version = "0.10.0" @@ -2578,7 +2571,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c1318b19085f08681016926435853bbf7858f9c082d0999b80550ff5d9abe15" dependencies = [ "bytes", - "heck 0.5.0", + "heck 0.4.1", "itertools 0.13.0", "log", "multimap", @@ -2971,9 +2964,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.17" +version = "0.23.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1a745511c54ba6d4465e8d5dfbd81b45791756de28d4981af70d6dca128f1e" +checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" dependencies = [ "aws-lc-rs", "log", @@ -4109,9 +4102,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.5.3" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d157f1b96d14500ffdc1f10ba712e780825526c03d9a49b4d0324b0d9113ada" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -4559,9 +4552,9 @@ checksum = "213b7324336b53d2414b2db8537e56544d981803139155afa84f76eeebb7a546" [[package]] name = "yoke" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" dependencies = [ "serde", "stable_deref_trait", @@ -4571,9 +4564,9 @@ dependencies = [ [[package]] name = "yoke-derive" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" dependencies = [ "proc-macro2", "quote", @@ -4789,18 +4782,18 @@ dependencies = [ [[package]] name = "zerofrom" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" dependencies = [ "zerofrom-derive", ] [[package]] name = "zerofrom-derive" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" dependencies = [ "proc-macro2", "quote", diff --git a/rust/lib/src/lib.rs b/rust/lib/src/lib.rs index bd9ee4866..027250367 100644 --- a/rust/lib/src/lib.rs +++ b/rust/lib/src/lib.rs @@ -27,9 +27,15 @@ lazy_static! { Mutex::new(RefCell::new(None)); } -fn lock_client_return_seed(lightclient: LightClient) -> String { +fn lock_client_return_seed( + lightclient: LightClient, + monitor_mempool: bool, +) -> String { let lc = Arc::new(lightclient); - let _ = LightClient::start_mempool_monitor(lc.clone()); + + if monitor_mempool { + let _ = LightClient::start_mempool_monitor(lc.clone()); + } LIGHTCLIENT.lock().unwrap().replace(Some(lc)); @@ -103,7 +109,7 @@ pub fn init_new( return format!("Error: {}", e); } }; - lock_client_return_seed(lightclient) + lock_client_return_seed(lightclient, monitor_mempool) } pub fn init_from_seed( @@ -130,7 +136,7 @@ pub fn init_from_seed( return format!("Error: {}", e); } }; - lock_client_return_seed(lightclient) + lock_client_return_seed(lightclient, monitor_mempool) } pub fn init_from_ufvk( @@ -157,7 +163,7 @@ pub fn init_from_ufvk( return format!("Error: {}", e); } }; - lock_client_return_seed(lightclient) + lock_client_return_seed(lightclient, monitor_mempool) } pub fn init_from_b64( @@ -191,7 +197,7 @@ pub fn init_from_b64( return format!("Error: {}", e); } }; - lock_client_return_seed(lightclient) + lock_client_return_seed(lightclient, monitor_mempool) } pub fn save_to_b64() -> String {