Merge #184: Support 'witness_v1_taproot' in ScriptPubkeyType enum

RCasatta · RCasatta · commit 87763f7f55e6 · 2021-11-19T16:27:47.000+01:00
1ea3dbe Support 'witness_v1_taproot' in ScriptPubkeyType enum (Roman Zeyde) Pull request description: Should fix romanz/electrs#427. ACKs for top commit: shesek: ACK 1ea3dbe 0xB10C: ACK 1ea3dbe elichai: utACK 1ea3dbe RCasatta: utACK 1ea3dbe Tree-SHA512: 3d5d13d7211fc77231a10083974b659c847ba7767e6c425602a9717dc723d0e57d5fab4069d4ccacd4773028463f0cea068262e2365706e5b8d6c339790ab5f0
diff --git a/json/src/lib.rs b/json/src/lib.rs
@@ -628,6 +628,7 @@ pub enum ScriptPubkeyType {
     NullData,
     Witness_v0_KeyHash,
     Witness_v0_ScriptHash,
+    Witness_v1_Taproot,
     Witness_Unknown,
 }
 

Original file line number	Diff line number	Diff line change
`@@ -628,6 +628,7 @@ pub enum ScriptPubkeyType {`
`628`	`628`	`NullData,`
`629`	`629`	`Witness_v0_KeyHash,`
`630`	`630`	`Witness_v0_ScriptHash,`
	`631`	`+ Witness_v1_Taproot,`
`631`	`632`	`Witness_Unknown,`
`632`	`633`	`}`
`633`	`634`