Skip to content

Commit b863832

Browse files
committed
fix: add anchor to script pubkey type
1 parent 06a6c15 commit b863832

File tree

1 file changed

+16
-12
lines changed

1 file changed

+16
-12
lines changed

json/src/lib.rs

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
1616
#![crate_name = "bitcoincore_rpc_json"]
1717
#![crate_type = "rlib"]
18-
#![allow(deprecated)] // Because of `GetPeerInfoResultNetwork::Unroutable`.
18+
#![allow(deprecated)] // Because of `GetPeerInfoResultNetwork::Unroutable`.
1919

2020
pub extern crate bitcoin;
2121
#[allow(unused)]
@@ -25,13 +25,15 @@ extern crate serde_json;
2525

2626
use std::collections::HashMap;
2727

28-
2928
use bitcoin::address::NetworkUnchecked;
3029
use bitcoin::block::Version;
3130
use bitcoin::consensus::encode;
3231
use bitcoin::hashes::hex::FromHex;
3332
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+
};
3537
use serde::de::Error as SerdeError;
3638
use serde::{Deserialize, Serialize};
3739
use std::fmt;
@@ -915,6 +917,7 @@ pub enum ScriptPubkeyType {
915917
Witness_v0_ScriptHash,
916918
Witness_v1_Taproot,
917919
Witness_Unknown,
920+
Anchor,
918921
}
919922

920923
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
@@ -1008,8 +1011,8 @@ pub struct GetAddressInfoResult {
10081011
#[derive(Clone, Debug, Deserialize, PartialEq, Eq, Serialize)]
10091012
#[serde(untagged)]
10101013
pub enum StringOrStringArray {
1011-
String(String),
1012-
StringArray(Vec<String>),
1014+
String(String),
1015+
StringArray(Vec<String>),
10131016
}
10141017

10151018
/// Models the result of "getblockchaininfo"
@@ -1889,10 +1892,7 @@ pub struct FundRawTransactionOptions {
18891892
/// The fee rate to pay per kvB. NB. This field is converted to camelCase
18901893
/// when serialized, so it is receeived by fundrawtransaction as `feeRate`,
18911894
/// 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")]
18961896
pub fee_rate: Option<Amount>,
18971897
#[serde(skip_serializing_if = "Option::is_none")]
18981898
pub subtract_fee_from_outputs: Option<Vec<u32>>,
@@ -2192,7 +2192,7 @@ where
21922192

21932193
/// deserialize_bip70_network deserializes a Bitcoin Core network according to BIP70
21942194
/// 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>
21962196
where
21972197
D: serde::Deserializer<'de>,
21982198
{
@@ -2201,8 +2201,12 @@ where
22012201
type Value = Network;
22022202

22032203
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+
})
22062210
}
22072211

22082212
fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {

0 commit comments

Comments
 (0)