Merge pull request rust-bitcoin#158 from shesek/202101-core-21

Compatibility with Bitcoin Core v0.21

Author: stevenroose

.travis.yml

@@ -19,6 +19,8 @@ jobs:
       env: BITCOINVERSION=0.20.0
     - rust: stable
       env: BITCOINVERSION=0.20.1
+    - rust: stable
+      env: BITCOINVERSION=0.21.0
 
 script:
   - ./contrib/test.sh

integration_test/run.sh

@@ -19,12 +19,12 @@ PID1=$!
 sleep 3
 
 BLOCKFILTERARG=""
-if bitcoind -version | grep -q "0\.19\|0\.20"; then
+if bitcoind -version | grep -q "v0\.\(19\|2\)"; then
     BLOCKFILTERARG="-blockfilterindex=1"
 fi
 
 FALLBACKFEEARG=""
-if bitcoind -version | grep -q "0\.20"; then
+if bitcoind -version | grep -q "v0\.2"; then
     FALLBACKFEEARG="-fallbackfee=0.00001000"
 fi
 

integration_test/src/main.rs

@@ -79,6 +79,17 @@ macro_rules! assert_not_found {
     };
 }
 
+/// Assert that the call returns the specified error message.
+macro_rules! assert_error_message {
+    ($call:expr, $code:expr, $msg:expr) => {
+        match $call.unwrap_err() {
+            Error::JsonRpc(JsonRpcError::Rpc(ref e))
+                if e.code == $code && e.message.contains($msg) => {}
+            e => panic!("expected '{}' error for {}, got: {}", $msg, stringify!($call), e),
+        }
+    };
+}
+
 static mut VERSION: usize = 0;
 /// Get the version of the node that is running.
 fn version() -> usize {
@@ -111,7 +122,7 @@ fn get_auth() -> bitcoincore_rpc::Auth {
 fn main() {
     log::set_logger(&LOGGER).map(|()| log::set_max_level(log::LevelFilter::max())).unwrap();
 
-    let rpc_url = get_rpc_url();
+    let rpc_url = format!("{}/wallet/testwallet", get_rpc_url());
     let auth = get_auth();
 
     let cl = Client::new(rpc_url, auth).unwrap();
@@ -120,6 +131,8 @@ fn main() {
     unsafe { VERSION = cl.version().unwrap() };
     println!("Version: {}", version());
 
+    cl.create_wallet("testwallet", None, None, None, None).unwrap();
+
     test_get_mining_info(&cl);
     test_get_blockchain_info(&cl);
     test_get_new_address(&cl);
@@ -227,8 +240,12 @@ fn test_generate(cl: &Client) {
         assert_eq!(blocks.len(), 6);
     } else if version() < 190000 {
         assert_deprecated!(cl.generate(5, None));
-    } else {
+    } else if version() < 210000 {
         assert_not_found!(cl.generate(5, None));
+    } else {
+        // Bitcoin Core v0.21 appears to return this with a generic -1 error code,
+        // rather than the expected -32601 code (RPC_METHOD_NOT_FOUND).
+        assert_error_message!(cl.generate(5, None), -1, "replaced by the -generate cli option");
     }
 }
 
@@ -590,6 +607,7 @@ fn test_fund_raw_transaction(cl: &Client) {
     output.insert(RANDOM_ADDRESS.to_string(), btc(1));
 
     let options = json::FundRawTransactionOptions {
+        add_inputs: None,
         change_address: Some(addr),
         change_position: Some(0),
         change_type: None,
@@ -606,6 +624,7 @@ fn test_fund_raw_transaction(cl: &Client) {
     let _ = funded.transaction().unwrap();
 
     let options = json::FundRawTransactionOptions {
+        add_inputs: None,
         change_address: None,
         change_position: Some(0),
         change_type: Some(json::AddressType::Legacy),
@@ -667,6 +686,7 @@ fn test_wallet_create_funded_psbt(cl: &Client) {
     output.insert(RANDOM_ADDRESS.to_string(), btc(1));
 
     let options = json::WalletCreateFundedPsbtOptions {
+        add_inputs: None,
         change_address: None,
         change_position: Some(1),
         change_type: Some(json::AddressType::Legacy),
@@ -689,6 +709,7 @@ fn test_wallet_create_funded_psbt(cl: &Client) {
         .unwrap();
 
     let options = json::WalletCreateFundedPsbtOptions {
+        add_inputs: None,
         change_address: Some(addr),
         change_position: Some(1),
         change_type: None,
@@ -965,8 +986,9 @@ fn test_create_wallet(cl: &Client) {
 
     wallet_list.sort();
 
-    // Default wallet
-    assert_eq!(wallet_list.remove(0), "");
+    // Main wallet created for tests
+    assert!(wallet_list.iter().any(|w| w == "testwallet"));
+    wallet_list.retain(|w| w != "testwallet" && w != "");
 
     // Created wallets
     assert!(wallet_list.iter().zip(wallet_names).all(|(a, b)| a == b));

json/src/lib.rs

@@ -99,6 +99,12 @@ pub struct GetNetworkInfoResult {
     #[serde(rename = "timeoffset")]
     pub time_offset: isize,
     pub connections: usize,
+    /// The number of inbound connections
+    /// Added in Bitcoin Core v0.21
+    pub connections_in: Option<usize>,
+    /// The number of outbound connections
+    /// Added in Bitcoin Core v0.21
+    pub connections_out: Option<usize>,
     #[serde(rename = "networkactive")]
     pub network_active: bool,
     pub networks: Vec<GetNetworkInfoResultNetwork>,
@@ -544,6 +550,20 @@ pub struct TestMempoolAcceptResult {
     pub allowed: bool,
     #[serde(rename = "reject-reason")]
     pub reject_reason: Option<String>,
+    /// Virtual transaction size as defined in BIP 141 (only present when 'allowed' is true)
+    /// Added in Bitcoin Core v0.21
+    pub vsize: Option<u64>,
+    /// Transaction fees (only present if 'allowed' is true)
+    /// Added in Bitcoin Core v0.21
+    pub fees: Option<TestMempoolAcceptResultFees>,
+}
+
+#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
+pub struct TestMempoolAcceptResultFees {
+    /// Transaction fee in BTC
+    #[serde(with = "bitcoin::util::amount::serde::as_btc")]
+    pub base: Amount,
+    // unlike GetMempoolEntryResultFees, this only has the `base` fee
 }
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
@@ -781,6 +801,9 @@ pub struct GetMempoolEntryResult {
     /// Whether this transaction could be replaced due to BIP125 (replace-by-fee)
     #[serde(rename = "bip125-replaceable")]
     pub bip125_replaceable: bool,
+    /// Whether this transaction is currently unbroadcast (initial broadcast not yet acknowledged by any peers)
+    /// Added in Bitcoin Core v0.21
+    pub unbroadcast: Option<bool>,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
@@ -960,6 +983,9 @@ pub struct GetPeerInfoResult {
     /// Local address as reported by the peer
     // TODO: use a type for addrlocal
     pub addrlocal: Option<String>,
+    /// Network (ipv4, ipv6, or onion) the peer connected throug
+    /// Added in Bitcoin Core v0.21
+    pub network: Option<GetPeerInfoResultNetwork>,
     /// The services offered
     // TODO: use a type for services
     pub services: String,
@@ -969,6 +995,12 @@ pub struct GetPeerInfoResult {
     pub lastsend: u64,
     /// The time in seconds since epoch (Jan 1 1970 GMT) of the last receive
     pub lastrecv: u64,
+    /// The time in seconds since epoch (Jan 1 1970 GMT) of the last valid transaction received from this peer
+    /// Added in Bitcoin Core v0.21
+    pub last_transaction: Option<u64>,
+    /// The time in seconds since epoch (Jan 1 1970 GMT) of the last block received from this peer
+    /// Added in Bitcoin Core v0.21
+    pub last_block: Option<u64>,
     /// The total bytes sent
     pub bytessent: u64,
     /// The total bytes received
@@ -991,25 +1023,52 @@ pub struct GetPeerInfoResult {
     pub inbound: bool,
     /// Whether connection was due to `addnode`/`-connect` or if it was an
     /// automatic/inbound connection
-    pub addnode: bool,
+    /// Deprecated in Bitcoin Core v0.21
+    pub addnode: Option<bool>,
     /// The starting height (block) of the peer
     pub startingheight: i64,
     /// The ban score
-    pub banscore: i64,
+    /// Deprecated in Bitcoin Core v0.21
+    pub banscore: Option<i64>,
     /// The last header we have in common with this peer
     pub synced_headers: i64,
     /// The last block we have in common with this peer
     pub synced_blocks: i64,
     /// The heights of blocks we're currently asking from this peer
     pub inflight: Vec<u64>,
     /// Whether the peer is whitelisted
-    pub whitelisted: bool,
+    /// Deprecated in Bitcoin Core v0.21
+    pub whitelisted: Option<bool>,
     #[serde(rename = "minfeefilter", default, with = "bitcoin::util::amount::serde::as_btc::opt")]
     pub min_fee_filter: Option<Amount>,
     /// The total bytes sent aggregated by message type
     pub bytessent_per_msg: HashMap<String, u64>,
     /// The total bytes received aggregated by message type
     pub bytesrecv_per_msg: HashMap<String, u64>,
+    /// The type of the connection
+    /// Added in Bitcoin Core v0.21
+    pub connection_type: Option<GetPeerInfoResultConnectionType>,
+}
+
+#[derive(Copy, Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
+#[serde(rename_all = "lowercase")]
+pub enum GetPeerInfoResultNetwork {
+    Ipv4,
+    Ipv6,
+    Onion,
+    // this is undocumented upstream
+    Unroutable,
+}
+
+#[derive(Copy, Serialize, Deserialize, Clone, PartialEq, Eq, Debug)]
+#[serde(rename_all = "kebab-case")]
+pub enum GetPeerInfoResultConnectionType {
+    OutboundFullRelay,
+    BlockRelayOnly,
+    Inbound,
+    Manual,
+    AddrFetch,
+    Feeler,
 }
 
 /// Models the result of "estimatesmartfee"
@@ -1069,6 +1128,10 @@ pub struct WalletProcessPsbtResult {
 /// Models the request for "walletcreatefundedpsbt"
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize, Default)]
 pub struct WalletCreateFundedPsbtOptions {
+    /// For a transaction with existing inputs, automatically include more if they are not enough (default true).
+    /// Added in Bitcoin Core v0.21
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub add_inputs: Option<bool>,
     #[serde(rename = "changeAddress", skip_serializing_if = "Option::is_none")]
     pub change_address: Option<Address>,
     #[serde(rename = "changePosition", skip_serializing_if = "Option::is_none")]
@@ -1159,6 +1222,10 @@ pub struct CreateRawTransactionInput {
 #[derive(Serialize, Clone, PartialEq, Eq, Debug, Default)]
 #[serde(rename_all = "camelCase")]
 pub struct FundRawTransactionOptions {
+    /// For a transaction with existing inputs, automatically include more if they are not enough (default true).
+    /// Added in Bitcoin Core v0.21
+    #[serde(rename = "add_inputs", skip_serializing_if = "Option::is_none")]
+    pub add_inputs: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub change_address: Option<Address>,
     #[serde(skip_serializing_if = "Option::is_none")]