Merge branch 'master' of github.com:aspectron/rusty-kaspa

Author: aspect

Cargo.lock

@@ -63,7 +63,7 @@ members = [
 
 [workspace.package]
 rust-version = "1.82.0"
-version = "1.0.0"
+version = "1.0.1"
 authors = ["Kaspa developers"]
 license = "ISC"
 repository = "https://github.com/kaspanet/rusty-kaspa"
@@ -81,61 +81,61 @@ include = [
 
 [workspace.dependencies]
 # kaspa-testing-integration = { version = "1.0.0", path = "testing/integration" }
-kaspa-addresses = { version = "1.0.0", path = "crypto/addresses" }
-kaspa-addressmanager = { version = "1.0.0", path = "components/addressmanager" }
-kaspa-bip32 = { version = "1.0.0", path = "wallet/bip32" }
-kaspa-cli = { version = "1.0.0", path = "cli" }
-kaspa-connectionmanager = { version = "1.0.0", path = "components/connectionmanager" }
-kaspa-consensus = { version = "1.0.0", path = "consensus" }
-kaspa-consensus-core = { version = "1.0.0", path = "consensus/core" }
-kaspa-consensus-client = { version = "1.0.0", path = "consensus/client" }
-kaspa-consensus-notify = { version = "1.0.0", path = "consensus/notify" }
-kaspa-consensus-wasm = { version = "1.0.0", path = "consensus/wasm" }
-kaspa-consensusmanager = { version = "1.0.0", path = "components/consensusmanager" }
-kaspa-core = { version = "1.0.0", path = "core" }
-kaspa-daemon = { version = "1.0.0", path = "daemon" }
-kaspa-database = { version = "1.0.0", path = "database" }
-kaspa-grpc-client = { version = "1.0.0", path = "rpc/grpc/client" }
-kaspa-grpc-core = { version = "1.0.0", path = "rpc/grpc/core" }
-kaspa-grpc-server = { version = "1.0.0", path = "rpc/grpc/server" }
-kaspa-hashes = { version = "1.0.0", path = "crypto/hashes" }
-kaspa-index-core = { version = "1.0.0", path = "indexes/core" }
-kaspa-index-processor = { version = "1.0.0", path = "indexes/processor" }
-kaspa-math = { version = "1.0.0", path = "math" }
-kaspa-merkle = { version = "1.0.0", path = "crypto/merkle" }
-kaspa-metrics-core = { version = "1.0.0", path = "metrics/core" }
-kaspa-mining = { version = "1.0.0", path = "mining" }
-kaspa-mining-errors = { version = "1.0.0", path = "mining/errors" }
-kaspa-muhash = { version = "1.0.0", path = "crypto/muhash" }
-kaspa-notify = { version = "1.0.0", path = "notify" }
-kaspa-p2p-flows = { version = "1.0.0", path = "protocol/flows" }
-kaspa-p2p-lib = { version = "1.0.0", path = "protocol/p2p" }
-kaspa-p2p-mining = { version = "1.0.0", path = "protocol/mining" }
-kaspa-perf-monitor = { version = "1.0.0", path = "metrics/perf_monitor" }
-kaspa-pow = { version = "1.0.0", path = "consensus/pow" }
-kaspa-rpc-core = { version = "1.0.0", path = "rpc/core" }
-kaspa-rpc-macros = { version = "1.0.0", path = "rpc/macros" }
-kaspa-rpc-service = { version = "1.0.0", path = "rpc/service" }
-kaspa-txscript = { version = "1.0.0", path = "crypto/txscript" }
-kaspa-txscript-errors = { version = "1.0.0", path = "crypto/txscript/errors" }
-kaspa-utils = { version = "1.0.0", path = "utils" }
-kaspa-utils-tower = { version = "1.0.0", path = "utils/tower" }
-kaspa-utxoindex = { version = "1.0.0", path = "indexes/utxoindex" }
-kaspa-wallet = { version = "1.0.0", path = "wallet/native" }
-kaspa-wallet-cli-wasm = { version = "1.0.0", path = "wallet/wasm" }
-kaspa-wallet-keys = { version = "1.0.0", path = "wallet/keys" }
-kaspa-wallet-pskt = { version = "1.0.0", path = "wallet/pskt" }
-kaspa-wallet-core = { version = "1.0.0", path = "wallet/core" }
-kaspa-wallet-macros = { version = "1.0.0", path = "wallet/macros" }
-kaspa-wasm = { version = "1.0.0", path = "wasm" }
-kaspa-wasm-core = { version = "1.0.0", path = "wasm/core" }
-kaspa-wrpc-client = { version = "1.0.0", path = "rpc/wrpc/client" }
-kaspa-wrpc-proxy = { version = "1.0.0", path = "rpc/wrpc/proxy" }
-kaspa-wrpc-server = { version = "1.0.0", path = "rpc/wrpc/server" }
-kaspa-wrpc-wasm = { version = "1.0.0", path = "rpc/wrpc/wasm" }
-kaspa-wrpc-example-subscriber = { version = "1.0.0", path = "rpc/wrpc/examples/subscriber" }
-kaspad = { version = "1.0.0", path = "kaspad" }
-kaspa-alloc = { version = "1.0.0", path = "utils/alloc" }
+kaspa-addresses = { version = "1.0.1", path = "crypto/addresses" }
+kaspa-addressmanager = { version = "1.0.1", path = "components/addressmanager" }
+kaspa-bip32 = { version = "1.0.1", path = "wallet/bip32" }
+kaspa-cli = { version = "1.0.1", path = "cli" }
+kaspa-connectionmanager = { version = "1.0.1", path = "components/connectionmanager" }
+kaspa-consensus = { version = "1.0.1", path = "consensus" }
+kaspa-consensus-core = { version = "1.0.1", path = "consensus/core" }
+kaspa-consensus-client = { version = "1.0.1", path = "consensus/client" }
+kaspa-consensus-notify = { version = "1.0.1", path = "consensus/notify" }
+kaspa-consensus-wasm = { version = "1.0.1", path = "consensus/wasm" }
+kaspa-consensusmanager = { version = "1.0.1", path = "components/consensusmanager" }
+kaspa-core = { version = "1.0.1", path = "core" }
+kaspa-daemon = { version = "1.0.1", path = "daemon" }
+kaspa-database = { version = "1.0.1", path = "database" }
+kaspa-grpc-client = { version = "1.0.1", path = "rpc/grpc/client" }
+kaspa-grpc-core = { version = "1.0.1", path = "rpc/grpc/core" }
+kaspa-grpc-server = { version = "1.0.1", path = "rpc/grpc/server" }
+kaspa-hashes = { version = "1.0.1", path = "crypto/hashes" }
+kaspa-index-core = { version = "1.0.1", path = "indexes/core" }
+kaspa-index-processor = { version = "1.0.1", path = "indexes/processor" }
+kaspa-math = { version = "1.0.1", path = "math" }
+kaspa-merkle = { version = "1.0.1", path = "crypto/merkle" }
+kaspa-metrics-core = { version = "1.0.1", path = "metrics/core" }
+kaspa-mining = { version = "1.0.1", path = "mining" }
+kaspa-mining-errors = { version = "1.0.1", path = "mining/errors" }
+kaspa-muhash = { version = "1.0.1", path = "crypto/muhash" }
+kaspa-notify = { version = "1.0.1", path = "notify" }
+kaspa-p2p-flows = { version = "1.0.1", path = "protocol/flows" }
+kaspa-p2p-lib = { version = "1.0.1", path = "protocol/p2p" }
+kaspa-p2p-mining = { version = "1.0.1", path = "protocol/mining" }
+kaspa-perf-monitor = { version = "1.0.1", path = "metrics/perf_monitor" }
+kaspa-pow = { version = "1.0.1", path = "consensus/pow" }
+kaspa-rpc-core = { version = "1.0.1", path = "rpc/core" }
+kaspa-rpc-macros = { version = "1.0.1", path = "rpc/macros" }
+kaspa-rpc-service = { version = "1.0.1", path = "rpc/service" }
+kaspa-txscript = { version = "1.0.1", path = "crypto/txscript" }
+kaspa-txscript-errors = { version = "1.0.1", path = "crypto/txscript/errors" }
+kaspa-utils = { version = "1.0.1", path = "utils" }
+kaspa-utils-tower = { version = "1.0.1", path = "utils/tower" }
+kaspa-utxoindex = { version = "1.0.1", path = "indexes/utxoindex" }
+kaspa-wallet = { version = "1.0.1", path = "wallet/native" }
+kaspa-wallet-cli-wasm = { version = "1.0.1", path = "wallet/wasm" }
+kaspa-wallet-keys = { version = "1.0.1", path = "wallet/keys" }
+kaspa-wallet-pskt = { version = "1.0.1", path = "wallet/pskt" }
+kaspa-wallet-core = { version = "1.0.1", path = "wallet/core" }
+kaspa-wallet-macros = { version = "1.0.1", path = "wallet/macros" }
+kaspa-wasm = { version = "1.0.1", path = "wasm" }
+kaspa-wasm-core = { version = "1.0.1", path = "wasm/core" }
+kaspa-wrpc-client = { version = "1.0.1", path = "rpc/wrpc/client" }
+kaspa-wrpc-proxy = { version = "1.0.1", path = "rpc/wrpc/proxy" }
+kaspa-wrpc-server = { version = "1.0.1", path = "rpc/wrpc/server" }
+kaspa-wrpc-wasm = { version = "1.0.1", path = "rpc/wrpc/wasm" }
+kaspa-wrpc-example-subscriber = { version = "1.0.1", path = "rpc/wrpc/examples/subscriber" }
+kaspad = { version = "1.0.1", path = "kaspad" }
+kaspa-alloc = { version = "1.0.1", path = "utils/alloc" }
 
 # external
 aes = "0.8.3"
@@ -338,3 +338,4 @@ strip = false
 
 [workspace.lints.clippy]
 empty_docs = "allow"
+uninlined_format_args = "allow"

Cargo.toml

@@ -243,10 +243,6 @@ The framework is compatible with all major desktop and mobile browsers.
 cargo run --release --bin kaspad -- --testnet
   ```
 
-  **Testnet 11**
-
-  For participation in the 10BPS test network (TN11), see the following detailed [guide](docs/testnet11.md).
-
 <details>
 
   <summary>

README.md

@@ -285,12 +285,14 @@ impl KaspaCli {
 
                         if let Ok(msg) = msg {
                             match *msg {
+                                Events::WalletList { .. } => {},
                                 Events::WalletPing => {
                                     // log_info!("Kaspa NG - received wallet ping");
                                 },
                                 Events::Metrics { network_id : _, metrics : _ } => {
                                     // log_info!("Kaspa NG - received metrics event {metrics:?}")
                                 }
+                                Events::FeeRate { .. } => {},
                                 Events::Error { message } => { terrorln!(this,"{message}"); },
                                 Events::UtxoProcStart => {},
                                 Events::UtxoProcStop => {},
@@ -787,7 +789,7 @@ impl KaspaCli {
                 }
                 SyncState::UtxoResync => Some([style("SYNC").red().to_string(), style("UTXO").black().to_string()].join(" ")),
                 SyncState::NotSynced => Some([style("SYNC").red().to_string(), style("...").black().to_string()].join(" ")),
-                SyncState::Synced { .. } => None,
+                SyncState::Synced => None,
             }
         } else {
             Some(style("SYNC").red().to_string())

cli/src/cli.rs

@@ -234,8 +234,9 @@ impl Account {
                 count = count.max(1);
 
                 let sweep = action.eq("sweep");
-
-                self.derivation_scan(&ctx, start, count, window, sweep).await?;
+                // TODO fee_rate
+                let fee_rate = None;
+                self.derivation_scan(&ctx, start, count, window, sweep, fee_rate).await?;
             }
             v => {
                 tprintln!(ctx, "unknown command: '{v}'\r\n");
@@ -276,6 +277,7 @@ impl Account {
         count: usize,
         window: usize,
         sweep: bool,
+        fee_rate: Option<f64>,
     ) -> Result<()> {
         let account = ctx.account().await?;
         let (wallet_secret, payment_secret) = ctx.ask_wallet_secret(Some(&account)).await?;
@@ -293,7 +295,9 @@ impl Account {
                 start + count,
                 window,
                 sweep,
+                fee_rate,
                 &abortable,
+                true,
                 Some(Arc::new(move |processed: usize, _, balance, txid| {
                     if let Some(txid) = txid {
                         tprintln!(

cli/src/modules/account.rs

@@ -17,13 +17,16 @@ impl Estimate {
         }
 
         let amount_sompi = try_parse_required_nonzero_kaspa_as_sompi_u64(argv.first())?;
+        // TODO fee_rate
+        let fee_rate = None;
         let priority_fee_sompi = try_parse_optional_kaspa_as_sompi_i64(argv.get(1))?.unwrap_or(0);
         let abortable = Abortable::default();
 
         // just use any address for an estimate (change address)
         let change_address = account.change_address()?;
         let destination = PaymentDestination::PaymentOutputs(PaymentOutputs::from((change_address.clone(), amount_sompi)));
-        let estimate = account.estimate(destination, priority_fee_sompi.into(), None, &abortable).await?;
+        // TODO fee_rate
+        let estimate = account.estimate(destination, fee_rate, priority_fee_sompi.into(), None, &abortable).await?;
 
         tprintln!(ctx, "Estimate - {estimate}");
 

cli/src/modules/estimate.rs

@@ -45,6 +45,8 @@ impl Pskb {
                 let signer = account
                     .pskb_from_send_generator(
                         outputs.into(),
+                        // fee_rate
+                        None,
                         priority_fee_sompi.into(),
                         None,
                         wallet_secret.clone(),
@@ -89,12 +91,15 @@ impl Pskb {
                     "lock" => {
                         let amount_sompi = try_parse_required_nonzero_kaspa_as_sompi_u64(argv.first())?;
                         let outputs = PaymentOutputs::from((script_p2sh, amount_sompi));
+                        // TODO fee_rate
+                        let fee_rate = None;
                         let priority_fee_sompi = try_parse_optional_kaspa_as_sompi_i64(argv.get(1))?.unwrap_or(0);
                         let abortable = Abortable::default();
 
                         let signer = account
                             .pskb_from_send_generator(
                                 outputs.into(),
+                                fee_rate,
                                 priority_fee_sompi.into(),
                                 None,
                                 wallet_secret.clone(),
@@ -209,13 +214,12 @@ impl Pskb {
                 for (pskt_index, bundle_inner) in pskb.0.iter().enumerate() {
                     tprintln!(ctx, "PSKT #{:03} finalized check:", pskt_index + 1);
                     let pskt: PSKT<Signer> = PSKT::<Signer>::from(bundle_inner.to_owned());
-
+                    let params = ctx.wallet().network_id()?.into();
                     let finalizer = pskt.finalizer();
-
                     if let Ok(pskt_finalizer) = finalize_pskt_one_or_more_sig_and_redeem_script(finalizer) {
                         // Verify if extraction is possible.
                         match pskt_finalizer.extractor() {
-                            Ok(ex) => match ex.extract_tx() {
+                            Ok(ex) => match ex.extract_tx(&params) {
                                 Ok(_) => tprintln!(
                                     ctx,
                                     "  Transaction extracted successfully: PSKT is finalized with a valid script signature."

cli/src/modules/pskb.rs

@@ -18,6 +18,8 @@ impl Send {
 
         let address = Address::try_from(argv.first().unwrap().as_str())?;
         let amount_sompi = try_parse_required_nonzero_kaspa_as_sompi_u64(argv.get(1))?;
+        // TODO fee_rate
+        let fee_rate = None;
         let priority_fee_sompi = try_parse_optional_kaspa_as_sompi_i64(argv.get(2))?.unwrap_or(0);
         let outputs = PaymentOutputs::from((address.clone(), amount_sompi));
         let abortable = Abortable::default();
@@ -27,6 +29,7 @@ impl Send {
         let (summary, _ids) = account
             .send(
                 outputs.into(),
+                fee_rate,
                 priority_fee_sompi.into(),
                 None,
                 wallet_secret,

cli/src/modules/send.rs

@@ -10,12 +10,15 @@ impl Sweep {
 
         let account = ctx.wallet().account()?;
         let (wallet_secret, payment_secret) = ctx.ask_wallet_secret(Some(&account)).await?;
+        // TODO fee_rate
+        let fee_rate = None;
         let abortable = Abortable::default();
         // let ctx_ = ctx.clone();
         let (summary, _ids) = account
             .sweep(
                 wallet_secret,
                 payment_secret,
+                fee_rate,
                 &abortable,
                 Some(Arc::new(move |_ptx| {
                     // tprintln!(ctx_, "Sending transaction: {}", ptx.id());

cli/src/modules/sweep.rs

@@ -21,6 +21,8 @@ impl Transfer {
             return Err("Cannot transfer to the same account".into());
         }
         let amount_sompi = try_parse_required_nonzero_kaspa_as_sompi_u64(argv.get(1))?;
+        // TODO fee_rate
+        let fee_rate = None;
         let priority_fee_sompi = try_parse_optional_kaspa_as_sompi_i64(argv.get(2))?.unwrap_or(0);
         let target_address = target_account.receive_address()?;
         let (wallet_secret, payment_secret) = ctx.ask_wallet_secret(Some(&account)).await?;
@@ -32,6 +34,7 @@ impl Transfer {
         let (summary, _ids) = account
             .send(
                 outputs.into(),
+                fee_rate,
                 priority_fee_sompi.into(),
                 None,
                 wallet_secret,