From c5c6dd8721e8298f7a1811b22eee233c864b4301 Mon Sep 17 00:00:00 2001 From: gladcow Date: Thu, 16 Apr 2020 17:49:42 +0300 Subject: [PATCH] simplify redeem script --- .../plugins/peerplays_sidechain/bitcoin/bitcoin_address.cpp | 4 +--- .../graphene/peerplays_sidechain/bitcoin/bitcoin_script.hpp | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_address.cpp b/libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_address.cpp index b13208b8..bbb9fc23 100755 --- a/libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_address.cpp +++ b/libraries/plugins/peerplays_sidechain/bitcoin/bitcoin_address.cpp @@ -388,9 +388,7 @@ void btc_one_or_weighted_multisig_address::create_redeem_script(const fc::ecc::p script_builder builder; builder << user_key_data.serialize(); builder << op::CHECKSIG; - builder << op::IF; - builder << op::_1; - builder << op::ELSE; + builder << op::NOTIF; uint32_t total_weight = 0; builder << uint32_t(0); for (auto &p : keys_data) { diff --git a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_script.hpp b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_script.hpp index 1349011e..99227440 100644 --- a/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_script.hpp +++ b/libraries/plugins/peerplays_sidechain/include/graphene/peerplays_sidechain/bitcoin/bitcoin_script.hpp @@ -26,6 +26,7 @@ enum class op { // control IF = 0x63, + NOTIF = 0x64, ELSE = 0x67, ENDIF = 0x68, RETURN = 0x6a,