From 9920d0e241fac16903e3fb4e30b4d25191270190 Mon Sep 17 00:00:00 2001
From: bayk <konstantin.bay@gmail.com>
Date: Thu, 26 Sep 2024 16:19:08 -0700
Subject: [PATCH 1/5] Viewing key, QT wallet intergation

---
 src/cli/parser.rs | 16 ++++++++++++++++
 src/main.rs       | 23 +++++++++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/src/cli/parser.rs b/src/cli/parser.rs
index cc7d457..7c972a2 100644
--- a/src/cli/parser.rs
+++ b/src/cli/parser.rs
@@ -796,5 +796,21 @@ impl<'a, 'b> Parser {
                 SubCommand::with_name("check_tor_connection")
                     .about("check this wallet tor connection")
             )
+            .subcommand(
+                SubCommand::with_name("rewind_hash")
+                    .about("Return the hash of the wallet root public key")
+            )
+            .subcommand(
+                SubCommand::with_name("scan_rewind_hash")
+                    .about("Scan the UTXO set, return the outputs and the total of MWC owned by a view wallet rewind hash.")
+                    .arg(
+                        Arg::from_usage("-h, --rewind_hash=<rewind_hash> 'Rewind hash of the wallet to be scanned in order to retrieve all the outputs and balance'")
+                    ).arg(
+                        Arg::from_usage("[start_height] -s, --start_height=<height> 'If given, the first block from which to start the scan (default 1)'")
+                    )
+                    .arg(
+                        Arg::from_usage("[backwards_from_tip] -b, --backwards_from_tip=<blocks> 'If given, start scan b blocks back from the tip'")
+                    )
+            )
     }
 }
diff --git a/src/main.rs b/src/main.rs
index f8b0b0c..982fb2f 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -40,6 +40,7 @@ extern crate grin_wallet_controller;
 extern crate grin_wallet_util;
 
 extern crate ed25519_dalek;
+extern crate grin_wallet_api;
 
 use grin_core::core::Transaction;
 use grin_core::ser;
@@ -118,6 +119,7 @@ use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::mpsc;
 use grin_core::ser::DeserializationMode;
 use grin_util::secp::{ContextFlag, Secp256k1};
+use grin_wallet_api::Owner;
 use grin_wallet_config::types::{TorBridgeConfig, TorProxyConfig};
 use rustyline::validate::Validator;
 use uuid::Uuid;
@@ -2848,6 +2850,27 @@ fn do_command(
             };
             grin_wallet_controller::command::eth(wallet.lock().get_wallet_instance()?, eth_args)?;
         }
