15
15
16
16
#![ crate_name = "bitcoincore_rpc_json" ]
17
17
#![ crate_type = "rlib" ]
18
- #![ allow( deprecated) ] // Because of `GetPeerInfoResultNetwork::Unroutable`.
18
+ #![ allow( deprecated) ] // Because of `GetPeerInfoResultNetwork::Unroutable`.
19
19
20
20
pub extern crate bitcoin;
21
21
#[ allow( unused) ]
@@ -25,13 +25,15 @@ extern crate serde_json;
25
25
26
26
use std:: collections:: HashMap ;
27
27
28
-
29
28
use bitcoin:: address:: NetworkUnchecked ;
30
29
use bitcoin:: block:: Version ;
31
30
use bitcoin:: consensus:: encode;
32
31
use bitcoin:: hashes:: hex:: FromHex ;
33
32
use bitcoin:: hashes:: sha256;
34
- use bitcoin:: { Address , Amount , PrivateKey , PublicKey , SignedAmount , Transaction , ScriptBuf , Script , bip158, bip32, Network } ;
33
+ use bitcoin:: {
34
+ bip158, bip32, Address , Amount , Network , PrivateKey , PublicKey , Script , ScriptBuf ,
35
+ SignedAmount , Transaction ,
36
+ } ;
35
37
use serde:: de:: Error as SerdeError ;
36
38
use serde:: { Deserialize , Serialize } ;
37
39
use std:: fmt;
@@ -915,6 +917,7 @@ pub enum ScriptPubkeyType {
915
917
Witness_v0_ScriptHash ,
916
918
Witness_v1_Taproot ,
917
919
Witness_Unknown ,
920
+ Anchor ,
918
921
}
919
922
920
923
#[ derive( Clone , PartialEq , Eq , Debug , Deserialize , Serialize ) ]
@@ -1008,8 +1011,8 @@ pub struct GetAddressInfoResult {
1008
1011
#[ derive( Clone , Debug , Deserialize , PartialEq , Eq , Serialize ) ]
1009
1012
#[ serde( untagged) ]
1010
1013
pub enum StringOrStringArray {
1011
- String ( String ) ,
1012
- StringArray ( Vec < String > ) ,
1014
+ String ( String ) ,
1015
+ StringArray ( Vec < String > ) ,
1013
1016
}
1014
1017
1015
1018
/// Models the result of "getblockchaininfo"
@@ -1889,10 +1892,7 @@ pub struct FundRawTransactionOptions {
1889
1892
/// The fee rate to pay per kvB. NB. This field is converted to camelCase
1890
1893
/// when serialized, so it is receeived by fundrawtransaction as `feeRate`,
1891
1894
/// which fee rate per kvB, and *not* `fee_rate`, which is per vB.
1892
- #[ serde(
1893
- with = "bitcoin::amount::serde::as_btc::opt" ,
1894
- skip_serializing_if = "Option::is_none"
1895
- ) ]
1895
+ #[ serde( with = "bitcoin::amount::serde::as_btc::opt" , skip_serializing_if = "Option::is_none" ) ]
1896
1896
pub fee_rate : Option < Amount > ,
1897
1897
#[ serde( skip_serializing_if = "Option::is_none" ) ]
1898
1898
pub subtract_fee_from_outputs : Option < Vec < u32 > > ,
@@ -2192,7 +2192,7 @@ where
2192
2192
2193
2193
/// deserialize_bip70_network deserializes a Bitcoin Core network according to BIP70
2194
2194
/// The accepted input variants are: {"main", "test", "signet", "regtest"}
2195
- fn deserialize_bip70_network < ' de , D > ( deserializer : D ) -> Result < Network , D :: Error >
2195
+ fn deserialize_bip70_network < ' de , D > ( deserializer : D ) -> Result < Network , D :: Error >
2196
2196
where
2197
2197
D : serde:: Deserializer < ' de > ,
2198
2198
{
@@ -2201,8 +2201,12 @@ where
2201
2201
type Value = Network ;
2202
2202
2203
2203
fn visit_str < E : serde:: de:: Error > ( self , s : & str ) -> Result < Self :: Value , E > {
2204
- Network :: from_core_arg ( s)
2205
- . map_err ( |_| E :: invalid_value ( serde:: de:: Unexpected :: Str ( s) , & "bitcoin network encoded as a string" ) )
2204
+ Network :: from_core_arg ( s) . map_err ( |_| {
2205
+ E :: invalid_value (
2206
+ serde:: de:: Unexpected :: Str ( s) ,
2207
+ & "bitcoin network encoded as a string" ,
2208
+ )
2209
+ } )
2206
2210
}
2207
2211
2208
2212
fn expecting ( & self , formatter : & mut fmt:: Formatter ) -> fmt:: Result {
0 commit comments