Skip to content

Commit 8deded7

Browse files
committed
Merge #27: fix: allow liquidtestnet for address inspect
eef1ca6 fix: allow liquidtestnet for address inspect (Byron Hambly) Pull request description: Adds LiquidTestnet for `address inspect` ACKs for top commit: schoen: ACK [eef1ca6](delta1@eef1ca6) apoelstra: ACK eef1ca6; successfully ran local tests Tree-SHA512: 2fb42e61becc7ef752a6b20f3cdc70060db7097db3abf9bcdd12c039c9e3e89a9fe9511de49fd875cae57937f90481e19bbba6a06643e0302bec844a2f29eb1e
2 parents e351cc1 + eef1ca6 commit 8deded7

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

src/lib.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,15 @@ use serde::{Deserialize, Serialize};
1919
pub enum Network {
2020
ElementsRegtest,
2121
Liquid,
22+
LiquidTestnet,
2223
}
2324

2425
impl Network {
2526
pub fn from_params(params: &'static AddressParams) -> Option<Network> {
2627
if *params == AddressParams::ELEMENTS {
2728
Some(Network::ElementsRegtest)
29+
} else if *params == AddressParams::LIQUID_TESTNET {
30+
Some(Network::LiquidTestnet)
2831
} else if *params == AddressParams::LIQUID {
2932
Some(Network::Liquid)
3033
} else {
@@ -36,6 +39,7 @@ impl Network {
3639
match self {
3740
Network::ElementsRegtest => &AddressParams::ELEMENTS,
3841
Network::Liquid => &AddressParams::LIQUID,
42+
Network::LiquidTestnet => &AddressParams::LIQUID_TESTNET,
3943
}
4044
}
4145
}

tests/cli.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -690,6 +690,22 @@ For more information try --help
690690
"asm": "OP_DUP OP_HASH160 OP_PUSHBYTES_20 6c95622b280be97792ec1b3505700f9e674cf509 OP_EQUALVERIFY OP_CHECKSIG"
691691
},
692692
"pubkey_hash": "6c95622b280be97792ec1b3505700f9e674cf509"
693+
}"#,
694+
"",
695+
);
696+
assert_cmd(
697+
&["address", "inspect", "tlq1qq2g07nju42l0nlx0erqa3wsel2l8prnq96rlnhml262mcj7pe8w6ndvvyg237japt83z24m8gu4v3yfhaqvrqxydadc9scsmw"],
698+
r#"{
699+
"network": "liquidtestnet",
700+
"type": "p2wpkh",
701+
"script_pub_key": {
702+
"hex": "0014b58c22151f4ba159e2255767472ac89137e81830",
703+
"asm": "OP_0 OP_PUSHBYTES_20 b58c22151f4ba159e2255767472ac89137e81830"
704+
},
705+
"witness_program_version": 0,
706+
"witness_pubkey_hash": "b58c22151f4ba159e2255767472ac89137e81830",
707+
"blinding_pubkey": "0290ff4e5caabef9fccfc8c1d8ba19fabe708e602e87f9df7f5695bc4bc1c9dda9",
708+
"unconfidential": "tex1qkkxzy9glfws4nc392an5w2kgjym7sxpshuwkjy"
693709
}"#,
694710
"",
695711
);

0 commit comments

Comments
 (0)