Updates to SSL

bls/Cargo.toml

@@ -6,4 +6,4 @@ authors = ["James Hoerr"]
 description = "IN DEVELOPMENT - BLS12-381 Rust Implementation for dg_xch_utils"
 license = "Apache-2.0"
 homepage = "https://github.com/GalactechsLLC/dg_xch_utils"
-repository = "https://github.com/GalactechsLLC/dg_xch_utils/bls"
+repository = "https://github.com/GalactechsLLC/dg_xch_utils"

cli/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "dg_xch_cli"
-version = "2.0.0"
+version = "2.0.1"
 edition = "2021"
 authors = ["James Hoerr"]
 description = "CLI Utilities for the Chia Blockchain"
 license = "Apache-2.0"
 homepage = "https://github.com/GalactechsLLC/dg_xch_utils"
-repository = "https://github.com/GalactechsLLC/dg_xch_utils/cli"
+repository = "https://github.com/GalactechsLLC/dg_xch_utils"
 
 [lib]
 name = "dg_xch_cli"
@@ -17,24 +17,24 @@ name = "dg_xch_cli"
 path = "src/main.rs"
 
 [dependencies]
-async-trait = "0.1.74"
+async-trait = "0.1.77"
 bip39 = {version= "2.0.0", features=["rand"] }
-blst = "0.3.11"
-clap = { version = "4.4.8", features = ["derive"] }
+blst = { version = "0.3.11", features = ["portable"] }
+clap = { version = "4.4.18", features = ["derive"] }
 dashmap = "5.5.3"
-dg_xch_clients = {path = "../clients", version="2.0.0"}
-dg_xch_core = {path = "../core", version = "2.0.0", features = ["paperclip"] }
-dg_xch_keys = {path = "../keys", version="2.0.0"}
-dg_xch_pos = {path = "../proof_of_space", version="2.0.0"}
-dg_xch_puzzles = {path = "../puzzles", version="2.0.0"}
-dg_xch_serialize= {path = "../serialize", version="2.0.0"}
+dg_xch_clients = {path = "../clients", version="2.0.1"}
+dg_xch_core = {path = "../core", version = "2.0.1", features = ["paperclip"] }
+dg_xch_keys = {path = "../keys", version="2.0.1"}
+dg_xch_pos = {path = "../proof_of_space", version="2.0.1"}
+dg_xch_puzzles = {path = "../puzzles", version="2.0.1"}
+dg_xch_serialize= {path = "../serialize", version="2.0.1"}
 hex = "0.4.3"
 lazy_static = "1.4.0"
 log = "0.4.20"
 num-traits = "0.2.17"
 rand = "0.8.5"
-rayon = "1.8.0"
-serde = "1.0.193"
-serde_json = "1.0.108"
-simple_logger = "4.3.0"
-tokio = {version = "1.34.0", features=["rt-multi-thread", "sync", "signal", "macros", "process", "time", "fs", "net"]}
+rayon = "1.8.1"
+serde = "1.0.195"
+serde_json = "1.0.111"
+simple_logger = "4.3.3"
+tokio = {version = "1.35.1", features=["rt-multi-thread", "sync", "signal", "macros", "process", "time", "fs", "net"]}

cli/src/cli/mod.rs

@@ -1,10 +1,13 @@
 use clap::{Parser, Subcommand};
