diff --git a/tests/device_tests/bitcoin/test_grs.py b/tests/device_tests/bitcoin/test_grs.py index 8f29cfb1f7..55536934e7 100644 --- a/tests/device_tests/bitcoin/test_grs.py +++ b/tests/device_tests/bitcoin/test_grs.py @@ -34,8 +34,8 @@ TXHASH_09a48b = bytes.fromhex( TXHASH_4f2f85 = bytes.fromhex( "4f2f857f39ed1afe05542d058fb0be865a387446e32fc876d086203f483f61d1" ) -TXHASH_f79cf5 = bytes.fromhex( - "f79cf536f6516fb2808b4728c403be98aebef49fec5ba206a0a397527214e929" +TXHASH_45aeb9 = bytes.fromhex( + "45aeb9af884b4082104b0212c5f40ffca8f0127e627a05810b69f0bad777678c" ) pytestmark = pytest.mark.altcoin @@ -221,23 +221,24 @@ def test_send_segwit_native_change(client): def test_send_p2tr(client): inp1 = messages.TxInputType( - # tgrs1pswrqtykue8r89t9u4rprjs0gt4qzkdfuursfnvqaa3f2yql07zmq5v2q7z - address_n=parse_path("86'/1'/0'/0/0"), - amount=4600, - prev_hash=TXHASH_f79cf5, - prev_index=1, + # tgrs1paxhjl357yzctuf3fe58fcdx6nul026hhh6kyldpfsf3tckj9a3wsvuqrgn + address_n=parse_path("86'/1'/1'/0/0"), + amount=4450, + prev_hash=TXHASH_45aeb9, + prev_index=0, script_type=messages.InputScriptType.SPENDTAPROOT, ) out1 = messages.TxOutputType( - # 86'/1'/1'/0/0 - address="tgrs1paxhjl357yzctuf3fe58fcdx6nul026hhh6kyldpfsf3tckj9a3wsvuqrgn", - amount=4450, + # 86'/1'/0'/0/0 + address="tgrs1pswrqtykue8r89t9u4rprjs0gt4qzkdfuursfnvqaa3f2yql07zmq5v2q7z", + amount=4300, script_type=messages.OutputScriptType.PAYTOADDRESS, ) _, serialized_tx = btc.sign_tx( client, "Groestlcoin Testnet", [inp1], [out1], prev_txes=TX_API_TESTNET ) + # https://blockbook-test.groestlcoin.org/tx/c66a79075044aaab3dba17daffb23f48addee87d7c87c7bc88e2997ce38a74ee assert ( serialized_tx.hex() - == "0100000000010129e914725297a3a006a25bec9ff4beae98be03c428478b80b26f51f636f59cf70100000000ffffffff016211000000000000225120e9af2fc69e20b0be2629cd0e9c34da9f3ef56af7beac4fb4298262bc5a45ec5d01400925acfe20ef34929aab585d0fe0a9c1b11219c1fc512f56572a0201e38f3bc38721a6afc9e19801a5c5bc6e806e07a6fc7412b2fc863057f528e3003855491600000000" + == "010000000001018c6777d7baf0690b81057a627e12f0a8fc0ff4c512024b1082404b88afb9ae450000000000ffffffff01cc1000000000000022512083860592dcc9c672acbca8c23941e85d402b353ce0e099b01dec52a203eff0b6014067e8ab9695b22bbe6487d350826357bd920869c4b5077c324fc51a9b42bd7ef17ac7525301437a5b208276c66334766dbdac542fd29d3b949ef78e518bbd383700000000" ) diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index 289021518a..c7fa3904eb 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -64,6 +64,7 @@ "bitcoin-test_getaddress.py::test_multisig_missing[True]": "549cbcac96540d0e22ccd291bbe4faf0142bfbf6afb8eb073e8c8a282995b382", "bitcoin-test_getaddress.py::test_public_ckd": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress.py::test_tbtc": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", +"bitcoin-test_getaddress.py::test_tgrs": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress.py::test_unknown_path": "df9e5f0f4d4a9f5a2faecfd9bd78c1bcddd872c418652b9cd49c1535d9fc7428", "bitcoin-test_getaddress_segwit.py::test_multisig_missing[False]": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress_segwit.py::test_multisig_missing[True]": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", @@ -86,8 +87,18 @@ "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Bitcoin-86'-0'-0'-1-0-InputScrip-fde0fbf7": "7e6a75fa5384e6117526b4154d63abcac0aca159a9a52e139965742b695dc6ac", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Elements-84'-1'-0'-0-0-InputScri-94be23b8": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Elements-84'-1'-0'-0-0-InputScri-a9768b32": "f780fae7616adf03f07144ef8d3482fa04cd0e744ec4502aa93cc0ec0877e61d", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-84'-1'-0'-0--0669bcb9": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-84'-1'-0'-0--77d89f20": "64f59da5388fd0673eb05bc0b2b3cfeb076097965fbc988fcaa81c91915c1f0f", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-84'-1'-0'-1--3c600c4b": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-84'-1'-0'-1--e4455d5d": "2957843eaeba3ae36ea426da5bacc2de81a6846bac4735526847a67badc828bc", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-86'-1'-0'-0--21458788": "50fa05990ef1d522a2e9c83411646731b84ae3102330ed640a8cee7146f9c1ab", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin Testnet-86'-1'-0'-0--8b84ded1": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-84'-17'-0'-0-0-Input-4341fafb": "c5311f036fdb7d7cae9878b6161a4f3cae3b6a594bff9b1e2099455cd0bf3d28", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-84'-17'-0'-0-0-Input-de6d6142": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-84'-17'-0'-1-0-Input-ae18f26e": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-84'-17'-0'-1-0-Input-e60e4bd6": "077f918f68a3af307aa999b76a438abd378fde211ccbc231cf28632d6f4bccd3", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-86'-17'-0'-0-0-Input-37baffca": "e7f816f1d4e880e7ff64a8a7acb630d8040bce92e979a5646d060bd8659e4d6b", +"bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Groestlcoin-86'-17'-0'-0-0-Input-e4a648a0": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-84'-1'-0'-0-0-InputScrip-2ef3a6e1": "222d8057b5db530e7e5f1e1328c9049d2ccdc520f797cf02f8f578cdd53fb784", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-84'-1'-0'-0-0-InputScrip-6721c5e9": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_getaddress_segwit_native.py::test_show_segwit[Testnet-84'-1'-0'-1-0-InputScrip-5b6bca18": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", @@ -146,6 +157,7 @@ "bitcoin-test_getpublickey_curve.py::test_publickey_curve[secp256k1-path1-0212f4629f4f224db0-0209bb73": "c09de07fbbf1e047442180e2facb5482d06a1a428891b875b7dd93c9e4704ae1", "bitcoin-test_grs.py::test_legacy": "ba81ed9e36b62613b66469e2cc88465a60a8f8de75afdb85d64830a292d25526", "bitcoin-test_grs.py::test_legacy_change": "99fda14d1d07db526fdfd7f5d1c3204c7f5c769f9ef38f48440d482c01ee2b3c", +"bitcoin-test_grs.py::test_send_p2tr": "a060847b12ad6f0563277e7b243916ff127542799fad0c4de19f40264a53c76f", "bitcoin-test_grs.py::test_send_segwit_native": "8b98c956848893c43d958510b2c1df19fb88aa25ddcb2b80edd8e56a7dafccaa", "bitcoin-test_grs.py::test_send_segwit_native_change": "fd8b04e26d71fad1c59f5e548c35f22f2031cfb99f9077824242e264fcbedfe6", "bitcoin-test_grs.py::test_send_segwit_p2sh": "e59018de5c49f902c6880c2347283b6c1830fcb19e8eab9686938a08abd930b3",