Skip to content

Commit 50eb242

Browse files
committed
Remove RBF residues
1 parent 6d6fc46 commit 50eb242

File tree

3 files changed

+78
-36
lines changed

3 files changed

+78
-36
lines changed

client/src/client.rs

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -741,12 +741,13 @@ pub trait RpcApi: Sized {
741741
self.call("listreceivedbyaddress", handle_defaults(&mut args, &defaults))
742742
}
743743

744+
// Blackcoin: remove RBF
744745
fn create_psbt(
745746
&self,
746747
inputs: &[json::CreateRawTransactionInput],
747748
outputs: &HashMap<String, Amount>,
748749
locktime: Option<i64>,
749-
replaceable: Option<bool>,
750+
/* replaceable: Option<bool>, */
750751
) -> Result<String> {
751752
let outs_converted = serde_json::Map::from_iter(
752753
outputs.iter().map(|(k, v)| (k.clone(), serde_json::Value::from(v.to_btc()))),
@@ -757,17 +758,18 @@ pub trait RpcApi: Sized {
757758
into_json(inputs)?,
758759
into_json(outs_converted)?,
759760
into_json(locktime)?,
760-
into_json(replaceable)?,
761+
/* into_json(replaceable)?, */
761762
],
762763
)
763764
}
764765

766+
// Blackcoin: remove RBF
765767
fn create_raw_transaction_hex(
766768
&self,
767769
utxos: &[json::CreateRawTransactionInput],
768770
outs: &HashMap<String, Amount>,
769771
locktime: Option<i64>,
770-
replaceable: Option<bool>,
772+
/* replaceable: Option<bool>, */
771773
) -> Result<String> {
772774
let outs_converted = serde_json::Map::from_iter(
773775
outs.iter().map(|(k, v)| (k.clone(), serde_json::Value::from(v.to_btc()))),
@@ -776,20 +778,21 @@ pub trait RpcApi: Sized {
776778
into_json(utxos)?,
777779
into_json(outs_converted)?,
778780
opt_into_json(locktime)?,
779-
opt_into_json(replaceable)?,
781+
/* opt_into_json(replaceable)?, */
780782
];
781783
let defaults = [into_json(0i64)?, null()];
782784
self.call("createrawtransaction", handle_defaults(&mut args, &defaults))
783785
}
784786

787+
// Blackcoin: remove RBF
785788
fn create_raw_transaction(
786789
&self,
787790
utxos: &[json::CreateRawTransactionInput],
788791
outs: &HashMap<String, Amount>,
789792
locktime: Option<i64>,
790-
replaceable: Option<bool>,
793+
/* replaceable: Option<bool>, */
791794
) -> Result<Transaction> {
792-
let hex: String = self.create_raw_transaction_hex(utxos, outs, locktime, replaceable)?;
795+
let hex: String = self.create_raw_transaction_hex(utxos, outs, locktime, /* replaceable */)?;
793796
deserialize_hex(&hex)
794797
}
795798

@@ -956,32 +959,37 @@ pub trait RpcApi: Sized {
956959
self.call("getchaintips", &[])
957960
}
958961

962+
// Blackcoin: remove RBF
959963
fn send_to_address(
960964
&self,
961965
address: &Address<NetworkChecked>,
962966
amount: Amount,
963967
comment: Option<&str>,
964968
comment_to: Option<&str>,
965969
subtract_fee: Option<bool>,
970+
/*
966971
replaceable: Option<bool>,
967972
confirmation_target: Option<u32>,
968973
estimate_mode: Option<json::EstimateMode>,
974+
*/
969975
) -> Result<bitcoin::Txid> {
970976
let mut args = [
971977
address.to_string().into(),
972978
into_json(amount.to_btc())?,
973979
opt_into_json(comment)?,
974980
opt_into_json(comment_to)?,
975981
opt_into_json(subtract_fee)?,
982+
/*
976983
opt_into_json(replaceable)?,
977984
opt_into_json(confirmation_target)?,
978985
opt_into_json(estimate_mode)?,
986+
*/
979987
];
980988
self.call(
981989
"sendtoaddress",
982990
handle_defaults(
983991
&mut args,
984-
&["".into(), "".into(), false.into(), false.into(), 6.into(), null()],
992+
&["".into(), "".into(), false.into()/*, false.into(), 6.into(), null() */],
985993
),
986994
)
987995
}

0 commit comments

Comments
 (0)