arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-08-02 11:58:32 +00:00
Code Issues Releases Wiki Activity

feat(common/protobuf): introduce legacy P2PKH script type

Browse Source
This commit is contained in:
Ondřej Vejpustek 2025-03-25 21:19:57 +01:00
parent 0e79ca11ca
commit 07e90986aa
5 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/protob/messages-bitcoin.proto
View File

@ -14,12 +14,13 @@ option (include_in_bitcoin_only) = true;
* Type of script which will be used for transaction input * Type of script which will be used for transaction input
*/ */
enum InputScriptType { enum InputScriptType {
SPENDADDRESS = 0; // standard P2PKH address SPENDADDRESS = 0; // standard P2PKH address using compressed public key
SPENDMULTISIG = 1; // P2SH multisig address SPENDMULTISIG = 1; // P2SH multisig address
EXTERNAL = 2; // reserved for external inputs (coinjoin) EXTERNAL = 2; // reserved for external inputs (coinjoin)
SPENDWITNESS = 3; // native SegWit SPENDWITNESS = 3; // native SegWit
SPENDP2SHWITNESS = 4; // SegWit over P2SH (backward compatible) SPENDP2SHWITNESS = 4; // SegWit over P2SH (backward compatible)
SPENDTAPROOT = 5; // Taproot SPENDTAPROOT = 5; // Taproot
SPENDADDRESS_UNCOMPRESSED = 6; // legacy P2PKH address using uncompressed public key
} }
/** /**

1
core/src/trezor/enums/InputScriptType.py generated
View File

@ -8,3 +8,4 @@ EXTERNAL = 2
SPENDWITNESS = 3 SPENDWITNESS = 3
SPENDP2SHWITNESS = 4 SPENDP2SHWITNESS = 4
SPENDTAPROOT = 5 SPENDTAPROOT = 5
SPENDADDRESS_UNCOMPRESSED = 6

1
core/src/trezor/enums/__init__.py generated
View File

@ -77,6 +77,7 @@ if TYPE_CHECKING:
SPENDWITNESS = 3 SPENDWITNESS = 3
SPENDP2SHWITNESS = 4 SPENDP2SHWITNESS = 4
SPENDTAPROOT = 5 SPENDTAPROOT = 5
SPENDADDRESS_UNCOMPRESSED = 6
class OutputScriptType(IntEnum): class OutputScriptType(IntEnum):
PAYTOADDRESS = 0 PAYTOADDRESS = 0

1
python/src/trezorlib/messages.py generated
View File

@ -84,6 +84,7 @@ class InputScriptType(IntEnum):
SPENDWITNESS = 3 SPENDWITNESS = 3
SPENDP2SHWITNESS = 4 SPENDP2SHWITNESS = 4
SPENDTAPROOT = 5 SPENDTAPROOT = 5
SPENDADDRESS_UNCOMPRESSED = 6
class OutputScriptType(IntEnum): class OutputScriptType(IntEnum):

33
rust/trezor-client/src/protos/generated/messages_bitcoin.rs generated
View File

@ -13096,6 +13096,8 @@ pub enum InputScriptType {
SPENDP2SHWITNESS = 4, SPENDP2SHWITNESS = 4,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.bitcoin.InputScriptType.SPENDTAPROOT) // @@protoc_insertion_point(enum_value:hw.trezor.messages.bitcoin.InputScriptType.SPENDTAPROOT)
SPENDTAPROOT = 5, SPENDTAPROOT = 5,
// @@protoc_insertion_point(enum_value:hw.trezor.messages.bitcoin.InputScriptType.SPENDADDRESS_UNCOMPRESSED)
SPENDADDRESS_UNCOMPRESSED = 6,
} }
impl ::protobuf::Enum for InputScriptType { impl ::protobuf::Enum for InputScriptType {
@ -13113,6 +13115,7 @@ impl ::protobuf::Enum for InputScriptType {
3 => ::std::option::Option::Some(InputScriptType::SPENDWITNESS), 3 => ::std::option::Option::Some(InputScriptType::SPENDWITNESS),
4 => ::std::option::Option::Some(InputScriptType::SPENDP2SHWITNESS), 4 => ::std::option::Option::Some(InputScriptType::SPENDP2SHWITNESS),
5 => ::std::option::Option::Some(InputScriptType::SPENDTAPROOT), 5 => ::std::option::Option::Some(InputScriptType::SPENDTAPROOT),
6 => ::std::option::Option::Some(InputScriptType::SPENDADDRESS_UNCOMPRESSED),
_ => ::std::option::Option::None _ => ::std::option::Option::None
} }
} }
@ -13125,6 +13128,7 @@ impl ::protobuf::Enum for InputScriptType {
"SPENDWITNESS" => ::std::option::Option::Some(InputScriptType::SPENDWITNESS), "SPENDWITNESS" => ::std::option::Option::Some(InputScriptType::SPENDWITNESS),
"SPENDP2SHWITNESS" => ::std::option::Option::Some(InputScriptType::SPENDP2SHWITNESS), "SPENDP2SHWITNESS" => ::std::option::Option::Some(InputScriptType::SPENDP2SHWITNESS),
"SPENDTAPROOT" => ::std::option::Option::Some(InputScriptType::SPENDTAPROOT), "SPENDTAPROOT" => ::std::option::Option::Some(InputScriptType::SPENDTAPROOT),
"SPENDADDRESS_UNCOMPRESSED" => ::std::option::Option::Some(InputScriptType::SPENDADDRESS_UNCOMPRESSED),
_ => ::std::option::Option::None _ => ::std::option::Option::None
} }
} }
@ -13136,6 +13140,7 @@ impl ::protobuf::Enum for InputScriptType {
InputScriptType::SPENDWITNESS, InputScriptType::SPENDWITNESS,
InputScriptType::SPENDP2SHWITNESS, InputScriptType::SPENDP2SHWITNESS,
InputScriptType::SPENDTAPROOT, InputScriptType::SPENDTAPROOT,
InputScriptType::SPENDADDRESS_UNCOMPRESSED,
]; ];
} }
@ -13679,20 +13684,20 @@ static file_descriptor_proto_data: &'static [u8] = b"\
\x18\x06\x20\x01(\t:\x07BitcoinR\x08coinName\x12Z\n\x0bscript_type\x18\ \x18\x06\x20\x01(\t:\x07BitcoinR\x08coinName\x12Z\n\x0bscript_type\x18\
\x07\x20\x01(\x0e2+.hw.trezor.messages.bitcoin.InputScriptType:\x0cSPEND\ \x07\x20\x01(\x0e2+.hw.trezor.messages.bitcoin.InputScriptType:\x0cSPEND\
ADDRESSR\nscriptType\x12P\n\x0bamount_unit\x18\x08\x20\x01(\x0e2&.hw.tre\ ADDRESSR\nscriptType\x12P\n\x0bamount_unit\x18\x08\x20\x01(\x0e2&.hw.tre\
zor.messages.bitcoin.AmountUnit:\x07BITCOINR\namountUnit*~\n\x0fInputScr\ zor.messages.bitcoin.AmountUnit:\x07BITCOINR\namountUnit*\x9d\x01\n\x0fI\
iptType\x12\x10\n\x0cSPENDADDRESS\x10\0\x12\x11\n\rSPENDMULTISIG\x10\x01\ nputScriptType\x12\x10\n\x0cSPENDADDRESS\x10\0\x12\x11\n\rSPENDMULTISIG\
\x12\x0c\n\x08EXTERNAL\x10\x02\x12\x10\n\x0cSPENDWITNESS\x10\x03\x12\x14\ \x10\x01\x12\x0c\n\x08EXTERNAL\x10\x02\x12\x10\n\x0cSPENDWITNESS\x10\x03\
\n\x10SPENDP2SHWITNESS\x10\x04\x12\x10\n\x0cSPENDTAPROOT\x10\x05*\x99\ \x12\x14\n\x10SPENDP2SHWITNESS\x10\x04\x12\x10\n\x0cSPENDTAPROOT\x10\x05\
\x01\n\x10OutputScriptType\x12\x10\n\x0cPAYTOADDRESS\x10\0\x12\x13\n\x0f\ \x12\x1d\n\x19SPENDADDRESS_UNCOMPRESSED\x10\x06*\x99\x01\n\x10OutputScri\
PAYTOSCRIPTHASH\x10\x01\x12\x11\n\rPAYTOMULTISIG\x10\x02\x12\x11\n\rPAYT\ ptType\x12\x10\n\x0cPAYTOADDRESS\x10\0\x12\x13\n\x0fPAYTOSCRIPTHASH\x10\
OOPRETURN\x10\x03\x12\x10\n\x0cPAYTOWITNESS\x10\x04\x12\x14\n\x10PAYTOP2\ \x01\x12\x11\n\rPAYTOMULTISIG\x10\x02\x12\x11\n\rPAYTOOPRETURN\x10\x03\
SHWITNESS\x10\x05\x12\x10\n\x0cPAYTOTAPROOT\x10\x06*.\n\x16DecredStaking\ \x12\x10\n\x0cPAYTOWITNESS\x10\x04\x12\x14\n\x10PAYTOP2SHWITNESS\x10\x05\
SpendType\x12\t\n\x05SSGen\x10\0\x12\t\n\x05SSRTX\x10\x01*J\n\nAmountUni\ \x12\x10\n\x0cPAYTOTAPROOT\x10\x06*.\n\x16DecredStakingSpendType\x12\t\n\
t\x12\x0b\n\x07BITCOIN\x10\0\x12\x10\n\x0cMILLIBITCOIN\x10\x01\x12\x10\n\ \x05SSGen\x10\0\x12\t\n\x05SSRTX\x10\x01*J\n\nAmountUnit\x12\x0b\n\x07BI\
\x0cMICROBITCOIN\x10\x02\x12\x0b\n\x07SATOSHI\x10\x03*8\n\x14MultisigPub\ TCOIN\x10\0\x12\x10\n\x0cMILLIBITCOIN\x10\x01\x12\x10\n\x0cMICROBITCOIN\
keysOrder\x12\r\n\tPRESERVED\x10\0\x12\x11\n\rLEXICOGRAPHIC\x10\x01B?\n#\ \x10\x02\x12\x0b\n\x07SATOSHI\x10\x03*8\n\x14MultisigPubkeysOrder\x12\r\
com.satoshilabs.trezor.lib.protobufB\x14TrezorMessageBitcoin\x80\xa6\x1d\ \n\tPRESERVED\x10\0\x12\x11\n\rLEXICOGRAPHIC\x10\x01B?\n#com.satoshilabs\
\x01\ .trezor.lib.protobufB\x14TrezorMessageBitcoin\x80\xa6\x1d\x01\
"; ";
/// `FileDescriptorProto` object which was a source for this generated file /// `FileDescriptorProto` object which was a source for this generated file