1.0.9 release, Compression and basic wallet functions

GalactechsLLC · Oct 19, 2023 · 7d80122 · 7d80122
1 parent dda93e9
commit 7d80122
Show file tree

Hide file tree

Showing 15 changed files with 306 additions and 176 deletions.
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dg_xch_cli"
-version = "1.0.8"
+version = "1.0.9"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "CLI Utilities for the Chia Blockchain"
@@ -20,12 +20,12 @@ bip39 = {version= "2.0.0", features=["rand"] }
 blst = "0.3.11"
 clap = { version = "4.4.6", features = ["derive"] }
 dashmap = "5.5.3"
-dg_xch_clients = {path = "../clients", version="1.0.8"}
-dg_xch_core = {path = "../core", version = "1.0.7", features = ["paperclip"] }
-dg_xch_keys = {path = "../keys", version="1.0.7"}
-dg_xch_pos = {path = "../proof_of_space", version="1.0.7"}
-dg_xch_puzzles = {path = "../puzzles", version="1.0.7"}
-dg_xch_serialize= {path = "../serialize", version="1.0.7"}
+dg_xch_clients = {path = "../clients", version="1.0.9"}
+dg_xch_core = {path = "../core", version = "1.0.9", features = ["paperclip"] }
+dg_xch_keys = {path = "../keys", version="1.0.9"}
+dg_xch_pos = {path = "../proof_of_space", version="1.0.9"}
+dg_xch_puzzles = {path = "../puzzles", version="1.0.9"}
+dg_xch_serialize= {path = "../serialize", version="1.0.9"}
 hex = "0.4.3"
 lazy_static = "1.4.0"
 log = "0.4.20"

diff --git a/cli/src/cli/mod.rs b/cli/src/cli/mod.rs
@@ -39,6 +39,8 @@ pub enum RootCommands {
         launcher_id: String,
         #[arg(short, long)]
         mnemonic: String,
+        #[arg(short, long)]
+        fee: Option<u64>,
     },
     #[command(about = "Gets plotnft state for launcher_id", long_about = None)]
     GetPlotnftState {

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -1,8 +1,9 @@
 pub mod cli;
 use clap::Parser;
 use cli::*;
-use dg_xch_cli::wallet_commands::{create_cold_wallet, get_plotnft_state, migrate_plot_nft};
+use dg_xch_cli::wallet_commands::{create_cold_wallet, get_plotnft_ready_state, migrate_plot_nft};
 use dg_xch_clients::rpc::full_node::FullnodeClient;
+use dg_xch_core::blockchain::sized_bytes::Bytes32;
 use simple_logger::SimpleLogger;
 use std::io::Error;
 
@@ -19,6 +20,7 @@ async fn main() -> Result<(), Error> {
             target_pool,
             launcher_id,
             mnemonic,
+            fee,
         } => {
             let host = cli.fullnode_host.unwrap_or("localhost".to_string());
             let client = FullnodeClient::new(
@@ -27,7 +29,14 @@ async fn main() -> Result<(), Error> {
                 cli.ssl_path,
                 &None,
             );
-            migrate_plot_nft(&client, &target_pool, &launcher_id, &mnemonic).await?
+            migrate_plot_nft(
+                &client,
+                &target_pool,
+                &Bytes32::from(launcher_id),
+                &mnemonic,
+                fee.unwrap_or_default(),
+            )
+            .await?
         }
         RootCommands::GetPlotnftState { launcher_id } => {
             let host = cli.fullnode_host.unwrap_or("localhost".to_string());
@@ -37,7 +46,9 @@ async fn main() -> Result<(), Error> {
                 cli.ssl_path,
                 &None,
             );
-            get_plotnft_state(&client, &launcher_id).await?
+            get_plotnft_ready_state(&client, &Bytes32::from(launcher_id))
+                .await
+                .map(|_| ())?
         }
         RootCommands::CreateWallet { action } => match action {
             WalletAction::WithNFT { .. } => {}