diff --git a/client/src/client_sync/v17/blockchain.rs b/client/src/client_sync/v17/blockchain.rs index 0a5a2c7d..280db179 100644 --- a/client/src/client_sync/v17/blockchain.rs +++ b/client/src/client_sync/v17/blockchain.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getblockchaininfo` #[macro_export] -macro_rules! impl_client_v17__getblockchaininfo { +macro_rules! impl_client_v17__get_blockchain_info { () => { impl Client { pub fn get_blockchain_info(&self) -> Result { @@ -23,7 +23,7 @@ macro_rules! impl_client_v17__getblockchaininfo { /// Implements Bitcoin Core JSON-RPC API method `getbestblockhash` #[macro_export] -macro_rules! impl_client_v17__getbestblockhash { +macro_rules! impl_client_v17__get_best_block_hash { () => { impl Client { /// Gets the blockhash of the current chain tip. @@ -41,7 +41,7 @@ macro_rules! impl_client_v17__getbestblockhash { /// Implements Bitcoin Core JSON-RPC API method `getblock` #[macro_export] -macro_rules! impl_client_v17__getblock { +macro_rules! impl_client_v17__get_block { () => { impl Client { /// Gets a block by blockhash. @@ -65,7 +65,7 @@ macro_rules! impl_client_v17__getblock { /// Implements Bitcoin Core JSON-RPC API method `getblockcount` #[macro_export] -macro_rules! impl_client_v17__getblockcount { +macro_rules! impl_client_v17__get_block_count { () => { impl Client { pub fn get_block_count(&self) -> Result { @@ -77,7 +77,7 @@ macro_rules! impl_client_v17__getblockcount { /// Implements Bitcoin Core JSON-RPC API method `getblockhash` #[macro_export] -macro_rules! impl_client_v17__getblockhash { +macro_rules! impl_client_v17__get_block_hash { () => { impl Client { pub fn get_block_hash(&self, height: u64) -> Result { @@ -89,7 +89,7 @@ macro_rules! impl_client_v17__getblockhash { /// Implements Bitcoin Core JSON-RPC API method `getblockheader` #[macro_export] -macro_rules! impl_client_v17__getblockheader { +macro_rules! impl_client_v17__get_block_header { () => { impl Client { pub fn get_block_header(&self, hash: &BlockHash) -> Result { @@ -109,7 +109,7 @@ macro_rules! impl_client_v17__getblockheader { /// Implements Bitcoin Core JSON-RPC API method `getblockstats` #[macro_export] -macro_rules! impl_client_v17__getblockstats { +macro_rules! impl_client_v17__get_block_stats { () => { impl Client { pub fn get_block_stats_by_height(&self, height: u32) -> Result { @@ -125,7 +125,7 @@ macro_rules! impl_client_v17__getblockstats { /// Implements Bitcoin Core JSON-RPC API method `getchaintips` #[macro_export] -macro_rules! impl_client_v17__getchaintips { +macro_rules! impl_client_v17__get_chain_tips { () => { impl Client { pub fn get_chain_tips(&self) -> Result { self.call("getchaintips", &[]) } @@ -135,7 +135,7 @@ macro_rules! impl_client_v17__getchaintips { /// Implements Bitcoin Core JSON-RPC API method `getchaintxstats` #[macro_export] -macro_rules! impl_client_v17__getchaintxstats { +macro_rules! impl_client_v17__get_chain_tx_stats { () => { impl Client { pub fn get_chain_tx_stats(&self) -> Result { @@ -147,7 +147,7 @@ macro_rules! impl_client_v17__getchaintxstats { /// Implements Bitcoin Core JSON-RPC API method `getdifficulty` #[macro_export] -macro_rules! impl_client_v17__getdifficulty { +macro_rules! impl_client_v17__get_difficulty { () => { impl Client { pub fn get_difficulty(&self) -> Result { @@ -159,7 +159,7 @@ macro_rules! impl_client_v17__getdifficulty { /// Implements Bitcoin Core JSON-RPC API method `getmempoolancestors` #[macro_export] -macro_rules! impl_client_v17__getmempoolancestors { +macro_rules! impl_client_v17__get_mempool_ancestors { () => { impl Client { pub fn get_mempool_ancestors(&self, txid: Txid) -> Result { @@ -179,7 +179,7 @@ macro_rules! impl_client_v17__getmempoolancestors { /// Implements Bitcoin Core JSON-RPC API method `getmempooldescendants` #[macro_export] -macro_rules! impl_client_v17__getmempooldescendants { +macro_rules! impl_client_v17__get_mempool_descendants { () => { impl Client { pub fn get_mempool_descendants(&self, txid: Txid) -> Result { @@ -199,7 +199,7 @@ macro_rules! impl_client_v17__getmempooldescendants { /// Implements Bitcoin Core JSON-RPC API method `getmempoolentry` #[macro_export] -macro_rules! impl_client_v17__getmempoolentry { +macro_rules! impl_client_v17__get_mempool_entry { () => { impl Client { pub fn get_mempool_entry(&self, txid: Txid) -> Result { @@ -211,7 +211,7 @@ macro_rules! impl_client_v17__getmempoolentry { /// Implements Bitcoin Core JSON-RPC API method `getmempoolinfo` #[macro_export] -macro_rules! impl_client_v17__getmempoolinfo { +macro_rules! impl_client_v17__get_mempool_info { () => { impl Client { pub fn get_mempool_info(&self) -> Result { @@ -223,7 +223,7 @@ macro_rules! impl_client_v17__getmempoolinfo { /// Implements Bitcoin Core JSON-RPC API method `getrawmempool` #[macro_export] -macro_rules! impl_client_v17__getrawmempool { +macro_rules! impl_client_v17__get_raw_mempool { () => { impl Client { pub fn get_raw_mempool(&self) -> Result { @@ -239,7 +239,7 @@ macro_rules! impl_client_v17__getrawmempool { /// Implements Bitcoin Core JSON-RPC API method `gettxout` #[macro_export] -macro_rules! impl_client_v17__gettxout { +macro_rules! impl_client_v17__get_tx_out { () => { impl Client { pub fn get_tx_out(&self, txid: Txid, vout: u64) -> Result { @@ -251,7 +251,7 @@ macro_rules! impl_client_v17__gettxout { /// Implements Bitcoin Core JSON-RPC API method `gettxoutproof` #[macro_export] -macro_rules! impl_client_v17__gettxoutproof { +macro_rules! impl_client_v17__get_tx_out_proof { () => { impl Client { pub fn get_tx_out_proof(&self, txids: &[Txid]) -> Result { @@ -263,7 +263,7 @@ macro_rules! impl_client_v17__gettxoutproof { /// Implements Bitcoin Core JSON-RPC API method `gettxoutsetinfo` #[macro_export] -macro_rules! impl_client_v17__gettxoutsetinfo { +macro_rules! impl_client_v17__get_tx_out_set_info { () => { impl Client { pub fn get_tx_out_set_info(&self) -> Result { @@ -275,7 +275,7 @@ macro_rules! impl_client_v17__gettxoutsetinfo { /// Implements Bitcoin Core JSON-RPC API method `preciousblock` #[macro_export] -macro_rules! impl_client_v17__preciousblock { +macro_rules! impl_client_v17__precious_block { () => { impl Client { pub fn precious_block(&self, hash: BlockHash) -> Result<()> { @@ -291,7 +291,7 @@ macro_rules! impl_client_v17__preciousblock { /// Implements Bitcoin Core JSON-RPC API method `pruneblockchain` #[macro_export] -macro_rules! impl_client_v17__pruneblockchain { +macro_rules! impl_client_v17__prune_blockchain { () => { impl Client { /// Instructs the node to prune the blockchain up to a specified height or timestamp. @@ -304,7 +304,7 @@ macro_rules! impl_client_v17__pruneblockchain { /// Implements Bitcoin Core JSON-RPC API method `savemempool` #[macro_export] -macro_rules! impl_client_v17__savemempool { +macro_rules! impl_client_v17__save_mempool { () => { impl Client { pub fn save_mempool(&self) -> Result<()> { @@ -320,7 +320,7 @@ macro_rules! impl_client_v17__savemempool { /// Implements Bitcoin Core JSON-RPC API method `verifychain` #[macro_export] -macro_rules! impl_client_v17__verifychain { +macro_rules! impl_client_v17__verify_chain { () => { impl Client { pub fn verify_chain(&self) -> Result { self.call("verifychain", &[]) } @@ -330,7 +330,7 @@ macro_rules! impl_client_v17__verifychain { /// Implements Bitcoin Core JSON-RPC API method `verifytxoutproof` #[macro_export] -macro_rules! impl_client_v17__verifytxoutproof { +macro_rules! impl_client_v17__verify_tx_out_proof { () => { impl Client { // `proof` is the hex-encoded proof generated by `gettxoutproof`. diff --git a/client/src/client_sync/v17/control.rs b/client/src/client_sync/v17/control.rs index fd2c1e7c..b84bd7ce 100644 --- a/client/src/client_sync/v17/control.rs +++ b/client/src/client_sync/v17/control.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getmemoryinfo`. #[macro_export] -macro_rules! impl_client_v17__getmemoryinfo { +macro_rules! impl_client_v17__get_memory_info { () => { impl Client { pub fn get_memory_info(&self) -> Result { diff --git a/client/src/client_sync/v17/generating.rs b/client/src/client_sync/v17/generating.rs index 0b0399c6..c98b4b2d 100644 --- a/client/src/client_sync/v17/generating.rs +++ b/client/src/client_sync/v17/generating.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `generatetoaddress` #[macro_export] -macro_rules! impl_client_v17__generatetoaddress { +macro_rules! impl_client_v17__generate_to_address { () => { impl Client { pub fn generate_to_address( diff --git a/client/src/client_sync/v17/mining.rs b/client/src/client_sync/v17/mining.rs index d4b43bd3..ff870d46 100644 --- a/client/src/client_sync/v17/mining.rs +++ b/client/src/client_sync/v17/mining.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getblocktemplate` #[macro_export] -macro_rules! impl_client_v17__getblocktemplate { +macro_rules! impl_client_v17__get_block_template { () => { impl Client { pub fn get_block_template( @@ -26,7 +26,7 @@ macro_rules! impl_client_v17__getblocktemplate { /// Implements Bitcoin Core JSON-RPC API method `getmininginfo` #[macro_export] -macro_rules! impl_client_v17__getmininginfo { +macro_rules! impl_client_v17__get_mining_info { () => { impl Client { pub fn get_mining_info(&self) -> Result { @@ -38,7 +38,7 @@ macro_rules! impl_client_v17__getmininginfo { /// Implements Bitcoin Core JSON-RPC API method `getnetworkhashps` #[macro_export] -macro_rules! impl_client_v17__getnetworkhashps { +macro_rules! impl_client_v17__get_network_hashes_per_second { () => { impl Client { pub fn get_network_hash_ps(&self) -> Result { self.call("getnetworkhashps", &[]) } @@ -48,7 +48,7 @@ macro_rules! impl_client_v17__getnetworkhashps { /// Implements Bitcoin Core JSON-RPC API method `prioritisetransaction` #[macro_export] -macro_rules! impl_client_v17__prioritisetransaction { +macro_rules! impl_client_v17__prioritise_transaction { () => { impl Client { pub fn prioritise_transaction( @@ -65,7 +65,7 @@ macro_rules! impl_client_v17__prioritisetransaction { /// Implements Bitcoin Core JSON-RPC API method `submitblock` #[macro_export] -macro_rules! impl_client_v17__submitblock { +macro_rules! impl_client_v17__submit_block { () => { impl Client { pub fn submit_block(&self, block: &Block) -> Result<()> { diff --git a/client/src/client_sync/v17/mod.rs b/client/src/client_sync/v17/mod.rs index b1b2785d..d4edf062 100644 --- a/client/src/client_sync/v17/mod.rs +++ b/client/src/client_sync/v17/mod.rs @@ -27,115 +27,115 @@ crate::define_jsonrpc_minreq_client!("v17"); crate::impl_client_check_expected_server_version!({ [170200] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v17__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v17__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); +crate::impl_client_v17__get_memory_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__generate!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v17__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v17__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v17__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v17__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v17__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); /// Argument to the `Client::get_new_address_with_type` function. /// diff --git a/client/src/client_sync/v17/network.rs b/client/src/client_sync/v17/network.rs index ae04f828..d99a2721 100644 --- a/client/src/client_sync/v17/network.rs +++ b/client/src/client_sync/v17/network.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `addnode` #[macro_export] -macro_rules! impl_client_v17__addnode { +macro_rules! impl_client_v17__add_node { () => { impl Client { pub fn add_node(&self, node: &str, command: AddNodeCommand) -> Result<()> { @@ -27,7 +27,7 @@ macro_rules! impl_client_v17__addnode { /// Implements Bitcoin Core JSON-RPC API method `clearbanned` #[macro_export] -macro_rules! impl_client_v17__clearbanned { +macro_rules! impl_client_v17__clear_banned { () => { impl Client { pub fn clear_banned(&self) -> Result<()> { @@ -43,7 +43,7 @@ macro_rules! impl_client_v17__clearbanned { /// Implements Bitcoin Core JSON-RPC API method `disconnectnode` #[macro_export] -macro_rules! impl_client_v17__disconnectnode { +macro_rules! impl_client_v17__disconnect_node { () => { impl Client { pub fn disconnect_node(&self, address: &str) -> Result<()> { @@ -59,7 +59,7 @@ macro_rules! impl_client_v17__disconnectnode { /// Implements Bitcoin Core JSON-RPC API method `getaddednodeinfo` #[macro_export] -macro_rules! impl_client_v17__getaddednodeinfo { +macro_rules! impl_client_v17__get_added_node_info { () => { impl Client { pub fn get_added_node_info(&self) -> Result { @@ -71,7 +71,7 @@ macro_rules! impl_client_v17__getaddednodeinfo { /// Implements Bitcoin Core JSON-RPC API method `getnettotals` #[macro_export] -macro_rules! impl_client_v17__getnettotals { +macro_rules! impl_client_v17__get_net_totals { () => { impl Client { pub fn get_net_totals(&self) -> Result { self.call("getnettotals", &[]) } @@ -81,7 +81,7 @@ macro_rules! impl_client_v17__getnettotals { /// Implements Bitcoin Core JSON-RPC API method `getnetworkinfo` #[macro_export] -macro_rules! impl_client_v17__getnetworkinfo { +macro_rules! impl_client_v17__get_network_info { () => { impl Client { /// Returns the server version field of `GetNetworkInfo`. @@ -99,7 +99,7 @@ macro_rules! impl_client_v17__getnetworkinfo { /// Implements Bitcoin Core JSON-RPC API method `getpeerinfo` #[macro_export] -macro_rules! impl_client_v17__getpeerinfo { +macro_rules! impl_client_v17__get_peer_info { () => { impl Client { pub fn get_peer_info(&self) -> Result { self.call("getpeerinfo", &[]) } @@ -109,7 +109,7 @@ macro_rules! impl_client_v17__getpeerinfo { /// Implements Bitcoin Core JSON-RPC API method `setban` #[macro_export] -macro_rules! impl_client_v17__setban { +macro_rules! impl_client_v17__set_ban { () => { impl Client { pub fn set_ban(&self, subnet: &str, command: SetBanCommand) -> Result<()> { diff --git a/client/src/client_sync/v17/raw_transactions.rs b/client/src/client_sync/v17/raw_transactions.rs index 4cd8e489..2584ea53 100644 --- a/client/src/client_sync/v17/raw_transactions.rs +++ b/client/src/client_sync/v17/raw_transactions.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `combinepsbt` #[macro_export] -macro_rules! impl_client_v17__combinepsbt { +macro_rules! impl_client_v17__combine_psbt { () => { impl Client { pub fn combine_psbt(&self, txs: &[bitcoin::Psbt]) -> Result { @@ -24,7 +24,7 @@ macro_rules! impl_client_v17__combinepsbt { /// Implements Bitcoin Core JSON-RPC API method `combinerawtransaction` #[macro_export] -macro_rules! impl_client_v17__combinerawtransaction { +macro_rules! impl_client_v17__combine_raw_transaction { () => { impl Client { pub fn combine_raw_transaction( @@ -43,7 +43,7 @@ macro_rules! impl_client_v17__combinerawtransaction { /// Implements Bitcoin Core JSON-RPC API method `converttopsbt` #[macro_export] -macro_rules! impl_client_v17__converttopsbt { +macro_rules! impl_client_v17__convert_to_psbt { () => { impl Client { pub fn convert_to_psbt(&self, tx: &bitcoin::Transaction) -> Result { @@ -56,7 +56,7 @@ macro_rules! impl_client_v17__converttopsbt { /// Implements Bitcoin Core JSON-RPC API method `createpsbt` #[macro_export] -macro_rules! impl_client_v17__createpsbt { +macro_rules! impl_client_v17__create_psbt { () => { impl Client { pub fn create_psbt(&self, inputs: &[Input], outputs: &[Output]) -> Result { @@ -68,7 +68,7 @@ macro_rules! impl_client_v17__createpsbt { /// Implements Bitcoin Core JSON-RPC API method `createrawtransaction` #[macro_export] -macro_rules! impl_client_v17__createrawtransaction { +macro_rules! impl_client_v17__create_raw_transaction { () => { impl Client { pub fn create_raw_transaction( @@ -84,7 +84,7 @@ macro_rules! impl_client_v17__createrawtransaction { /// Implements Bitcoin Core JSON-RPC API method `decodepsbt` #[macro_export] -macro_rules! impl_client_v17__decodepsbt { +macro_rules! impl_client_v17__decode_psbt { () => { impl Client { pub fn decode_psbt(&self, psbt: &str) -> Result { @@ -96,7 +96,7 @@ macro_rules! impl_client_v17__decodepsbt { /// Implements Bitcoin Core JSON-RPC API method `finalizepsbt` #[macro_export] -macro_rules! impl_client_v17__finalizepsbt { +macro_rules! impl_client_v17__finalize_psbt { () => { impl Client { pub fn finalize_psbt(&self, psbt: &bitcoin::Psbt) -> Result { @@ -109,7 +109,7 @@ macro_rules! impl_client_v17__finalizepsbt { /// Implements Bitcoin Core JSON-RPC API method `decoderawtransaction` #[macro_export] -macro_rules! impl_client_v17__decoderawtransaction { +macro_rules! impl_client_v17__decode_raw_transaction { () => { impl Client { pub fn decode_raw_transaction( @@ -125,7 +125,7 @@ macro_rules! impl_client_v17__decoderawtransaction { /// Implements Bitcoin Core JSON-RPC API method `decodescript` #[macro_export] -macro_rules! impl_client_v17__decodescript { +macro_rules! impl_client_v17__decode_script { () => { impl Client { // Arg is the hex encoded script we want to decode. @@ -138,7 +138,7 @@ macro_rules! impl_client_v17__decodescript { /// Implements Bitcoin Core JSON-RPC API method `fundrawtransaction` #[macro_export] -macro_rules! impl_client_v17__fundrawtransaction { +macro_rules! impl_client_v17__fund_raw_transaction { () => { impl Client { pub fn fund_raw_transaction( @@ -154,7 +154,7 @@ macro_rules! impl_client_v17__fundrawtransaction { /// Implements Bitcoin Core JSON-RPC API method `getrawtransaction` #[macro_export] -macro_rules! impl_client_v17__getrawtransaction { +macro_rules! impl_client_v17__get_raw_transaction { () => { impl Client { pub fn get_raw_transaction(&self, txid: bitcoin::Txid) -> Result { @@ -173,7 +173,7 @@ macro_rules! impl_client_v17__getrawtransaction { /// Implements Bitcoin Core JSON-RPC API method `sendrawtransaction` #[macro_export] -macro_rules! impl_client_v17__sendrawtransaction { +macro_rules! impl_client_v17__send_raw_transaction { () => { impl Client { pub fn send_raw_transaction( @@ -189,7 +189,7 @@ macro_rules! impl_client_v17__sendrawtransaction { /// Implements Bitcoin Core JSON-RPC API method `signrawtransaction` #[macro_export] -macro_rules! impl_client_v17__signrawtransaction { +macro_rules! impl_client_v17__sign_raw_transaction { () => { impl Client { pub fn sign_raw_transaction( @@ -205,7 +205,7 @@ macro_rules! impl_client_v17__signrawtransaction { /// Implements Bitcoin Core JSON-RPC API method `signrawtransactionwithkey` #[macro_export] -macro_rules! impl_client_v17__signrawtransactionwithkey { +macro_rules! impl_client_v17__sign_raw_transaction_with_key { () => { impl Client { pub fn sign_raw_transaction_with_key( @@ -223,7 +223,7 @@ macro_rules! impl_client_v17__signrawtransactionwithkey { /// Implements Bitcoin Core JSON-RPC API method `testmempoolaccept` #[macro_export] -macro_rules! impl_client_v17__testmempoolaccept { +macro_rules! impl_client_v17__test_mempool_accept { () => { impl Client { pub fn test_mempool_accept( diff --git a/client/src/client_sync/v17/util.rs b/client/src/client_sync/v17/util.rs index 68f6ecb3..31c27ea1 100644 --- a/client/src/client_sync/v17/util.rs +++ b/client/src/client_sync/v17/util.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `createmultisig` #[macro_export] -macro_rules! impl_client_v17__createmultisig { +macro_rules! impl_client_v17__create_multisig { () => { impl Client { pub fn create_multisig( @@ -27,7 +27,7 @@ macro_rules! impl_client_v17__createmultisig { /// Implements Bitcoin Core JSON-RPC API method `estimatesmartfee` #[macro_export] -macro_rules! impl_client_v17__estimatesmartfee { +macro_rules! impl_client_v17__estimate_smart_fee { () => { impl Client { pub fn estimate_smart_fee(&self, blocks: u32) -> Result { @@ -39,7 +39,7 @@ macro_rules! impl_client_v17__estimatesmartfee { /// Implements Bitcoin Core JSON-RPC API method `signmessagewithprivkey` #[macro_export] -macro_rules! impl_client_v17__signmessagewithprivkey { +macro_rules! impl_client_v17__sign_message_with_priv_key { () => { impl Client { pub fn sign_message_with_privkey( @@ -55,7 +55,7 @@ macro_rules! impl_client_v17__signmessagewithprivkey { /// Implements Bitcoin Core JSON-RPC API method `validateaddress` #[macro_export] -macro_rules! impl_client_v17__validateaddress { +macro_rules! impl_client_v17__validate_address { () => { impl Client { pub fn validate_address( @@ -70,7 +70,7 @@ macro_rules! impl_client_v17__validateaddress { /// Implements Bitcoin Core JSON-RPC API method `verifymessage` #[macro_export] -macro_rules! impl_client_v17__verifymessage { +macro_rules! impl_client_v17__verify_message { () => { impl Client { pub fn verify_message( diff --git a/client/src/client_sync/v17/wallet.rs b/client/src/client_sync/v17/wallet.rs index 138ac1df..8c20e300 100644 --- a/client/src/client_sync/v17/wallet.rs +++ b/client/src/client_sync/v17/wallet.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `addmultisigaddress`. #[macro_export] -macro_rules! impl_client_v17__addmultisigaddress { +macro_rules! impl_client_v17__add_multisig_address { () => { impl Client { pub fn add_multisig_address_with_keys( @@ -35,7 +35,7 @@ macro_rules! impl_client_v17__addmultisigaddress { /// Implements Bitcoin Core JSON-RPC API method `bumpfee`. #[macro_export] -macro_rules! impl_client_v17__bumpfee { +macro_rules! impl_client_v17__bump_fee { () => { impl Client { pub fn bump_fee(&self, txid: Txid) -> Result { @@ -47,7 +47,7 @@ macro_rules! impl_client_v17__bumpfee { /// Implements Bitcoin Core JSON-RPC API method `createwallet`. #[macro_export] -macro_rules! impl_client_v17__createwallet { +macro_rules! impl_client_v17__create_wallet { () => { impl Client { pub fn create_wallet(&self, wallet: &str) -> Result { @@ -59,7 +59,7 @@ macro_rules! impl_client_v17__createwallet { /// Implements Bitcoin Core JSON-RPC API method `dumpprivkey`. #[macro_export] -macro_rules! impl_client_v17__dumpprivkey { +macro_rules! impl_client_v17__dump_priv_key { () => { impl Client { pub fn dump_priv_key(&self, address: &Address) -> Result { @@ -71,7 +71,7 @@ macro_rules! impl_client_v17__dumpprivkey { /// Implements Bitcoin Core JSON-RPC API method `dumpwallet`. #[macro_export] -macro_rules! impl_client_v17__dumpwallet { +macro_rules! impl_client_v17__dump_wallet { () => { impl Client { // filename is either absolute or relative to bitcoind. @@ -84,7 +84,7 @@ macro_rules! impl_client_v17__dumpwallet { /// Implements Bitcoin Core JSON-RPC API method `getaddressesbylabel`. #[macro_export] -macro_rules! impl_client_v17__getaddressesbylabel { +macro_rules! impl_client_v17__get_addresses_by_label { () => { impl Client { pub fn get_addresses_by_label(&self, label: &str) -> Result { @@ -96,7 +96,7 @@ macro_rules! impl_client_v17__getaddressesbylabel { /// Implements Bitcoin Core JSON-RPC API method `getaddressinfo`. #[macro_export] -macro_rules! impl_client_v17__getaddressinfo { +macro_rules! impl_client_v17__get_address_info { () => { impl Client { pub fn get_address_info(&self, address: &Address) -> Result { @@ -108,7 +108,7 @@ macro_rules! impl_client_v17__getaddressinfo { /// Implements Bitcoin Core JSON-RPC API method `getbalance`. #[macro_export] -macro_rules! impl_client_v17__getbalance { +macro_rules! impl_client_v17__get_balance { () => { impl Client { pub fn get_balance(&self) -> Result { self.call("getbalance", &[]) } @@ -118,7 +118,7 @@ macro_rules! impl_client_v17__getbalance { /// Implements Bitcoin Core JSON-RPC API method `getnewaddress`. #[macro_export] -macro_rules! impl_client_v17__getnewaddress { +macro_rules! impl_client_v17__get_new_address { () => { impl Client { /// Gets a new address from `bitcoind` and parses it assuming its correct. @@ -166,7 +166,7 @@ macro_rules! impl_client_v17__getnewaddress { /// Implements Bitcoin Core JSON-RPC API method `getrawchangeaddress`. #[macro_export] -macro_rules! impl_client_v17__getrawchangeaddress { +macro_rules! impl_client_v17__get_raw_change_address { () => { impl Client { pub fn get_raw_change_address(&self) -> Result { @@ -178,7 +178,7 @@ macro_rules! impl_client_v17__getrawchangeaddress { /// Implements Bitcoin Core JSON-RPC API method `getreceivedbyaddress`. #[macro_export] -macro_rules! impl_client_v17__getreceivedbyaddress { +macro_rules! impl_client_v17__get_received_by_address { () => { impl Client { pub fn get_received_by_address( @@ -193,7 +193,7 @@ macro_rules! impl_client_v17__getreceivedbyaddress { /// Implements Bitcoin Core JSON-RPC API method `gettransaction`. #[macro_export] -macro_rules! impl_client_v17__gettransaction { +macro_rules! impl_client_v17__get_transaction { () => { impl Client { pub fn get_transaction(&self, txid: Txid) -> Result { @@ -205,7 +205,7 @@ macro_rules! impl_client_v17__gettransaction { /// Implements Bitcoin Core JSON-RPC API method `getunconfirmedbalance`. #[macro_export] -macro_rules! impl_client_v17__getunconfirmedbalance { +macro_rules! impl_client_v17__get_unconfirmed_balance { () => { impl Client { pub fn get_unconfirmed_balance(&self) -> Result { @@ -217,7 +217,7 @@ macro_rules! impl_client_v17__getunconfirmedbalance { /// Implements Bitcoin Core JSON-RPC API method `getwalletinfo`. #[macro_export] -macro_rules! impl_client_v17__getwalletinfo { +macro_rules! impl_client_v17__get_wallet_info { () => { impl Client { pub fn get_wallet_info(&self) -> Result { @@ -229,7 +229,7 @@ macro_rules! impl_client_v17__getwalletinfo { /// Implements Bitcoin Core JSON-RPC API method `listaddressgroupings`. #[macro_export] -macro_rules! impl_client_v17__listaddressgroupings { +macro_rules! impl_client_v17__list_address_groupings { () => { impl Client { pub fn list_address_groupings(&self) -> Result { @@ -241,7 +241,7 @@ macro_rules! impl_client_v17__listaddressgroupings { /// Implements Bitcoin Core JSON-RPC API method `listlabels`. #[macro_export] -macro_rules! impl_client_v17__listlabels { +macro_rules! impl_client_v17__list_labels { () => { impl Client { pub fn list_labels(&self) -> Result { self.call("listlabels", &[]) } @@ -251,7 +251,7 @@ macro_rules! impl_client_v17__listlabels { /// Implements Bitcoin Core JSON-RPC API method `listlockunspent`. #[macro_export] -macro_rules! impl_client_v17__listlockunspent { +macro_rules! impl_client_v17__list_lock_unspent { () => { impl Client { pub fn list_lock_unspent(&self) -> Result { @@ -263,7 +263,7 @@ macro_rules! impl_client_v17__listlockunspent { /// Implements Bitcoin Core JSON-RPC API method `listreceivedbyaddress`. #[macro_export] -macro_rules! impl_client_v17__listreceivedbyaddress { +macro_rules! impl_client_v17__list_received_by_address { () => { impl Client { pub fn list_received_by_address(&self) -> Result { @@ -275,7 +275,7 @@ macro_rules! impl_client_v17__listreceivedbyaddress { /// Implements Bitcoin Core JSON-RPC API method `listsinceblock`. #[macro_export] -macro_rules! impl_client_v17__listsinceblock { +macro_rules! impl_client_v17__list_since_block { () => { impl Client { pub fn list_since_block(&self) -> Result { @@ -287,7 +287,7 @@ macro_rules! impl_client_v17__listsinceblock { /// Implements Bitcoin Core JSON-RPC API method `listtransactions`. #[macro_export] -macro_rules! impl_client_v17__listtransactions { +macro_rules! impl_client_v17__list_transactions { () => { impl Client { pub fn list_transactions(&self) -> Result { @@ -299,7 +299,7 @@ macro_rules! impl_client_v17__listtransactions { /// Implements Bitcoin Core JSON-RPC API method `listunspent`. #[macro_export] -macro_rules! impl_client_v17__listunspent { +macro_rules! impl_client_v17__list_unspent { () => { impl Client { pub fn list_unspent(&self) -> Result { self.call("listunspent", &[]) } @@ -309,7 +309,7 @@ macro_rules! impl_client_v17__listunspent { /// Implements Bitcoin Core JSON-RPC API method `listwallets`. #[macro_export] -macro_rules! impl_client_v17__listwallets { +macro_rules! impl_client_v17__list_wallets { () => { impl Client { pub fn list_wallets(&self) -> Result { self.call("listwallets", &[]) } @@ -319,7 +319,7 @@ macro_rules! impl_client_v17__listwallets { /// Implements Bitcoin Core JSON-RPC API method `loadwallet`. #[macro_export] -macro_rules! impl_client_v17__loadwallet { +macro_rules! impl_client_v17__load_wallet { () => { impl Client { pub fn load_wallet(&self, filename: &str) -> Result { @@ -331,7 +331,7 @@ macro_rules! impl_client_v17__loadwallet { /// Implements Bitcoin Core JSON-RPC API method `rescanblockchain`. #[macro_export] -macro_rules! impl_client_v17__rescanblockchain { +macro_rules! impl_client_v17__rescan_blockchain { () => { impl Client { pub fn rescan_blockchain(&self) -> Result { @@ -343,7 +343,7 @@ macro_rules! impl_client_v17__rescanblockchain { /// Implements Bitcoin Core JSON-RPC API method `sendmany`. #[macro_export] -macro_rules! impl_client_v17__sendmany { +macro_rules! impl_client_v17__send_many { () => { impl Client { pub fn send_many(&self, amounts: BTreeMap) -> Result { @@ -356,7 +356,7 @@ macro_rules! impl_client_v17__sendmany { /// Implements Bitcoin Core JSON-RPC API method `sendtoaddress`. #[macro_export] -macro_rules! impl_client_v17__sendtoaddress { +macro_rules! impl_client_v17__send_to_address { () => { impl Client { // Send to address - no RBF. @@ -396,7 +396,7 @@ macro_rules! impl_client_v17__sendtoaddress { /// Implements Bitcoin Core JSON-RPC API method `signmessage`. #[macro_export] -macro_rules! impl_client_v17__signmessage { +macro_rules! impl_client_v17__sign_message { () => { impl Client { pub fn sign_message(&self, address: &Address, message: &str) -> Result { @@ -408,7 +408,7 @@ macro_rules! impl_client_v17__signmessage { /// Implements Bitcoin Core JSON-RPC API method `signrawtransactionwithwallet`. #[macro_export] -macro_rules! impl_client_v17__signrawtransactionwithwallet { +macro_rules! impl_client_v17__sign_raw_transaction_with_wallet { () => { impl Client { // `hexstring`: The transaction hex string. @@ -425,7 +425,7 @@ macro_rules! impl_client_v17__signrawtransactionwithwallet { /// Implements Bitcoin Core JSON-RPC API method `unloadwallet`. #[macro_export] -macro_rules! impl_client_v17__unloadwallet { +macro_rules! impl_client_v17__unload_wallet { () => { impl Client { pub fn unload_wallet(&self, wallet_name: &str) -> Result<()> { @@ -441,7 +441,7 @@ macro_rules! impl_client_v17__unloadwallet { /// Implements Bitcoin Core JSON-RPC API method `walletcreatefundedpsbt`. #[macro_export] -macro_rules! impl_client_v17__walletcreatefundedpsbt { +macro_rules! impl_client_v17__wallet_create_funded_psbt { () => { impl Client { pub fn wallet_create_funded_psbt( @@ -457,7 +457,7 @@ macro_rules! impl_client_v17__walletcreatefundedpsbt { /// Implements Bitcoin Core JSON-RPC API method `walletprocesspsbt`. #[macro_export] -macro_rules! impl_client_v17__walletprocesspsbt { +macro_rules! impl_client_v17__wallet_process_psbt { () => { impl Client { pub fn wallet_process_psbt(&self, psbt: &bitcoin::Psbt) -> Result { diff --git a/client/src/client_sync/v18/control.rs b/client/src/client_sync/v18/control.rs index d43fe3c1..a42efc11 100644 --- a/client/src/client_sync/v18/control.rs +++ b/client/src/client_sync/v18/control.rs @@ -9,7 +9,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getrpcinfo`. #[macro_export] -macro_rules! impl_client_v18__getrpcinfo { +macro_rules! impl_client_v18__get_rpc_info { () => { impl Client { pub fn get_rpc_info(&self) -> Result { self.call("getrpcinfo", &[]) } diff --git a/client/src/client_sync/v18/mod.rs b/client/src/client_sync/v18/mod.rs index 0c876569..5c0c49a0 100644 --- a/client/src/client_sync/v18/mod.rs +++ b/client/src/client_sync/v18/mod.rs @@ -30,117 +30,117 @@ crate::define_jsonrpc_minreq_client!("v18"); crate::impl_client_check_expected_server_version!({ [180100] }); // == Blockchain == -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v17__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v17__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__generate!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v17__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v17__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v17__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v17__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v17__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v18/network.rs b/client/src/client_sync/v18/network.rs index 25d1454d..f493189a 100644 --- a/client/src/client_sync/v18/network.rs +++ b/client/src/client_sync/v18/network.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getnodeaddresses` #[macro_export] -macro_rules! impl_client_v18__getnodeaddresses { +macro_rules! impl_client_v18__get_node_addresses { () => { impl Client { pub fn get_node_addresses(&self) -> Result { diff --git a/client/src/client_sync/v18/raw_transactions.rs b/client/src/client_sync/v18/raw_transactions.rs index 0c2eaf9d..fb63eeb4 100644 --- a/client/src/client_sync/v18/raw_transactions.rs +++ b/client/src/client_sync/v18/raw_transactions.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `analyzepsbt` #[macro_export] -macro_rules! impl_client_v18__analyzepsbt { +macro_rules! impl_client_v18__analyze_psbt { () => { impl Client { pub fn analyze_psbt(&self, psbt: &bitcoin::Psbt) -> Result { @@ -24,7 +24,7 @@ macro_rules! impl_client_v18__analyzepsbt { /// Implements Bitcoin Core JSON-RPC API method `joinpsbts` #[macro_export] -macro_rules! impl_client_v18__joinpsbts { +macro_rules! impl_client_v18__join_psbts { () => { impl Client { pub fn join_psbts(&self, psbts: &[bitcoin::Psbt]) -> Result { @@ -37,7 +37,7 @@ macro_rules! impl_client_v18__joinpsbts { /// Implements Bitcoin Core JSON-RPC API method `uxtoupdatepsbt` #[macro_export] -macro_rules! impl_client_v18__utxoupdatepsbt { +macro_rules! impl_client_v18__utxo_update_psbt { () => { impl Client { pub fn utxo_update_psbt(&self, psbt: &bitcoin::Psbt) -> Result { diff --git a/client/src/client_sync/v19/blockchain.rs b/client/src/client_sync/v19/blockchain.rs index 7b7d5aea..666549bc 100644 --- a/client/src/client_sync/v19/blockchain.rs +++ b/client/src/client_sync/v19/blockchain.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getblockfilter` #[macro_export] -macro_rules! impl_client_v19__getblockfilter { +macro_rules! impl_client_v19__get_block_filter { () => { impl Client { pub fn get_block_filter(&self, block: BlockHash) -> Result { diff --git a/client/src/client_sync/v19/mod.rs b/client/src/client_sync/v19/mod.rs index 3d97087f..f1bad9c5 100644 --- a/client/src/client_sync/v19/mod.rs +++ b/client/src/client_sync/v19/mod.rs @@ -28,118 +28,118 @@ crate::define_jsonrpc_minreq_client!("v19"); crate::impl_client_check_expected_server_version!({ [190100] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v17__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v17__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v17__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v17__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v17__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v17__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v17__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v19/wallet.rs b/client/src/client_sync/v19/wallet.rs index 26af03d1..5706aff7 100644 --- a/client/src/client_sync/v19/wallet.rs +++ b/client/src/client_sync/v19/wallet.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getbalances` #[macro_export] -macro_rules! impl_client_v19__getbalances { +macro_rules! impl_client_v19__get_balances { () => { impl Client { pub fn get_balances(&self) -> Result { self.call("getbalances", &[]) } diff --git a/client/src/client_sync/v20.rs b/client/src/client_sync/v20.rs deleted file mode 100644 index 80816ef8..00000000 --- a/client/src/client_sync/v20.rs +++ /dev/null @@ -1,142 +0,0 @@ -// SPDX-License-Identifier: CC0-1.0 - -//! A JSON-RPC client for testing against Bitcoin Core `v0.20`. -//! -//! We ignore option arguments unless they effect the shape of the returned JSON data. - -use std::collections::BTreeMap; -use std::path::Path; - -use bitcoin::address::{Address, NetworkChecked}; -use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; - -use crate::client_sync::into_json; -use crate::types::v20::*; - -#[rustfmt::skip] // Keep public re-exports separate. -pub use crate::client_sync::{ - v17::{ - AddressType, AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput - }, -}; - -crate::define_jsonrpc_minreq_client!("v20"); -crate::impl_client_check_expected_server_version!({ [200200] }); - -// == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v17__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); - -// == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); -crate::impl_client_v17__help!(); -crate::impl_client_v17__logging!(); -crate::impl_client_v17__stop!(); -crate::impl_client_v17__uptime!(); - -// == Generating == -crate::impl_client_v17__generatetoaddress!(); -crate::impl_client_v17__invalidateblock!(); - -// == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); - -// == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); - -// == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); - -// == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); - -// == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v17__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v17__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v17__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); diff --git a/client/src/client_sync/v20/mod.rs b/client/src/client_sync/v20/mod.rs new file mode 100644 index 00000000..f7fddc46 --- /dev/null +++ b/client/src/client_sync/v20/mod.rs @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! A JSON-RPC client for testing against Bitcoin Core `v0.20`. +//! +//! We ignore option arguments unless they effect the shape of the returned JSON data. + +use std::collections::BTreeMap; +use std::path::Path; + +use bitcoin::address::{Address, NetworkChecked}; +use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; + +use crate::client_sync::into_json; +use crate::types::v20::*; + +#[rustfmt::skip] // Keep public re-exports separate. +pub use crate::client_sync::{ + v17::{ + AddressType, AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput + }, +}; + +crate::define_jsonrpc_minreq_client!("v20"); +crate::impl_client_check_expected_server_version!({ [200200] }); + +// == Blockchain == +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v17__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); + +// == Control == +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); +crate::impl_client_v17__help!(); +crate::impl_client_v17__logging!(); +crate::impl_client_v17__stop!(); +crate::impl_client_v17__uptime!(); + +// == Generating == +crate::impl_client_v17__generate_to_address!(); +crate::impl_client_v17__invalidateblock!(); + +// == Mining == +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); + +// == Network == +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); + +// == Rawtransactions == +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); + +// == Util == +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); + +// == Wallet == +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v17__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v17__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v21/mod.rs b/client/src/client_sync/v21/mod.rs index c6f37d9b..e43d8b0b 100644 --- a/client/src/client_sync/v21/mod.rs +++ b/client/src/client_sync/v21/mod.rs @@ -27,118 +27,118 @@ crate::define_jsonrpc_minreq_client!("v21"); crate::impl_client_check_expected_server_version!({ [210200] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v17__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v17__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v17__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v17__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v17__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v21/wallet.rs b/client/src/client_sync/v21/wallet.rs index 123deb4e..0d5ea88a 100644 --- a/client/src/client_sync/v21/wallet.rs +++ b/client/src/client_sync/v21/wallet.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `unloadwallet` #[macro_export] -macro_rules! impl_client_v21__unloadwallet { +macro_rules! impl_client_v21__unload_wallet { () => { impl Client { pub fn unload_wallet(&self, wallet: &str) -> Result { diff --git a/client/src/client_sync/v22/mod.rs b/client/src/client_sync/v22/mod.rs index a0dcd3ac..dd58f321 100644 --- a/client/src/client_sync/v22/mod.rs +++ b/client/src/client_sync/v22/mod.rs @@ -27,118 +27,118 @@ crate::define_jsonrpc_minreq_client!("v22"); crate::impl_client_check_expected_server_version!({ [220100] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v17__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v17__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v17__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v17__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v17__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v17__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v22/wallet.rs b/client/src/client_sync/v22/wallet.rs index 05e8a680..64c4583e 100644 --- a/client/src/client_sync/v22/wallet.rs +++ b/client/src/client_sync/v22/wallet.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `loadwallet` #[macro_export] -macro_rules! impl_client_v22__loadwallet { +macro_rules! impl_client_v22__load_wallet { () => { impl Client { pub fn load_wallet(&self, wallet: &str) -> Result { diff --git a/client/src/client_sync/v23/blockchain.rs b/client/src/client_sync/v23/blockchain.rs index e7855ec0..d528b966 100644 --- a/client/src/client_sync/v23/blockchain.rs +++ b/client/src/client_sync/v23/blockchain.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `savemempool` #[macro_export] -macro_rules! impl_client_v23__savemempool { +macro_rules! impl_client_v23__save_mempool { () => { impl Client { pub fn save_mempool(&self) -> Result { self.call("savemempool", &[]) } diff --git a/client/src/client_sync/v23/mod.rs b/client/src/client_sync/v23/mod.rs index d1476e80..8e78122e 100644 --- a/client/src/client_sync/v23/mod.rs +++ b/client/src/client_sync/v23/mod.rs @@ -29,121 +29,121 @@ crate::define_jsonrpc_minreq_client!("v23"); crate::impl_client_check_expected_server_version!({ [230200] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); /// Argument to the `Client::get_new_address_with_type` function. /// diff --git a/client/src/client_sync/v23/wallet.rs b/client/src/client_sync/v23/wallet.rs index b9a59075..6e08d156 100644 --- a/client/src/client_sync/v23/wallet.rs +++ b/client/src/client_sync/v23/wallet.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `createwallet`. #[macro_export] -macro_rules! impl_client_v23__createwallet { +macro_rules! impl_client_v23__create_wallet { () => { impl Client { /// Calls `createwallet` with `wallet` as the only argument. diff --git a/client/src/client_sync/v24.rs b/client/src/client_sync/v24.rs deleted file mode 100644 index 27cd4b59..00000000 --- a/client/src/client_sync/v24.rs +++ /dev/null @@ -1,143 +0,0 @@ -// SPDX-License-Identifier: CC0-1.0 - -//! A JSON-RPC client for testing against Bitcoin Core `v24`. -//! -//! We ignore option arguments unless they effect the shape of the returned JSON data. - -use std::collections::BTreeMap; -use std::path::Path; - -use bitcoin::address::{Address, NetworkChecked}; -use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; - -use crate::client_sync::into_json; -use crate::types::v24::*; - -#[rustfmt::skip] // Keep public re-exports separate. -pub use crate::client_sync::{ - v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput - }, - v23::AddressType, -}; - -crate::define_jsonrpc_minreq_client!("v24"); -crate::impl_client_check_expected_server_version!({ [240200] }); - -// == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); - -// == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); -crate::impl_client_v17__help!(); -crate::impl_client_v17__logging!(); -crate::impl_client_v17__stop!(); -crate::impl_client_v17__uptime!(); - -// == Generating == -crate::impl_client_v17__generatetoaddress!(); -crate::impl_client_v17__invalidateblock!(); - -// == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); - -// == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); - -// == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); - -// == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); - -// == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); diff --git a/client/src/client_sync/v24/mod.rs b/client/src/client_sync/v24/mod.rs new file mode 100644 index 00000000..89e291b7 --- /dev/null +++ b/client/src/client_sync/v24/mod.rs @@ -0,0 +1,143 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! A JSON-RPC client for testing against Bitcoin Core `v24`. +//! +//! We ignore option arguments unless they effect the shape of the returned JSON data. + +use std::collections::BTreeMap; +use std::path::Path; + +use bitcoin::address::{Address, NetworkChecked}; +use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; + +use crate::client_sync::into_json; +use crate::types::v24::*; + +#[rustfmt::skip] // Keep public re-exports separate. +pub use crate::client_sync::{ + v17::{ + AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput + }, + v23::AddressType, +}; + +crate::define_jsonrpc_minreq_client!("v24"); +crate::impl_client_check_expected_server_version!({ [240200] }); + +// == Blockchain == +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); + +// == Control == +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); +crate::impl_client_v17__help!(); +crate::impl_client_v17__logging!(); +crate::impl_client_v17__stop!(); +crate::impl_client_v17__uptime!(); + +// == Generating == +crate::impl_client_v17__generate_to_address!(); +crate::impl_client_v17__invalidateblock!(); + +// == Mining == +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); + +// == Network == +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); + +// == Rawtransactions == +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); + +// == Util == +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); + +// == Wallet == +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v25.rs b/client/src/client_sync/v25.rs deleted file mode 100644 index 77cf2a70..00000000 --- a/client/src/client_sync/v25.rs +++ /dev/null @@ -1,143 +0,0 @@ -// SPDX-License-Identifier: CC0-1.0 - -//! A JSON-RPC client for testing against Bitcoin Core `v25`. -//! -//! We ignore option arguments unless they effect the shape of the returned JSON data. - -use std::collections::BTreeMap; -use std::path::Path; - -use bitcoin::address::{Address, NetworkChecked}; -use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; - -use crate::client_sync::into_json; -use crate::types::v25::*; - -#[rustfmt::skip] // Keep public re-exports separate. -pub use crate::client_sync::{ - v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput - }, - v23::AddressType, -}; - -crate::define_jsonrpc_minreq_client!("v25"); -crate::impl_client_check_expected_server_version!({ [250200] }); - -// == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v17__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); - -// == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); -crate::impl_client_v17__help!(); -crate::impl_client_v17__logging!(); -crate::impl_client_v17__stop!(); -crate::impl_client_v17__uptime!(); - -// == Generating == -crate::impl_client_v17__generatetoaddress!(); -crate::impl_client_v17__invalidateblock!(); - -// == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); - -// == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); - -// == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); - -// == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); - -// == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); diff --git a/client/src/client_sync/v25/mod.rs b/client/src/client_sync/v25/mod.rs new file mode 100644 index 00000000..688cd814 --- /dev/null +++ b/client/src/client_sync/v25/mod.rs @@ -0,0 +1,143 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! A JSON-RPC client for testing against Bitcoin Core `v25`. +//! +//! We ignore option arguments unless they effect the shape of the returned JSON data. + +use std::collections::BTreeMap; +use std::path::Path; + +use bitcoin::address::{Address, NetworkChecked}; +use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; + +use crate::client_sync::into_json; +use crate::types::v25::*; + +#[rustfmt::skip] // Keep public re-exports separate. +pub use crate::client_sync::{ + v17::{ + AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput + }, + v23::AddressType, +}; + +crate::define_jsonrpc_minreq_client!("v25"); +crate::impl_client_check_expected_server_version!({ [250200] }); + +// == Blockchain == +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v17__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); + +// == Control == +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); +crate::impl_client_v17__help!(); +crate::impl_client_v17__logging!(); +crate::impl_client_v17__stop!(); +crate::impl_client_v17__uptime!(); + +// == Generating == +crate::impl_client_v17__generate_to_address!(); +crate::impl_client_v17__invalidateblock!(); + +// == Mining == +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); + +// == Network == +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); + +// == Rawtransactions == +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); + +// == Util == +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); + +// == Wallet == +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v26/blockchain.rs b/client/src/client_sync/v26/blockchain.rs index bb4aaff6..d70db8cc 100644 --- a/client/src/client_sync/v26/blockchain.rs +++ b/client/src/client_sync/v26/blockchain.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `gettxoutsetinfo` #[macro_export] -macro_rules! impl_client_v26__gettxoutsetinfo { +macro_rules! impl_client_v26__get_tx_out_set_info { () => { impl Client { pub fn get_tx_out_set_info(&self) -> Result { diff --git a/client/src/client_sync/v26/mod.rs b/client/src/client_sync/v26/mod.rs index e8a49745..3fa1efec 100644 --- a/client/src/client_sync/v26/mod.rs +++ b/client/src/client_sync/v26/mod.rs @@ -30,120 +30,120 @@ crate::define_jsonrpc_minreq_client!("v26"); crate::impl_client_check_expected_server_version!({ [260000, 260100, 260200] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v26__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v26__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); crate::impl_client_v26__get_prioritised_transactions!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v26__submitpackage!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v26__submit_package!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v26/raw_transactions.rs b/client/src/client_sync/v26/raw_transactions.rs index 74c19a99..87561e42 100644 --- a/client/src/client_sync/v26/raw_transactions.rs +++ b/client/src/client_sync/v26/raw_transactions.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `submitpackage` #[macro_export] -macro_rules! impl_client_v26__submitpackage { +macro_rules! impl_client_v26__submit_package { () => { impl Client { pub fn submit_package( diff --git a/client/src/client_sync/v27.rs b/client/src/client_sync/v27.rs deleted file mode 100644 index f206c123..00000000 --- a/client/src/client_sync/v27.rs +++ /dev/null @@ -1,145 +0,0 @@ -// SPDX-License-Identifier: CC0-1.0 - -//! A JSON-RPC client for testing against Bitcoin Core `v27`. -//! -//! We ignore option arguments unless they effect the shape of the returned JSON data. - -use std::collections::BTreeMap; -use std::path::Path; - -use bitcoin::address::{Address, NetworkChecked}; -use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; - -use crate::client_sync::into_json; -use crate::types::v27::*; - -#[rustfmt::skip] // Keep public re-exports separate. -pub use crate::client_sync::{ - v17::{ - AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, - WalletCreateFundedPsbtInput - }, - v23::AddressType, -}; - -crate::define_jsonrpc_minreq_client!("v27"); -crate::impl_client_check_expected_server_version!({ [270000, 270100, 270200] }); - -// == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v26__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); - -// == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); -crate::impl_client_v17__help!(); -crate::impl_client_v17__logging!(); -crate::impl_client_v17__stop!(); -crate::impl_client_v17__uptime!(); - -// == Generating == -crate::impl_client_v17__generatetoaddress!(); -crate::impl_client_v17__invalidateblock!(); - -// == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); -crate::impl_client_v26__get_prioritised_transactions!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); - -// == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); - -// == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v26__submitpackage!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); - -// == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); - -// == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); diff --git a/client/src/client_sync/v27/mod.rs b/client/src/client_sync/v27/mod.rs new file mode 100644 index 00000000..6974d472 --- /dev/null +++ b/client/src/client_sync/v27/mod.rs @@ -0,0 +1,145 @@ +// SPDX-License-Identifier: CC0-1.0 + +//! A JSON-RPC client for testing against Bitcoin Core `v27`. +//! +//! We ignore option arguments unless they effect the shape of the returned JSON data. + +use std::collections::BTreeMap; +use std::path::Path; + +use bitcoin::address::{Address, NetworkChecked}; +use bitcoin::{sign_message, Amount, Block, BlockHash, PublicKey, Txid}; + +use crate::client_sync::into_json; +use crate::types::v27::*; + +#[rustfmt::skip] // Keep public re-exports separate. +pub use crate::client_sync::{ + v17::{ + AddNodeCommand, Input, Output, SetBanCommand, TemplateRequest, TemplateRules, + WalletCreateFundedPsbtInput + }, + v23::AddressType, +}; + +crate::define_jsonrpc_minreq_client!("v27"); +crate::impl_client_check_expected_server_version!({ [270000, 270100, 270200] }); + +// == Blockchain == +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v26__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); + +// == Control == +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); +crate::impl_client_v17__help!(); +crate::impl_client_v17__logging!(); +crate::impl_client_v17__stop!(); +crate::impl_client_v17__uptime!(); + +// == Generating == +crate::impl_client_v17__generate_to_address!(); +crate::impl_client_v17__invalidateblock!(); + +// == Mining == +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); +crate::impl_client_v26__get_prioritised_transactions!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); + +// == Network == +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); + +// == Rawtransactions == +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v26__submit_package!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); + +// == Util == +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); + +// == Wallet == +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v28/mod.rs b/client/src/client_sync/v28/mod.rs index 40502ec5..722312fc 100644 --- a/client/src/client_sync/v28/mod.rs +++ b/client/src/client_sync/v28/mod.rs @@ -28,120 +28,120 @@ crate::define_jsonrpc_minreq_client!("v28"); crate::impl_client_check_expected_server_version!({ [280000, 280100] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v26__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v26__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); crate::impl_client_v26__get_prioritised_transactions!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v28__submitpackage!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v28__submit_package!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); diff --git a/client/src/client_sync/v28/raw_transactions.rs b/client/src/client_sync/v28/raw_transactions.rs index 927255b2..4ca54e8f 100644 --- a/client/src/client_sync/v28/raw_transactions.rs +++ b/client/src/client_sync/v28/raw_transactions.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `submitpackage` #[macro_export] -macro_rules! impl_client_v28__submitpackage { +macro_rules! impl_client_v28__submit_package { () => { impl Client { pub fn submit_package( diff --git a/client/src/client_sync/v29/blockchain.rs b/client/src/client_sync/v29/blockchain.rs index 4b3c35b5..9711160f 100644 --- a/client/src/client_sync/v29/blockchain.rs +++ b/client/src/client_sync/v29/blockchain.rs @@ -11,7 +11,7 @@ /// Implements Bitcoin Core JSON-RPC API method `getdescriptoractivity` #[macro_export] -macro_rules! impl_client_v29__getdescriptoractivity { +macro_rules! impl_client_v29__get_descriptor_activity { () => { impl Client { pub fn get_descriptor_activity(&self) -> Result { diff --git a/client/src/client_sync/v29/mod.rs b/client/src/client_sync/v29/mod.rs index 080265cf..8a3650f1 100644 --- a/client/src/client_sync/v29/mod.rs +++ b/client/src/client_sync/v29/mod.rs @@ -27,124 +27,124 @@ crate::define_jsonrpc_minreq_client!("v29"); crate::impl_client_check_expected_server_version!({ [290000] }); // == Blockchain == -crate::impl_client_v17__getbestblockhash!(); -crate::impl_client_v17__getblock!(); -crate::impl_client_v17__getblockchaininfo!(); -crate::impl_client_v17__getblockcount!(); -crate::impl_client_v19__getblockfilter!(); -crate::impl_client_v17__getblockhash!(); -crate::impl_client_v17__getblockheader!(); -crate::impl_client_v17__getblockstats!(); -crate::impl_client_v17__getchaintips!(); -crate::impl_client_v17__getchaintxstats!(); -crate::impl_client_v29__getdescriptoractivity!(); -crate::impl_client_v17__getdifficulty!(); -crate::impl_client_v17__getmempoolancestors!(); -crate::impl_client_v17__getmempooldescendants!(); -crate::impl_client_v17__getmempoolentry!(); -crate::impl_client_v17__getmempoolinfo!(); -crate::impl_client_v17__getrawmempool!(); -crate::impl_client_v17__gettxout!(); -crate::impl_client_v17__gettxoutproof!(); -crate::impl_client_v26__gettxoutsetinfo!(); -crate::impl_client_v17__preciousblock!(); -crate::impl_client_v17__pruneblockchain!(); -crate::impl_client_v23__savemempool!(); -crate::impl_client_v17__verifychain!(); -crate::impl_client_v17__verifytxoutproof!(); +crate::impl_client_v17__get_best_block_hash!(); +crate::impl_client_v17__get_block!(); +crate::impl_client_v17__get_blockchain_info!(); +crate::impl_client_v17__get_block_count!(); +crate::impl_client_v19__get_block_filter!(); +crate::impl_client_v17__get_block_hash!(); +crate::impl_client_v17__get_block_header!(); +crate::impl_client_v17__get_block_stats!(); +crate::impl_client_v17__get_chain_tips!(); +crate::impl_client_v17__get_chain_tx_stats!(); +crate::impl_client_v29__get_descriptor_activity!(); +crate::impl_client_v17__get_difficulty!(); +crate::impl_client_v17__get_mempool_ancestors!(); +crate::impl_client_v17__get_mempool_descendants!(); +crate::impl_client_v17__get_mempool_entry!(); +crate::impl_client_v17__get_mempool_info!(); +crate::impl_client_v17__get_raw_mempool!(); +crate::impl_client_v17__get_tx_out!(); +crate::impl_client_v17__get_tx_out_proof!(); +crate::impl_client_v26__get_tx_out_set_info!(); +crate::impl_client_v17__precious_block!(); +crate::impl_client_v17__prune_blockchain!(); +crate::impl_client_v23__save_mempool!(); +crate::impl_client_v17__verify_chain!(); +crate::impl_client_v17__verify_tx_out_proof!(); // == Control == -crate::impl_client_v17__getmemoryinfo!(); -crate::impl_client_v18__getrpcinfo!(); +crate::impl_client_v17__get_memory_info!(); +crate::impl_client_v18__get_rpc_info!(); crate::impl_client_v17__help!(); crate::impl_client_v17__logging!(); crate::impl_client_v17__stop!(); crate::impl_client_v17__uptime!(); // == Generating == -crate::impl_client_v17__generatetoaddress!(); +crate::impl_client_v17__generate_to_address!(); crate::impl_client_v17__invalidateblock!(); // == Mining == -crate::impl_client_v17__getblocktemplate!(); -crate::impl_client_v17__getmininginfo!(); -crate::impl_client_v17__getnetworkhashps!(); +crate::impl_client_v17__get_block_template!(); +crate::impl_client_v17__get_mining_info!(); +crate::impl_client_v17__get_network_hashes_per_second!(); crate::impl_client_v26__get_prioritised_transactions!(); -crate::impl_client_v17__prioritisetransaction!(); -crate::impl_client_v17__submitblock!(); +crate::impl_client_v17__prioritise_transaction!(); +crate::impl_client_v17__submit_block!(); // == Network == -crate::impl_client_v17__addnode!(); -crate::impl_client_v17__clearbanned!(); -crate::impl_client_v17__disconnectnode!(); -crate::impl_client_v17__getaddednodeinfo!(); -crate::impl_client_v17__getnettotals!(); -crate::impl_client_v17__getnetworkinfo!(); -crate::impl_client_v18__getnodeaddresses!(); -crate::impl_client_v17__getpeerinfo!(); -crate::impl_client_v17__setban!(); +crate::impl_client_v17__add_node!(); +crate::impl_client_v17__clear_banned!(); +crate::impl_client_v17__disconnect_node!(); +crate::impl_client_v17__get_added_node_info!(); +crate::impl_client_v17__get_net_totals!(); +crate::impl_client_v17__get_network_info!(); +crate::impl_client_v18__get_node_addresses!(); +crate::impl_client_v17__get_peer_info!(); +crate::impl_client_v17__set_ban!(); // == Rawtransactions == -crate::impl_client_v18__analyzepsbt!(); -crate::impl_client_v17__combinepsbt!(); -crate::impl_client_v17__combinerawtransaction!(); -crate::impl_client_v17__converttopsbt!(); -crate::impl_client_v17__createpsbt!(); -crate::impl_client_v17__createrawtransaction!(); -crate::impl_client_v17__decodepsbt!(); -crate::impl_client_v17__decoderawtransaction!(); -crate::impl_client_v17__decodescript!(); -crate::impl_client_v17__finalizepsbt!(); -crate::impl_client_v17__fundrawtransaction!(); -crate::impl_client_v17__getrawtransaction!(); -crate::impl_client_v18__joinpsbts!(); -crate::impl_client_v17__sendrawtransaction!(); -crate::impl_client_v17__signrawtransaction!(); -crate::impl_client_v17__signrawtransactionwithkey!(); -crate::impl_client_v28__submitpackage!(); -crate::impl_client_v17__testmempoolaccept!(); -crate::impl_client_v18__utxoupdatepsbt!(); +crate::impl_client_v18__analyze_psbt!(); +crate::impl_client_v17__combine_psbt!(); +crate::impl_client_v17__combine_raw_transaction!(); +crate::impl_client_v17__convert_to_psbt!(); +crate::impl_client_v17__create_psbt!(); +crate::impl_client_v17__create_raw_transaction!(); +crate::impl_client_v17__decode_psbt!(); +crate::impl_client_v17__decode_raw_transaction!(); +crate::impl_client_v17__decode_script!(); +crate::impl_client_v17__finalize_psbt!(); +crate::impl_client_v17__fund_raw_transaction!(); +crate::impl_client_v17__get_raw_transaction!(); +crate::impl_client_v18__join_psbts!(); +crate::impl_client_v17__send_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction!(); +crate::impl_client_v17__sign_raw_transaction_with_key!(); +crate::impl_client_v28__submit_package!(); +crate::impl_client_v17__test_mempool_accept!(); +crate::impl_client_v18__utxo_update_psbt!(); // == Util == -crate::impl_client_v17__createmultisig!(); -crate::impl_client_v17__estimatesmartfee!(); -crate::impl_client_v17__signmessagewithprivkey!(); -crate::impl_client_v17__validateaddress!(); -crate::impl_client_v17__verifymessage!(); +crate::impl_client_v17__create_multisig!(); +crate::impl_client_v17__estimate_smart_fee!(); +crate::impl_client_v17__sign_message_with_priv_key!(); +crate::impl_client_v17__validate_address!(); +crate::impl_client_v17__verify_message!(); // == Wallet == -crate::impl_client_v17__addmultisigaddress!(); -crate::impl_client_v17__bumpfee!(); -crate::impl_client_v23__createwallet!(); -crate::impl_client_v17__dumpprivkey!(); -crate::impl_client_v17__dumpwallet!(); -crate::impl_client_v17__getaddressesbylabel!(); -crate::impl_client_v17__getaddressinfo!(); -crate::impl_client_v17__getbalance!(); -crate::impl_client_v19__getbalances!(); -crate::impl_client_v17__getnewaddress!(); -crate::impl_client_v17__getrawchangeaddress!(); -crate::impl_client_v17__getreceivedbyaddress!(); -crate::impl_client_v17__gettransaction!(); -crate::impl_client_v17__getunconfirmedbalance!(); -crate::impl_client_v17__getwalletinfo!(); -crate::impl_client_v17__listaddressgroupings!(); -crate::impl_client_v17__listlabels!(); -crate::impl_client_v17__listlockunspent!(); -crate::impl_client_v17__listreceivedbyaddress!(); -crate::impl_client_v17__listsinceblock!(); -crate::impl_client_v17__listtransactions!(); -crate::impl_client_v17__listunspent!(); -crate::impl_client_v17__listwallets!(); -crate::impl_client_v22__loadwallet!(); -crate::impl_client_v17__rescanblockchain!(); -crate::impl_client_v17__sendmany!(); -crate::impl_client_v17__sendtoaddress!(); -crate::impl_client_v17__signmessage!(); -crate::impl_client_v17__signrawtransactionwithwallet!(); -crate::impl_client_v21__unloadwallet!(); -crate::impl_client_v17__walletcreatefundedpsbt!(); -crate::impl_client_v17__walletprocesspsbt!(); +crate::impl_client_v17__add_multisig_address!(); +crate::impl_client_v17__bump_fee!(); +crate::impl_client_v23__create_wallet!(); +crate::impl_client_v17__dump_priv_key!(); +crate::impl_client_v17__dump_wallet!(); +crate::impl_client_v17__get_addresses_by_label!(); +crate::impl_client_v17__get_address_info!(); +crate::impl_client_v17__get_balance!(); +crate::impl_client_v19__get_balances!(); +crate::impl_client_v17__get_new_address!(); +crate::impl_client_v17__get_raw_change_address!(); +crate::impl_client_v17__get_received_by_address!(); +crate::impl_client_v17__get_transaction!(); +crate::impl_client_v17__get_unconfirmed_balance!(); +crate::impl_client_v17__get_wallet_info!(); +crate::impl_client_v17__list_address_groupings!(); +crate::impl_client_v17__list_labels!(); +crate::impl_client_v17__list_lock_unspent!(); +crate::impl_client_v17__list_received_by_address!(); +crate::impl_client_v17__list_since_block!(); +crate::impl_client_v17__list_transactions!(); +crate::impl_client_v17__list_unspent!(); +crate::impl_client_v17__list_wallets!(); +crate::impl_client_v22__load_wallet!(); +crate::impl_client_v17__rescan_blockchain!(); +crate::impl_client_v17__send_many!(); +crate::impl_client_v17__send_to_address!(); +crate::impl_client_v17__sign_message!(); +crate::impl_client_v17__sign_raw_transaction_with_wallet!(); +crate::impl_client_v21__unload_wallet!(); +crate::impl_client_v17__wallet_create_funded_psbt!(); +crate::impl_client_v17__wallet_process_psbt!(); /// Arg for the `getblocktemplate` method. (v29+). #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)]