arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-02 04:18:20 +00:00
Code Issues Releases Wiki Activity

protob: rename decred_expiry to expiry (so we can use this field for Zcash too)

Browse Source
This commit is contained in:
Pavol Rusnak 2018-06-05 14:06:59 +02:00
parent 0f7118bb3d
commit 018eebac7e
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
protob/messages.proto
View File

@ -655,7 +655,7 @@ message SignTx {
optional string coin_name = 3 [default='Bitcoin']; // coin to use optional string coin_name = 3 [default='Bitcoin']; // coin to use
optional uint32 version = 4 [default=1]; // transaction version optional uint32 version = 4 [default=1]; // transaction version
optional uint32 lock_time = 5 [default=0]; // transaction lock_time optional uint32 lock_time = 5 [default=0]; // transaction lock_time
optional uint32 decred_expiry = 6; // only for Decred optional uint32 expiry = 6; // only for Decred and Zcash
optional bool overwintered = 7; // only for Zcash optional bool overwintered = 7; // only for Zcash
} }
@ -675,7 +675,7 @@ message SimpleSignTx {
optional string coin_name = 4 [default='Bitcoin']; // coin to use optional string coin_name = 4 [default='Bitcoin']; // coin to use
optional uint32 version = 5 [default=1]; // transaction version optional uint32 version = 5 [default=1]; // transaction version
optional uint32 lock_time = 6 [default=0]; // transaction lock_time optional uint32 lock_time = 6 [default=0]; // transaction lock_time
optional uint32 decred_expiry = 7; // only for Decred optional uint32 expiry = 7; // only for Decred and Zcash
optional bool overwintered = 8; // only for Zcash optional bool overwintered = 8; // only for Zcash
} }

6
protob/types.proto
View File

@ -226,9 +226,9 @@ message TransactionType {
optional uint32 lock_time = 4; optional uint32 lock_time = 4;
optional uint32 inputs_cnt = 6; optional uint32 inputs_cnt = 6;
optional uint32 outputs_cnt = 7; optional uint32 outputs_cnt = 7;
optional bytes extra_data = 8; optional bytes extra_data = 8; // only for Zcash
optional uint32 extra_data_len = 9; optional uint32 extra_data_len = 9; // only for Zcash
optional uint32 decred_expiry = 10; // only for Decred optional uint32 expiry = 10; // only for Decred and Zcash
optional bool overwintered = 11; // only for Zcash optional bool overwintered = 11; // only for Zcash
} }