+        Some("rewind_hash") => {
+            let mut owner_api = Owner::new(wallet.lock().get_wallet_instance()?, None, None);
+            grin_wallet_controller::command::rewind_hash(&mut owner_api, None, true)?;
+        }
+        Some("scan_rewind_hash") => {
+            let args = matches.subcommand_matches("scan_rewind_hash").unwrap();
+
+            let args = grin_wallet_controller::command::ViewWalletScanArgs {
+                rewind_hash: args.value_of("rewind_hash").unwrap().to_string(),
+                start_height: match args.value_of("start_height").map(|s| s.parse::<u64>()) {
+                    Some( res ) => Some(res.map_err(|e| Error::ArgumentError(format!("Unable to parse 'start_height' value, {}", e)))?),
+                    None => None,
+                },
+                backwards_from_tip: match args.value_of("backwards_from_tip").map(|s| s.parse::<u64>()) {
+                    Some( res ) => Some(res.map_err(|e| Error::ArgumentError(format!("Unable to parse 'backwards_from_tip' value, {}", e)))?),
+                    None => None,
+                },
+            };
+            let mut owner_api = Owner::new(wallet.lock().get_wallet_instance()?, None, None);
+            grin_wallet_controller::command::scan_rewind_hash(&mut owner_api,args,true, true)?;
+        }
         Some(subcommand) => {
             cli_message!(
                 "{}: subcommand `{}` not implemented!",

From b16f725db327e3b229b0909d6aaea129ebb25307 Mon Sep 17 00:00:00 2001
From: bayk <konstantin.bay@gmail.com>
Date: Mon, 30 Sep 2024 15:14:32 -0700
Subject: [PATCH 2/5] Ownership Proof

---
 src/cli/parser.rs | 22 ++++++++++++++++++++++
 src/main.rs       | 17 +++++++++++++++++
 2 files changed, 39 insertions(+)

diff --git a/src/cli/parser.rs b/src/cli/parser.rs
index 7c972a2..b3a252e 100644
--- a/src/cli/parser.rs
+++ b/src/cli/parser.rs
@@ -812,5 +812,27 @@ impl<'a, 'b> Parser {
                         Arg::from_usage("[backwards_from_tip] -b, --backwards_from_tip=<blocks> 'If given, start scan b blocks back from the tip'")
                     )
             )
+            .subcommand(
+                SubCommand::with_name("generate_ownership_proof")
+                    .about("Gerenerate ownershup proof for the root public key, tor address and mqs addresses.")
+                    .arg(
+                        Arg::from_usage("-s, --message=<messge> 'Message to sign'")
+                    ).arg(
+                    Arg::from_usage("[include_public_root_key] -p, --include_public_root_key 'Include root public key and signature. Note, root public key can be user to generate rewind_hash to view the all outputs for your wallet.'")
+                )
+                    .arg(
+                        Arg::from_usage("[include_tor_address] -t, --include_tor_address 'Include tor address and singature.'")
+                    )
+                    .arg(
+                        Arg::from_usage("[include_mqs_address] -m, --include_mqs_address 'Include MWCMQS address and singature.'")
+                    )
+            )
+            .subcommand(
+                SubCommand::with_name("validate_ownership_proof")
+                    .about("Validate ownership proof record.")
+                    .arg(
+                        Arg::from_usage("-p, --proof=<proof> 'Proof record, generated by generate_ownership_proof'")
+                    )
+            )
     }
 }
diff --git a/src/main.rs b/src/main.rs
index 982fb2f..5807d59 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2871,6 +2871,23 @@ fn do_command(
             let mut owner_api = Owner::new(wallet.lock().get_wallet_instance()?, None, None);
             grin_wallet_controller::command::scan_rewind_hash(&mut owner_api,args,true, true)?;
         }