+use dg_xch_core::blockchain::sized_bytes::Bytes32;
 
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 pub struct Cli {
     #[arg(short, long, value_name = "Path to the chia ssl folder")]
     pub ssl_path: Option<String>,
+    #[arg(short, long, value_name = "Timeout When Connecting to Fullnode")]
+    pub timeout: Option<u64>,
 
     #[arg(long, value_name = "Fullnode Hostname")]
     pub fullnode_host: Option<String>,
@@ -22,48 +25,270 @@ pub struct Cli {
 
 #[derive(Debug, Subcommand)]
 pub enum RootCommands {
-    #[command(about = "Gets coin records for a given address or puzzlehash", long_about = None)]
-    GetCoinRecord {
-        #[arg(short, long)]
-        puzzlehash: Option<String>,
-        #[arg(short, long)]
-        address: Option<String>,
-        #[arg(short, long)]
+    //START OF FULLNODE API
+    #[command(about = "Get the current BlockchainState", long_about = None)]
+    GetBlockchainState,
+    #[command(about = "Loads a FullBlock by header_hash", long_about = None)]
+    GetBlock {
+        #[arg(long)]
+        header_hash: Bytes32,
+    },
+    #[command(about = "Loads current BlockStateMetrics", long_about = None)]
+    GetBlockCountMetrics,
+    #[command(about = "Loads FullBlocks between start and end", long_about = None)]
+    GetBlocks {
+        #[arg(long)]
+        start: u32,
+        #[arg(long)]
+        end: u32,
+        #[arg(long)]
+        exclude_header_hash: bool,
+        #[arg(long)]
+        exclude_reorged: bool,
+    },
+    #[command(about = "Loads all FullBlocks between start and end", long_about = None)]
+    GetAllBlocks {
+        #[arg(long)]
+        start: u32,
+        #[arg(long)]
+        end: u32,
+    },
+    #[command(about = "Loads a BlockRecord by header_hash", long_about = None)]
+    GetBlockRecord {
+        #[arg(long)]
+        header_hash: Bytes32,
+    },
+    #[command(about = "Loads a BlockRecord by height", long_about = None)]
+    GetBlockRecordByHeight {
+        #[arg(long)]
+        height: u32,
+    },
+    #[command(about = "Loads all BlockRecords between start and end", long_about = None)]
+    GetBlockRecords {
+        #[arg(long)]
+        start: u32,
+        #[arg(long)]
+        end: u32,
+    },
+    #[command(about = "Loads UnfinishedBlocks", long_about = None)]
+    GetUnfinishedBlocks,
+    #[command(about = "Get Est network Space between two header_hashes", long_about = None)]
+    GetNetworkSpace {
+        #[arg(long)]
+        older_block_header_hash: Bytes32,
+        #[arg(long)]
+        newer_block_header_hash: Bytes32,
+    },
+    #[command(about = "Get Est network Space between two heights", long_about = None)]
+    GetNetworkSpaceaByHeight {
+        #[arg(long)]
+        start: u32,
+        #[arg(long)]
+        end: u32,
+    },
+    #[command(about = "Get additions and removals by header_hash", long_about = None)]
+    GetAdditionsAndRemovals {
+        #[arg(long)]
+        header_hash: Bytes32,
+    },
+    #[command(about = "Loads InitialFreezePeriod", long_about = None)]
+    GetInitialFreezePeriod,
+    #[command(about = "Loads InitialFreezePeriod", long_about = None)]
+    GetNetworkInfo,
+    #[command(about = "Get SignagePoint or End Of Subslot, Only Provide one of sp_hash or challenge_hash", long_about = None)]
+    GetSignagePointOrEOS {
+        #[arg(long)]
+        sp_hash: Option<Bytes32>,
+        #[arg(long)]
+        challenge_hash: Option<Bytes32>,
+    },
+    #[command(about = "Get CoinRecords by puzzle_hashs", long_about = None)]
+    GetCoinRecords {
+        #[arg(long)]
+        puzzle_hashes: Vec<Bytes32>,
+        #[arg(long)]
+        include_spent_coins: Option<bool>,
+        #[arg(long)]
+        start_height: Option<u32>,
+        #[arg(long)]
+        end_height: Option<u32>,
+    },
+    #[command(about = "Get CoinRecord by name", long_about = None)]
+    GetCoinRecordByName {
+        #[arg(long)]
+        name: Bytes32,
+    },
+    #[command(about = "Get CoinRecords by names", long_about = None)]
+    GetCoinRecordsByNames {
+        #[arg(long)]
+        names: Vec<Bytes32>,
+        #[arg(long)]
         include_spent_coins: bool,
+        #[arg(long)]
+        start_height: u32,
+        #[arg(long)]
+        end_height: u32,
+    },
+    #[command(about = "Get CoinRecords by parent ids", long_about = None)]
+    GetCoinRecordsByParentIds {
+        #[arg(long)]
+        parent_ids: Vec<Bytes32>,
+        #[arg(long)]
+        include_spent_coins: bool,
+        #[arg(long)]
+        start_height: u32,
+        #[arg(long)]
+        end_height: u32,
+    },
+    #[command(about = "Get CoinRecords by hint", long_about = None)]
+    GetCoinRecordsByhint {
+        #[arg(long)]
+        hint: Bytes32,
+        #[arg(long)]
+        include_spent_coins: bool,
+        #[arg(long)]
+        start_height: u32,
+        #[arg(long)]
+        end_height: u32,
+    },
+    #[command(about = "Get CoinSpend for coin_id at height", long_about = None)]
+    GetPuzzleAndSolution {
+        #[arg(long)]
+        coin_id: Bytes32,
+        #[arg(long)]
+        height: u32,
+    },
+    #[command(about = "Get CoinSpend for coin_id at height", long_about = None)]
+    GetCoinSpend {
+        #[arg(long)]
+        coin_id: Bytes32,
+        #[arg(long)]
+        height: u32,
+    },
+    #[command(about = "Loads All Mempool Transaction Ids", long_about = None)]
+    GetAllMempoolTxIds,
+    #[command(about = "Loads All Mempool Items", long_about = None)]
+    GetAllMempoolItems,
+    #[command(about = "Get MempoolItem with TxID", long_about = None)]
+    GetMempoolItemByTxID {
+        #[arg(long)]
+        tx_id: String,
+    },
+    #[command(about = "Get MempoolItem by name", long_about = None)]
+    GetMempoolItemByName {
+        #[arg(long)]
+        coin_name: Bytes32,
+    },
+    #[command(about = "Get MempoolItem by name", long_about = None)]
+    GetFeeEstimate {
+        #[arg(long)]
+        cost: Option<u64>,
+        #[arg(long)]
+        target_times: Vec<u64>,
+    },
+    //END FULLNODE API
+    //START EXTENDED FULLNODEAPI
+    #[command(about = "Get Singleton by LauncherID", long_about = None)]
+    GetSingletonByLauncherId {
+        #[arg(long)]
+        launcher_id: Bytes32,
+    },
+    #[command(about = "Get additions and removals with hints by header_hash", long_about = None)]
+    GetAdditionsAndRemovalsWithHints {
+        #[arg(long)]
+        header_hash: Bytes32,
+    },
+    #[command(about = "Get CoinRecords by hint", long_about = None)]
+    GetCoinRecordsByHints {
+        #[arg(long)]
+        hints: Vec<Bytes32>,
+        #[arg(long)]
+        include_spent_coins: bool,
+        #[arg(long)]
+        start_height: u32,
+        #[arg(long)]
+        end_height: u32,
+    },
+    #[command(about = "Get CoinRecords by hint", long_about = None)]
+    GetCoinRecordsByHintsPaginated {
+        #[arg(long)]
+        hints: Vec<Bytes32>,
+        #[arg(long)]
+        include_spent_coins: Option<bool>,
+        #[arg(long)]
+        start_height: Option<u32>,
+        #[arg(long)]
+        end_height: Option<u32>,
+        #[arg(long)]
+        page_size: u32,
+        #[arg(long)]
+        last_id: Option<Bytes32>,
+    },
+    #[command(about = "Get CoinRecords by hint", long_about = None)]
+    GetCoinRecordsByPuzzleHashesPaginated {
+        #[arg(long)]
+        puzzle_hashes: Vec<Bytes32>,
+        #[arg(long)]
+        include_spent_coins: Option<bool>,
+        #[arg(long)]
+        start_height: Option<u32>,
+        #[arg(long)]
+        end_height: Option<u32>,
+        #[arg(long)]
+        page_size: u32,
+        #[arg(long)]
+        last_id: Option<Bytes32>,
+    },
+    #[command(about = "Get Hints by CoinIds", long_about = None)]
+    GetHintsByCoinIds {
+        #[arg(long)]
+        coin_ids: Vec<Bytes32>,
+    },
+    #[command(about = "Get Hints by CoinIds", long_about = None)]
+    GetPuzzleAndSoultionsByNames {
+        #[arg(long)]
+        names: Vec<Bytes32>,
+        #[arg(long)]
+        include_spent_coins: Option<bool>,
+        #[arg(long)]
+        start_height: Option<u32>,
+        #[arg(long)]
+        end_height: Option<u32>,
     },
+    //END EXTENDED FULLNODE API
     #[command(about = "Migrates a PlotNFT using a mnemonic", long_about = None)]
     MovePlotNFT {
-        #[arg(short, long)]
+        #[arg(long)]
         target_pool: String,
-        #[arg(short, long)]
-        launcher_id: String,
-        #[arg(short, long)]
+        #[arg(long)]
+        launcher_id: Bytes32,
+        #[arg(long)]
         mnemonic: String,
-        #[arg(short, long)]
+        #[arg(long)]
         fee: Option<u64>,
     },
     #[command(about = "Migrates a PlotNFT using an owner_secrey_key", long_about = None)]
     MovePlotNFTWithOwnerKey {
-        #[arg(short, long)]
+        #[arg(long)]
         target_pool: String,
-        #[arg(short, long)]
-        launcher_id: String,
-        #[arg(short, long)]
+        #[arg(long)]
+        launcher_id: Bytes32,
+        #[arg(long)]
         owner_key: String,
     },
     #[command(about = "Gets plotnft state for launcher_id", long_about = None)]
     GetPlotnftState {
-        #[arg(short, long)]
-        launcher_id: String,
+        #[arg(long)]
+        launcher_id: Bytes32,
     },
     #[command(about = "Create Login link for Pool", long_about = None)]
     CreatePoolLoginLink {
-        #[arg(short, long)]
+        #[arg(long)]
         target_pool: String,
-        #[arg(short, long, num_args = 1.., value_delimiter = ',')]
-        launcher_ids: Vec<String>,
-        #[arg(short, long, num_args = 1.., value_delimiter = ',')]
-        auth_keys: Vec<String>,
+        #[arg(long, num_args = 1.., value_delimiter = ',')]
+        launcher_ids: Vec<Bytes32>,
+        #[arg(long, num_args = 1.., value_delimiter = ',')]
+        auth_keys: Vec<Bytes32>,
     },
     #[command(about = "Create a cold wallet or a PlotNFT wallet", long_about = None)]
     CreateWallet {
@@ -76,7 +301,7 @@ pub enum RootCommands {
 pub enum WalletAction {
     #[command(about = "Creates a wallet with a plotnft", long_about = None)]
     WithNFT {
-        #[arg(short, long)]
+        #[arg(long)]
         pool_url: Option<String>,
         faucet_request_url: Option<String>,
         faucet_request_payload: Option<String>,