Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mm2src/mm2_bitcoin/rpc/src/v1/types/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ pub enum ScriptType {
NullData,
WitnessScript,
WitnessKey,
Taproot,
// Qtum specific
CallSender,
CreateSender,
Expand All @@ -36,6 +37,7 @@ impl From<GlobalScriptType> for ScriptType {
GlobalScriptType::NullData => ScriptType::NullData,
GlobalScriptType::WitnessScript => ScriptType::WitnessScript,
GlobalScriptType::WitnessKey => ScriptType::WitnessKey,
GlobalScriptType::Taproot => ScriptType::Taproot,
GlobalScriptType::CallSender => ScriptType::CallSender,
GlobalScriptType::CreateSender => ScriptType::CreateSender,
GlobalScriptType::Call => ScriptType::Call,
Expand All @@ -60,6 +62,7 @@ impl Serialize for ScriptType {
ScriptType::NullData => "nulldata".serialize(serializer),
ScriptType::WitnessScript => "witness_v0_scripthash".serialize(serializer),
ScriptType::WitnessKey => "witness_v0_keyhash".serialize(serializer),
ScriptType::Taproot => "witness_v1_taproot".serialize(serializer),
ScriptType::CallSender => "call_sender".serialize(serializer),
ScriptType::CreateSender => "create_sender".serialize(serializer),
ScriptType::Call => "call".serialize(serializer),
Expand Down Expand Up @@ -99,6 +102,7 @@ impl<'a> Deserialize<'a> for ScriptType {
"nulldata" => Ok(ScriptType::NullData),
"witness_v0_scripthash" => Ok(ScriptType::WitnessScript),
"witness_v0_keyhash" => Ok(ScriptType::WitnessKey),
"witness_v1_taproot" => Ok(ScriptType::Taproot),
"call_sender" => Ok(ScriptType::CallSender),
"create_sender" => Ok(ScriptType::CreateSender),
"call" => Ok(ScriptType::Call),
Expand Down
4 changes: 4 additions & 0 deletions mm2src/mm2_bitcoin/script/src/script.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ pub enum ScriptType {
NullData,
WitnessScript,
WitnessKey,
Taproot,
// Qtum specific
CallSender,
CreateSender,
Expand Down Expand Up @@ -467,6 +468,9 @@ impl Script {
let address_hash = AddressHashEnum::AddressHash(hash.into());
Ok(vec![ScriptAddress::new_p2wpkh(address_hash)])
},
ScriptType::Taproot => {
Ok(vec![]) // TODO
},
ScriptType::CallSender => {
Ok(vec![]) // TODO
},
Expand Down
Loading