+        Some("generate_ownership_proof") => {
+            let args = matches.subcommand_matches("generate_ownership_proof").unwrap();
+            let mut owner_api = Owner::new(wallet.lock().get_wallet_instance()?, None, None);
+            command::generate_ownership_proof(&mut owner_api,
+                                              None,
+                                              command::GenerateOwnershipProofArgs {
+                                                  message: args.value_of("message").unwrap().to_string(),
+                                                  include_public_root_key: args.is_present("include_public_root_key"),
+                                                  include_tor_address: args.is_present("include_tor_address"),
+                                                  include_mqs_address: args.is_present("include_mqs_address"),
+                                              })?;
+        }
+        Some("validate_ownership_proof") => {
+            let args = matches.subcommand_matches("validate_ownership_proof").unwrap();
+            let mut owner_api = Owner::new(wallet.lock().get_wallet_instance()?, None, None);
+            command::validate_ownership_proof(&mut owner_api, None, args.value_of("proof").unwrap())?;
+        }
         Some(subcommand) => {
             cli_message!(
                 "{}: subcommand `{}` not implemented!",

From de195ffdf9cf9f2131f04ba2bda15d4fa0999d2f Mon Sep 17 00:00:00 2001
From: bayk <konstantin.bay@gmail.com>
Date: Tue, 1 Oct 2024 14:25:24 -0700
Subject: [PATCH 3/5] Support for self send

---
 src/cli/parser.rs |  3 +++
 src/main.rs       | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/src/cli/parser.rs b/src/cli/parser.rs
index b3a252e..8820c99 100644
--- a/src/cli/parser.rs
+++ b/src/cli/parser.rs
@@ -304,6 +304,9 @@ impl<'a, 'b> Parser {
                     .arg(
                         Arg::from_usage("[amount_includes_fee] -i, --amount_includes_fee 'If send amount includes transaction fee.'")
                     )
+                    .arg(
+                        Arg::from_usage("[self] , --self 'Self send to another account. to is account name'")
+                    )
 
 
             )
diff --git a/src/main.rs b/src/main.rs
index 5807d59..523ce2e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1727,6 +1727,7 @@ fn do_command(
         Some("send") => {
             let args = matches.subcommand_matches("send").unwrap();
             let to = args.value_of("to");
+            let self_send = args.is_present("self");
             let expected_proof_address = args.value_of("expectedproof");
             let input = args.value_of("file");
             let message = args.value_of("message").map(|s| s.to_string());
@@ -1913,6 +1914,43 @@ fn do_command(
                 running.store(false, Ordering::Relaxed);
                 let _ = updater.join();
 
+                return Ok(());
+            }
+            else if self_send {
+                let w = wallet.lock();
+                let mut slate = w.init_send_tx(
+                    None,
+                    amount,
+                    confirmations,
+                    strategy,
+                    change_outputs,
+                    500,
+                    None,
+                    output_list,
+                    version,
+                    routputs,
+                    &None,
+                    ttl_blocks,
+                    false,
+                    None,
+                    None,
+                    min_fee,
+                    amount_includes_fee,
+                )?;
+
+                w.tx_lock_outputs(&slate, Some(String::from("self")), 0)?;
+
+                w.process_sender_initiated_slate(
+                    None,
+                    &mut slate,
+                    Some(String::from("self")),
+                    None,
+                    None,
+                    to,
+                )?;
+
+                w.finalize_post_slate(&mut slate, fluff)?;
+
                 return Ok(());
             } else if let Some(to) = to {
                 let mut to = to.to_string();

From 170762ea57bd418ccfb5aeea8cbc50aa10184d61 Mon Sep 17 00:00:00 2001
From: bayk <konstantin.bay@gmail.com>
Date: Tue, 1 Oct 2024 18:22:14 -0700
Subject: [PATCH 4/5] Bump build, switch to branch build

---
 Cargo.lock | 175 ++++++++++++++++++++++++++++-------------------------
 Cargo.toml |  54 ++++++++---------
 2 files changed, 119 insertions(+), 110 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6f28c81..c302fa7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -219,7 +219,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
 dependencies = [
  "async-lock 2.8.0",
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "cfg-if 1.0.0",
  "concurrent-queue",
  "futures-lite 1.13.0",
@@ -378,14 +378,14 @@ version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
@@ -484,7 +484,7 @@ version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "libm",
  "num-bigint 0.4.6",
  "num-integer",
@@ -798,9 +798,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.21"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
 dependencies = [
  "shlex",
 ]
@@ -1077,7 +1077,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "cfg-if 0.1.10",
  "lazy_static",
 ]
@@ -1251,7 +1251,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1270,7 +1270,7 @@ dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
  "rustc_version",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1681,9 +1681,9 @@ checksum = "37ab347416e802de484e4d03c7316c48f1ecb56574dfd4a46a80f173ce1de04d"
 
 [[package]]
 name = "flate2"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
+checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
@@ -1852,7 +1852,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1978,7 +1978,7 @@ dependencies = [
 [[package]]
 name = "grin_api"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "bytes 0.5.6",
  "chrono",
@@ -2012,7 +2012,7 @@ dependencies = [
 [[package]]
 name = "grin_chain"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "bit-vec",
  "bitflags 1.3.2",
@@ -2035,7 +2035,7 @@ dependencies = [
 [[package]]
 name = "grin_core"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "grin_keychain"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2084,7 +2084,7 @@ dependencies = [
 [[package]]
 name = "grin_p2p"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "async-std",
  "bitflags 1.3.2",
@@ -2118,7 +2118,7 @@ dependencies = [
 [[package]]
 name = "grin_pool"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "blake2-rfc",
  "chrono",
@@ -2150,7 +2150,7 @@ dependencies = [
 [[package]]
 name = "grin_store"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "byteorder",
  "croaring",
@@ -2169,7 +2169,7 @@ dependencies = [
 [[package]]
 name = "grin_util"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2#0a96a3c69e7364246ed05d7ac89c8e51e9e2ebce"
+source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
 dependencies = [
  "backtrace",
  "base64 0.12.3",
@@ -2193,8 +2193,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_api"
-version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.2#44016385377399b8658cb7b5494642d0feece402"
+version = "5.3.3"
+source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -2217,8 +2217,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_config"
-version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.2#44016385377399b8658cb7b5494642d0feece402"
+version = "5.3.3"
+source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
 dependencies = [
  "dirs",
  "grin_wallet_util",
@@ -2231,8 +2231,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_controller"
-version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.2#44016385377399b8658cb7b5494642d0feece402"
+version = "5.3.3"
+source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
 dependencies = [
  "chrono",
  "colored",
@@ -2266,8 +2266,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_impls"
-version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.2#44016385377399b8658cb7b5494642d0feece402"
+version = "5.3.3"
+source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
 dependencies = [
  "base64 0.12.3",
  "blake2-rfc",
@@ -2301,8 +2301,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_libwallet"
-version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.2#44016385377399b8658cb7b5494642d0feece402"
+version = "5.3.3"
+source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
 dependencies = [
  "base64 0.12.3",
  "bch",
@@ -2361,8 +2361,8 @@ dependencies = [
 
 [[package]]
 name = "grin_wallet_util"
-version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.2#44016385377399b8658cb7b5494642d0feece402"
+version = "5.3.3"
+source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
 dependencies = [
  "data-encoding",
  "ed25519-dalek",
@@ -2422,9 +2422,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
 name = "hashbrown"
-version = "0.14.5"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
 
 [[package]]
 name = "heck"
@@ -2537,9 +2537,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -2753,18 +2753,18 @@ version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "hashbrown 0.12.3",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -2930,9 +2930,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.158"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "liblmdb-sys"
@@ -3240,7 +3240,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "scopeguard",
 ]
 
@@ -3473,7 +3473,7 @@ dependencies = [
 
 [[package]]
 name = "mwc713"
-version = "5.3.1"
+version = "5.3.2"
 dependencies = [
  "ansi_term 0.11.0",
  "blake2-rfc",
@@ -3533,7 +3533,7 @@ dependencies = [
  "openssl-sys",
  "schannel",
  "security-framework 2.11.1",
- "security-framework-sys 2.11.1",
+ "security-framework-sys 2.12.0",
  "tempfile",
 ]
 
@@ -3615,7 +3615,7 @@ version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "num-integer",
  "num-traits 0.2.19",
 ]
@@ -3636,7 +3636,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "num-traits 0.2.19",
 ]
 
@@ -3664,7 +3664,7 @@ version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "num-integer",
  "num-traits 0.2.19",
 ]
@@ -3675,7 +3675,7 @@ version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "num-bigint 0.2.6",
  "num-integer",
  "num-traits 0.2.19",
@@ -3707,7 +3707,7 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
@@ -3731,9 +3731,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "opaque-debug"
@@ -3770,7 +3773,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -3988,7 +3991,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4022,9 +4025,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polling"
@@ -4032,7 +4035,7 @@ version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b2d323e8ca7996b3e23126511a523f7e62924d93ecd5ae73b333815b0eb3dce"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
  "bitflags 1.3.2",
  "cfg-if 1.0.0",
  "concurrent-queue",
@@ -4090,6 +4093,12 @@ dependencies = [
  "universal-hash 0.5.1",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.20"
@@ -4555,9 +4564,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4567,9 +4576,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -4578,9 +4587,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
@@ -4974,7 +4983,7 @@ dependencies = [
  "core-foundation 0.9.4",
  "core-foundation-sys 0.8.7",
  "libc",
- "security-framework-sys 2.11.1",
+ "security-framework-sys 2.12.0",
 ]
 
 [[package]]
@@ -4989,9 +4998,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys 0.8.7",
  "libc",
@@ -5030,7 +5039,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5198,7 +5207,7 @@ version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
- "autocfg 1.3.0",
+ "autocfg 1.4.0",
 ]
 
 [[package]]
@@ -5380,9 +5389,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.77"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
@@ -5418,9 +5427,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if 1.0.0",
  "fastrand 2.1.1",
@@ -5461,22 +5470,22 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.63"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5697,7 +5706,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "toml_datetime",
  "winnow",
 ]
@@ -6081,7 +6090,7 @@ dependencies = [
  "once_cell",
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
@@ -6115,7 +6124,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -6554,7 +6563,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6574,7 +6583,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2 1.0.86",
  "quote 1.0.37",
- "syn 2.0.77",
+ "syn 2.0.79",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 6b8310b..ca06574 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mwc713"
-version = "5.3.1"
+version = "5.3.2"
 authors = ["vault713 devs"]
 description = "A wallet that makes it easy to send, store, and swap MWC."
 keywords = [ "grin", "mimblewimble", "rust", "crypto", "cryptocurrency" ]
@@ -35,34 +35,34 @@ ed25519-dalek = "1.0.0-pre.4"
 thiserror = "1"
 
 # Release
-grin_core = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_keychain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_chain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_util = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_api = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_store = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_p2p = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+#grin_core = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_keychain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_chain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_util = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_api = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_store = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_p2p = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
+#grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+#grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+#grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+#grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+#grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+#grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
 
 # For bleeding edge
-#grin_core = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_keychain = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_chain = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_util = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_api = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_store = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_p2p = { git = "https://github.com/mwcproject/mwc-node", branch = "master" }
-#grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
-#grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
-#grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
-#grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
-#grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
-#grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", branch = "master" }
+grin_core = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_keychain = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_chain = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_util = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_api = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_store = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_p2p = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
 
 # For local testing
 #grin_api = { path = "../mwc-node/api"}

From 44d085df72b15cffebc4f264423550d85611d395 Mon Sep 17 00:00:00 2001
From: bayk <konstantin.bay@gmail.com>
Date: Thu, 3 Oct 2024 15:59:28 -0700
Subject: [PATCH 5/5] switch to release build

---
 Cargo.lock | 36 ++++++++++++++++++------------------
 Cargo.toml | 52 ++++++++++++++++++++++++++--------------------------
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index c302fa7..982941b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1978,7 +1978,7 @@ dependencies = [
 [[package]]
 name = "grin_api"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "bytes 0.5.6",
  "chrono",
@@ -2012,7 +2012,7 @@ dependencies = [
 [[package]]
 name = "grin_chain"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "bit-vec",
  "bitflags 1.3.2",
@@ -2035,7 +2035,7 @@ dependencies = [
 [[package]]
 name = "grin_core"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2061,7 +2061,7 @@ dependencies = [
 [[package]]
 name = "grin_keychain"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "blake2-rfc",
  "byteorder",
@@ -2084,7 +2084,7 @@ dependencies = [
 [[package]]
 name = "grin_p2p"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "async-std",
  "bitflags 1.3.2",
@@ -2118,7 +2118,7 @@ dependencies = [
 [[package]]
 name = "grin_pool"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "blake2-rfc",
  "chrono",
@@ -2150,7 +2150,7 @@ dependencies = [
 [[package]]
 name = "grin_store"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "byteorder",
  "croaring",
@@ -2169,7 +2169,7 @@ dependencies = [
 [[package]]
 name = "grin_util"
 version = "5.3.2"
-source = "git+https://github.com/mwcproject/mwc-node?branch=5.3.100#d0626e349870237a72ddf710689c70bff3b478c9"
+source = "git+https://github.com/mwcproject/mwc-node?tag=5.3.2.2#bc491d0da86a323641482c155cf01b537235ce92"
 dependencies = [
  "backtrace",
  "base64 0.12.3",
@@ -2194,7 +2194,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_api"
 version = "5.3.3"
-source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
+source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.3#0aa096dde3718c8b2aa6c7b89913c5002dfb18f0"
 dependencies = [
  "base64 0.12.3",
  "chrono",
@@ -2218,7 +2218,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_config"
 version = "5.3.3"
-source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
+source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.3#0aa096dde3718c8b2aa6c7b89913c5002dfb18f0"
 dependencies = [
  "dirs",
  "grin_wallet_util",
@@ -2232,7 +2232,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_controller"
 version = "5.3.3"
-source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
+source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.3#0aa096dde3718c8b2aa6c7b89913c5002dfb18f0"
 dependencies = [
  "chrono",
  "colored",
@@ -2267,7 +2267,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_impls"
 version = "5.3.3"
-source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
+source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.3#0aa096dde3718c8b2aa6c7b89913c5002dfb18f0"
 dependencies = [
  "base64 0.12.3",
  "blake2-rfc",
@@ -2302,7 +2302,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_libwallet"
 version = "5.3.3"
-source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
+source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.3#0aa096dde3718c8b2aa6c7b89913c5002dfb18f0"
 dependencies = [
  "base64 0.12.3",
  "bch",
@@ -2362,7 +2362,7 @@ dependencies = [
 [[package]]
 name = "grin_wallet_util"
 version = "5.3.3"
-source = "git+https://github.com/mwcproject/mwc-wallet?branch=5.3.100#3b1dae92ac4bd3ee5467bdc268f857b7b9a4e897"
+source = "git+https://github.com/mwcproject/mwc-wallet?tag=5.3.3#0aa096dde3718c8b2aa6c7b89913c5002dfb18f0"
 dependencies = [
  "data-encoding",
  "ed25519-dalek",
@@ -2807,9 +2807,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
@@ -5819,9 +5819,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
diff --git a/Cargo.toml b/Cargo.toml
index ca06574..9bab881 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -35,34 +35,34 @@ ed25519-dalek = "1.0.0-pre.4"
 thiserror = "1"
 
 # Release
-#grin_core = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_keychain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_chain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_util = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_api = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_store = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_p2p = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2" }
-#grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-#grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-#grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-#grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-#grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
-#grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.2" }
+grin_core = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_keychain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_chain = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_util = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_api = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_store = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_p2p = { git = "https://github.com/mwcproject/mwc-node", tag = "5.3.2.2" }
+grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.3" }
+grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.3" }
+grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.3" }
+grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.3" }
+grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.3" }
+grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", tag = "5.3.3" }
 
 # For bleeding edge
-grin_core = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_keychain = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_chain = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_util = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_api = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_store = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_p2p = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
-grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
-grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
-grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
-grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
-grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
-grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+#grin_core = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_keychain = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_chain = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_util = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_api = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_store = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_p2p = { git = "https://github.com/mwcproject/mwc-node", branch = "5.3.100" }
+#grin_wallet_impls = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+#grin_wallet_libwallet = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+#grin_wallet_api = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+#grin_wallet_controller = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+#grin_wallet_config = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
+#grin_wallet_util = { git = "https://github.com/mwcproject/mwc-wallet", branch = "5.3.100" }
 
 # For local testing
 #grin_api = { path = "../mwc-node/api"}