arno
/
trezor-firmware
mirror of https://github.com/trezor/trezor-firmware.git
1
0
Fork 0
Code Issues Releases Wiki Activity

decred: Add input_derive_script.

Browse Source 
Decred shares code with bitcoin and a recent change broke signing stake
based inputs. Add decred specific script construction and fix tests.
pull/2703/head
JoeGruff 1 year ago
parent 3021df8f65
commit 2b47bd63e4
5 changed files with 110 additions and 28 deletions
Show Stats Download Patch File Download Diff File

80
core/src/apps/bitcoin/scripts_decred.py
Unescape View File

@ -3,6 +3,7 @@ from typing import TYPE_CHECKING
from trezor import utils
from trezor.crypto import base58
from trezor.crypto.base58 import blake256d_32
from trezor.enums import DecredStakingSpendType
from trezor.wire import DataError
from . import scripts
@ -11,7 +12,22 @@ from .scripts import ( # noqa: F401
write_output_script_multisig,
write_output_script_p2pkh,
)
from .writers import write_compact_size
from .writers import (
write_bytes_fixed,
write_compact_size,
write_op_push,
write_bytes_fixed,
write_uint64_le,
op_push_length,
)
# These are decred specific opcodes related to staking.
OP_SSTX = 0xBA
OP_SSGEN = 0xBB
OP_SSRTX = 0xBC
OP_SSTXCHANGE = 0xBD
STAKE_TREE = 1
if TYPE_CHECKING:
from trezor.enums import InputScriptType
@ -62,7 +78,6 @@ def _write_input_script_multisig_prefixed(
coin: CoinInfo,
) -> None:
from .multisig import multisig_get_pubkeys
from .writers import op_push_length, write_op_push
signatures = multisig.signatures # other signatures
if len(signatures[signature_index]) > 0:
@ -98,7 +113,7 @@ def output_script_sstxsubmissionpkh(addr: str) -> bytearray:
raise DataError("Invalid address")
w = utils.empty_bytearray(26)
w.append(0xBA) # OP_SSTX
w.append(OP_SSTX)
scripts.write_output_script_p2pkh(w, raw_address[2:])
return w
@ -111,7 +126,7 @@ def output_script_sstxchange(addr: str) -> bytearray:
raise DataError("Invalid address")
w = utils.empty_bytearray(26)
w.append(0xBD) # OP_SSTXCHANGE
w.append(OP_SSTXCHANGE)
scripts.write_output_script_p2pkh(w, raw_address[2:])
return w
@ -120,7 +135,7 @@ def output_script_sstxchange(addr: str) -> bytearray:
def write_output_script_ssrtx_prefixed(w: Writer, pkh: bytes) -> None:
utils.ensure(len(pkh) == 20)
write_compact_size(w, 26)
w.append(0xBC) # OP_SSRTX
w.append(OP_SSRTX)
scripts.write_output_script_p2pkh(w, pkh)
@ -128,16 +143,65 @@ def write_output_script_ssrtx_prefixed(w: Writer, pkh: bytes) -> None:
def write_output_script_ssgen_prefixed(w: Writer, pkh: bytes) -> None:
utils.ensure(len(pkh) == 20)
write_compact_size(w, 26)
w.append(0xBB) # OP_SSGEN
w.append(OP_SSGEN)
scripts.write_output_script_p2pkh(w, pkh)
# Stake commitment OPRETURN.
def sstxcommitment_pkh(pkh: bytes, amount: int) -> bytes:
from apps.common.writers import write_bytes_fixed, write_uint64_le
w = utils.empty_bytearray(30)
write_bytes_fixed(w, pkh, 20)
write_uint64_le(w, amount)
write_bytes_fixed(w, b"\x00\x58", 2) # standard fee limits
return w
def output_script_p2pkh(pubkeyhash: bytes) -> bytearray:
s = utils.empty_bytearray(25)
scripts.write_output_script_p2pkh(s, pubkeyhash)
return s
def output_script_p2sh(scripthash: bytes) -> bytearray:
# A9 14 <scripthash> 87
utils.ensure(len(scripthash) == 20)
s = bytearray(23)
s[0] = 0xA9 # OP_HASH_160
s[1] = 0x14 # pushing 20 bytes
s[2:22] = scripthash
s[22] = 0x87 # OP_EQUAL
return s
def output_derive_script(tree: int, stakeType: int, addr: str, coin: CoinInfo) -> bytes:
from trezor.crypto import base58
from apps.common import address_type
try:
raw_address = base58.decode_check(addr, blake256d_32)
except ValueError:
raise DataError("Invalid address")
if tree == STAKE_TREE:
if stakeType == DecredStakingSpendType.SSGen:
script = utils.empty_bytearray(26)
script.append(OP_SSGEN)
scripts.write_output_script_p2pkh(script, raw_address[2:])
return script
elif stakeType == DecredStakingSpendType.SSRTX:
script = utils.empty_bytearray(26)
script.append(OP_SSRTX)
scripts.write_output_script_p2pkh(script, raw_address[2:])
return script
elif address_type.check(coin.address_type, raw_address):
# p2pkh
pubkeyhash = address_type.strip(coin.address_type, raw_address)
script = output_script_p2pkh(pubkeyhash)
return script
elif address_type.check(coin.address_type_p2sh, raw_address):
scripthash = address_type.strip(coin.address_type_p2sh, raw_address)
script = output_script_p2sh(scripthash)
return script
raise DataError("Invalid address type")

