arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-07-09 16:18:10 +00:00
Code Issues Releases Wiki Activity

Renamed HDPubkeyType to HDNodePathType

Browse Source 
Added MultisigRedeemScriptType to TXOutputType for defining multisig output addresses
This commit is contained in:
slush0 2014-12-15 14:30:44 +01:00
parent 40b3cb4148
commit 81d89030df
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
protob/types.proto
View File

@ -113,7 +113,7 @@ message HDNodeType {
optional bytes public_key = 6; optional bytes public_key = 6;
} }
message HDPubkeyType { message HDNodePathType {
required HDNodeType node = 1; // BIP-32 node in deserialized form required HDNodeType node = 1; // BIP-32 node in deserialized form
repeated uint32 address_n = 2; // BIP-32 path to derive the key from node repeated uint32 address_n = 2; // BIP-32 path to derive the key from node
} }
@ -134,7 +134,7 @@ message CoinType {
* @used_in TxInputType * @used_in TxInputType
*/ */
message MultisigRedeemScriptType { message MultisigRedeemScriptType {
repeated HDPubkeyType pubkeys = 1; // pubkeys from multisig address (sorted lexicographically) repeated HDNodePathType pubkeys = 1; // pubkeys from multisig address (sorted lexicographically)
repeated bytes signatures = 2; // existing signatures for partially signed input repeated bytes signatures = 2; // existing signatures for partially signed input
optional uint32 m = 3; // "m" from n, how many valid signatures is necessary for spending optional uint32 m = 3; // "m" from n, how many valid signatures is necessary for spending
} }
@ -164,6 +164,7 @@ message TxOutputType {
repeated uint32 address_n = 2; // BIP-32 path to derive the key from master node; has higher priority than "address" repeated uint32 address_n = 2; // BIP-32 path to derive the key from master node; has higher priority than "address"
required uint64 amount = 3; // amount to spend in satoshis required uint64 amount = 3; // amount to spend in satoshis
required OutputScriptType script_type = 4; // output script type required OutputScriptType script_type = 4; // output script type
repeated MultisigRedeemScriptType multisig = 5; // Defines multisig address; when filled, it has priority over address/address_n
} }
/** /**