Skip to content

Fix scripthash subscribe status hash byte order #771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
evoskuil merged 2 commits into from
May 18, 2026
+26 −26
Merged

Fix scripthash subscribe status hash byte order #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ceec02
Fix scripthash subscribe status hash byte order
eynhaender May 18, 2026
cd6d8e4
fix status hash byte order expectations in subscribe tests
eynhaender May 18, 2026
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: 2 additions & 2 deletions src/protocols/electrum/protocol_electrum_subscribe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void protocol_electrum::complete_scripthash_subscribe(const code& ec,
}

send_result(status == null_hash ? value_t{} :
value_t{ encode_hash(status) }, 128);
value_t{ encode_base16(status) }, 128);
}

// unsubscribe
Expand Down Expand Up @@ -218,7 +218,7 @@ void protocol_electrum::scripthash_notify(const hash_digest& status,
send_notification(to_method_name(type), array_t
{
encode_hash(hash),
status == null_hash ? value_t{} : value_t{ encode_hash(status) }
status == null_hash ? value_t{} : value_t{ encode_base16(status) }
}, 128);
}

Expand Down
48 changes: 24 additions & 24 deletions test/protocols/electrum/electrum_subscribe.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__initialization__exp
const auto hash10 = test::bogus_block10.transactions_ptr()->at(1)->hash(false);
const auto hash11 = test::bogus_block11.transactions_ptr()->at(0)->hash(false);
const auto hash12 = test::bogus_block12.transactions_ptr()->at(0)->hash(false);
const auto expected_initial = encode_hash(sha256_hash
const auto expected_initial = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -118,7 +118,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__repeat_call__idempo
const auto hash10 = test::bogus_block10.transactions_ptr()->at(1)->hash(false);
const auto hash11 = test::bogus_block11.transactions_ptr()->at(0)->hash(false);
const auto hash12 = test::bogus_block12.transactions_ptr()->at(0)->hash(false);
const auto expected_initial = encode_hash(sha256_hash
const auto expected_initial = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand Down Expand Up @@ -156,7 +156,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__progressive__expect

// Confirming block 10 also makes block 11 to rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block10.hash()), true));
const auto expected_confirm10 = encode_hash(sha256_hash
const auto expected_confirm10 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -170,7 +170,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__progressive__expect

// Confirming block 11 also makes block 12 rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block11.hash()), true));
const auto expected_confirm11 = encode_hash(sha256_hash
const auto expected_confirm11 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -183,7 +183,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__progressive__expect

// Confirming block 12 only makes block 12 confirmed.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block12.hash()), true));
const auto expected_confirm12 = encode_hash(sha256_hash
const auto expected_confirm12 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -209,7 +209,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__progressive_notify_

// Confirming block 10 also makes block 11 to rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block10.hash()), true));
const auto expected_confirm10 = encode_hash(sha256_hash
const auto expected_confirm10 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -223,7 +223,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__progressive_notify_

// Confirming block 11 also makes block 12 rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block11.hash()), true));
const auto expected_confirm11 = encode_hash(sha256_hash
const auto expected_confirm11 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -247,7 +247,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_address_subscribe__progressive_notify_

// Confirming block 12 only makes block 12 confirmed.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block12.hash()), true));
const auto expected_confirm12 = encode_hash(sha256_hash
const auto expected_confirm12 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand Down Expand Up @@ -329,7 +329,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__initialization__
const auto hash10 = test::bogus_block10.transactions_ptr()->at(1)->hash(false);
const auto hash11 = test::bogus_block11.transactions_ptr()->at(0)->hash(false);
const auto hash12 = test::bogus_block12.transactions_ptr()->at(0)->hash(false);
const auto expected_initial = encode_hash(sha256_hash
const auto expected_initial = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -355,7 +355,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__repeat_call__ide
const auto hash10 = test::bogus_block10.transactions_ptr()->at(1)->hash(false);
const auto hash11 = test::bogus_block11.transactions_ptr()->at(0)->hash(false);
const auto hash12 = test::bogus_block12.transactions_ptr()->at(0)->hash(false);
const auto expected_initial = encode_hash(sha256_hash
const auto expected_initial = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand Down Expand Up @@ -393,7 +393,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__progressive__exp

// Confirming block 10 also makes block 11 to rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block10.hash()), true));
const auto expected_confirm10 = encode_hash(sha256_hash
const auto expected_confirm10 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -407,7 +407,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__progressive__exp

// Confirming block 11 also makes block 12 rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block11.hash()), true));
const auto expected_confirm11 = encode_hash(sha256_hash
const auto expected_confirm11 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -420,7 +420,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__progressive__exp

// Confirming block 12 only makes block 12 confirmed.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block12.hash()), true));
const auto expected_confirm12 = encode_hash(sha256_hash
const auto expected_confirm12 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -446,7 +446,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__progressive_noti

// Confirming block 10 also makes block 11 to rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block10.hash()), true));
const auto expected_confirm10 = encode_hash(sha256_hash
const auto expected_confirm10 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -460,7 +460,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__progressive_noti

// Confirming block 11 also makes block 12 rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block11.hash()), true));
const auto expected_confirm11 = encode_hash(sha256_hash
const auto expected_confirm11 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -484,7 +484,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scripthash_subscribe__progressive_noti

// Confirming block 12 only makes block 12 confirmed.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block12.hash()), true));
const auto expected_confirm12 = encode_hash(sha256_hash
const auto expected_confirm12 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand Down Expand Up @@ -625,7 +625,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__initialization
const auto hash10 = test::bogus_block10.transactions_ptr()->at(1)->hash(false);
const auto hash11 = test::bogus_block11.transactions_ptr()->at(0)->hash(false);
const auto hash12 = test::bogus_block12.transactions_ptr()->at(0)->hash(false);
const auto expected_initial = encode_hash(sha256_hash
const auto expected_initial = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -651,7 +651,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__repeat_call__i
const auto hash10 = test::bogus_block10.transactions_ptr()->at(1)->hash(false);
const auto hash11 = test::bogus_block11.transactions_ptr()->at(0)->hash(false);
const auto hash12 = test::bogus_block12.transactions_ptr()->at(0)->hash(false);
const auto expected_initial = encode_hash(sha256_hash
const auto expected_initial = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand Down Expand Up @@ -689,7 +689,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__progressive__e

// Confirming block 10 also makes block 11 to rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block10.hash()), true));
const auto expected_confirm10 = encode_hash(sha256_hash
const auto expected_confirm10 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -703,7 +703,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__progressive__e

// Confirming block 11 also makes block 12 rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block11.hash()), true));
const auto expected_confirm11 = encode_hash(sha256_hash
const auto expected_confirm11 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -716,7 +716,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__progressive__e

// Confirming block 12 only makes block 12 confirmed.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block12.hash()), true));
const auto expected_confirm12 = encode_hash(sha256_hash
const auto expected_confirm12 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -742,7 +742,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__progressive_no

// Confirming block 10 also makes block 11 to rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block10.hash()), true));
const auto expected_confirm10 = encode_hash(sha256_hash
const auto expected_confirm10 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":0:" +
Expand All @@ -756,7 +756,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__progressive_no

// Confirming block 11 also makes block 12 rooted.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block11.hash()), true));
const auto expected_confirm11 = encode_hash(sha256_hash
const auto expected_confirm11 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand All @@ -780,7 +780,7 @@ BOOST_AUTO_TEST_CASE(electrum__blockchain_scriptpubkey_subscribe__progressive_no

// Confirming block 12 only makes block 12 confirmed.
BOOST_REQUIRE(query_.push_confirmed(query_.to_header(test::bogus_block12.hash()), true));
const auto expected_confirm12 = encode_hash(sha256_hash
const auto expected_confirm12 = encode_base16(sha256_hash
(
encode_hash(hash10) + ":10:" +
encode_hash(hash11) + ":11:" +
Expand Down
Loading