22
core/src/apps/bitcoin/sign_tx/decred.py
Unescape View File

@ -9,8 +9,8 @@ from trezor.wire import DataError, ProcessError
from apps.bitcoin.sign_tx.tx_weight import TxWeightCalculator
from apps.common.writers import write_compact_size
from .. import scripts_decred, writers
from ..common import ecdsa_hash_pubkey
from .. import addresses, scripts_decred, writers
from ..common import ecdsa_hash_pubkey, input_is_external
from ..writers import write_uint32
from . import helpers
from .approvers import BasicApprover
@ -421,3 +421,21 @@ class Decred(Bitcoin):
pubkey,
signature,
)
# scriptPubKey derivation
# ===
def input_derive_script(
self, txi: TxInput, node: bip32.HDNode | None = None
) -> bytes:
if input_is_external(txi):
assert txi.script_pubkey is not None # checked in _sanitize_tx_input
return txi.script_pubkey
if node is None:
node = self.keychain.derive(txi.address_n)
address = addresses.get_address(txi.script_type, self.coin, node, txi.multisig)
return scripts_decred.output_derive_script(
txi.decred_tree, txi.decred_staking_spend, address, self.coin
)

32
tests/device_tests/bitcoin/test_decred.py
Unescape View File

@ -42,11 +42,11 @@ FAKE_TXHASH_9ac7d2 = bytes.fromhex(
FAKE_TXHASH_48f5b8 = bytes.fromhex(
"48f5b85f8b1cf796d0d07388ced491f154e2d26b0615529d2d6ba9c170542df3"
)
FAKE_TXHASH_f8e2f2 = bytes.fromhex(
"f8e2f2b4eab772f6e3743cba92db341f64b84d9c16ae375c7690fbf0bf02fc7b"
FAKE_TXHASH_8b6890 = bytes.fromhex(
"8b6890c10a3764fe6f378bc5b7e438148df176e9be1dde704ce866361149e254"
)
FAKE_TXHASH_51bc9c = bytes.fromhex(
"51bc9c71f10a81eef3caedb5333062eb4b1f70998adf02916fe98fdc04c572e8"
FAKE_TXHASH_1f00fc = bytes.fromhex(
"1f00fc54530d7c4877f5032e91b6c507f6a1531861dede2ab134e5c0b5dfe8c8"
)
pytestmark = [pytest.mark.altcoin, pytest.mark.decred, pytest.mark.skip_tr]
@ -169,7 +169,7 @@ def test_spend_from_stake_generation_and_revocation_decred(client: Client):
inp1 = messages.TxInputType(
address_n=parse_path("m/44h/1h/0h/0/0"),
prev_hash=FAKE_TXHASH_f8e2f2,
prev_hash=FAKE_TXHASH_8b6890,
prev_index=2,
amount=200_000_000,
script_type=messages.InputScriptType.SPENDADDRESS,
@ -179,7 +179,7 @@ def test_spend_from_stake_generation_and_revocation_decred(client: Client):
inp2 = messages.TxInputType(
address_n=parse_path("m/44h/1h/0h/0/0"),
prev_hash=FAKE_TXHASH_51bc9c,
prev_hash=FAKE_TXHASH_1f00fc,
prev_index=0,
amount=200_000_000,
script_type=messages.InputScriptType.SPENDADDRESS,
@ -204,16 +204,16 @@ def test_spend_from_stake_generation_and_revocation_decred(client: Client):
(is_core, messages.ButtonRequest(code=B.ConfirmOutput)),
messages.ButtonRequest(code=B.SignTx),
request_input(0),
request_meta(FAKE_TXHASH_f8e2f2),
request_input(0, FAKE_TXHASH_f8e2f2),
request_input(1, FAKE_TXHASH_f8e2f2),
request_output(0, FAKE_TXHASH_f8e2f2),
request_output(1, FAKE_TXHASH_f8e2f2),
request_output(2, FAKE_TXHASH_f8e2f2),
request_meta(FAKE_TXHASH_8b6890),
request_input(0, FAKE_TXHASH_8b6890),
request_input(1, FAKE_TXHASH_8b6890),
request_output(0, FAKE_TXHASH_8b6890),
request_output(1, FAKE_TXHASH_8b6890),
request_output(2, FAKE_TXHASH_8b6890),
request_input(1),
request_meta(FAKE_TXHASH_51bc9c),
request_input(0, FAKE_TXHASH_51bc9c),
request_output(0, FAKE_TXHASH_51bc9c),
request_meta(FAKE_TXHASH_1f00fc),
request_input(0, FAKE_TXHASH_1f00fc),
request_output(0, FAKE_TXHASH_1f00fc),
request_input(0),
request_input(1),
request_finished(),
@ -225,7 +225,7 @@ def test_spend_from_stake_generation_and_revocation_decred(client: Client):
assert (
serialized_tx.hex()
== "01000000027bfc02bff0fb90765c37ae169c4db8641f34db92ba3c74e3f672b7eab4f2e2f80200000001ffffffffe872c504dc8fe96f9102df8a99701f4beb623033b5edcaf3ee810af1719cbc510000000001ffffffff0160fdd5170000000000001976a914819d291a2f7fbf770e784bfd78b5ce92c58e95ea88ac00000000000000000200c2eb0b0000000000000000ffffffff6b483045022100f74f652a073bdaf2197ede47b4df0d90609bbfd0dc8a94199d36ebb1429de09b022040366292a8812135ec7572a94eb6e969fa1fa97a52c03f08a337f20bc4fb71de0121030e669acac1f280d1ddf441cd2ba5e97417bf2689e4bbec86df4f831bf9f7ffd000c2eb0b0000000000000000ffffffff6b483045022100ca385c05a008239c038e107989bbc30eec1ecd5a66e4973265eb21df034c77a9022070c3dceb24b39cb6e9f8c973572b955b37a4754e9caa704cdd37113c46e2b2970121030e669acac1f280d1ddf441cd2ba5e97417bf2689e4bbec86df4f831bf9f7ffd0"
== "010000000254e249113666e84c70de1dbee976f18d1438e4b7c58b376ffe64370ac190688b0200000001ffffffffc8e8dfb5c0e534b12adede611853a1f607c5b6912e03f577487c0d5354fc001f0000000001ffffffff0160fdd5170000000000001976a914819d291a2f7fbf770e784bfd78b5ce92c58e95ea88ac00000000000000000200c2eb0b0000000000000000ffffffff6b483045022100bdcb877c97d72db74eca06fefa21a7f7b00afcd5d916fce2155ed7df1ca5546102201e1f9efd7d652b449474c2c70171bfc4535544927bed62021f7334447d1ea4740121030e669acac1f280d1ddf441cd2ba5e97417bf2689e4bbec86df4f831bf9f7ffd000c2eb0b0000000000000000ffffffff6a473044022030c5743c442bd696d19dcf73d54e95526e726de965c2e2b4b9fd70248eaae21d02201305a3bcc2bb0e33122277763990e3b48f317d61264a68d190fb8acfc004cc640121030e669acac1f280d1ddf441cd2ba5e97417bf2689e4bbec86df4f831bf9f7ffd0"
)

2
tests/txcache/decred_testnet/51bc9c71f10a81eef3caedb5333062eb4b1f70998adf02916fe98fdc04c572e8.json → tests/txcache/decred_testnet/1f00fc54530d7c4877f5032e91b6c507f6a1531861dede2ab134e5c0b5dfe8c8.json
Unescape View File

@ -3,7 +3,7 @@
{
"amount": 200000000,
"decred_script_version": 0,
"script_pubkey": "76a914dc1a98d791735eb9a8715a2a219c23680edcedad88ac",
"script_pubkey": "bc76a914dc1a98d791735eb9a8715a2a219c23680edcedad88ac",
"decred_tree": 1
}
],

2
tests/txcache/decred_testnet/f8e2f2b4eab772f6e3743cba92db341f64b84d9c16ae375c7690fbf0bf02fc7b.json → tests/txcache/decred_testnet/8b6890c10a3764fe6f378bc5b7e438148df176e9be1dde704ce866361149e254.json
Unescape View File

@ -13,7 +13,7 @@
{
"amount": 200000000,
"decred_script_version": 0,
"script_pubkey": "76a914dc1a98d791735eb9a8715a2a219c23680edcedad88ac"
"script_pubkey": "bb76a914dc1a98d791735eb9a8715a2a219c23680edcedad88ac"
}
],
"expiry": 0,
Write Preview
Loading…
Cancel
Save