arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-12-23 06:48:16 +00:00
Code Issues Releases Wiki Activity

firmware: rename decred_expiry to expiry

Browse Source
This commit is contained in:
Pavol Rusnak 2018-06-05 14:09:38 +02:00
parent 413e3c6a14
commit 49d9fe4d13
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
firmware/signing.c
View File

@ -511,12 +511,12 @@ void signing_init(const SignTx *msg, const CoinInfo *_coin, const HDNode *_root)
if (coin->decred) { if (coin->decred) {
to.version |= (DECRED_SERIALIZE_FULL << 16); to.version |= (DECRED_SERIALIZE_FULL << 16);
to.is_decred = true; to.is_decred = true;
to.decred_expiry = msg->decred_expiry; to.expiry = msg->expiry;
tx_init(&ti, inputs_count, outputs_count, version, lock_time, 0, coin->curve->hasher_sign); tx_init(&ti, inputs_count, outputs_count, version, lock_time, 0, coin->curve->hasher_sign);
ti.version |= (DECRED_SERIALIZE_NO_WITNESS << 16); ti.version |= (DECRED_SERIALIZE_NO_WITNESS << 16);
ti.is_decred = true; ti.is_decred = true;
ti.decred_expiry = msg->decred_expiry; ti.expiry = msg->expiry;
} }
// segwit hashes for hashPrevouts and hashSequence // segwit hashes for hashPrevouts and hashSequence
@ -1014,7 +1014,7 @@ void signing_txack(TransactionType *tx)
if (coin->decred) { if (coin->decred) {
tp.version |= (DECRED_SERIALIZE_NO_WITNESS << 16); tp.version |= (DECRED_SERIALIZE_NO_WITNESS << 16);
tp.is_decred = true; tp.is_decred = true;
tp.decred_expiry = tx->decred_expiry; tp.expiry = tx->expiry;
} }
progress_meta_step = progress_step / (tp.inputs_len + tp.outputs_len); progress_meta_step = progress_step / (tp.inputs_len + tp.outputs_len);
idx2 = 0; idx2 = 0;

6
firmware/transaction.c
View File

@ -599,7 +599,7 @@ uint32_t tx_serialize_footer(TxStruct *tx, uint8_t *out)
{ {
memcpy(out, &(tx->lock_time), 4); memcpy(out, &(tx->lock_time), 4);
if (tx->is_decred) { if (tx->is_decred) {
memcpy(out + 4, &(tx->decred_expiry), 4); memcpy(out + 4, &(tx->expiry), 4);
return 8; return 8;
} }
return 4; return 4;
@ -609,7 +609,7 @@ uint32_t tx_serialize_footer_hash(TxStruct *tx)
{ {
hasher_Update(&(tx->hasher), (const uint8_t *)&(tx->lock_time), 4); hasher_Update(&(tx->hasher), (const uint8_t *)&(tx->lock_time), 4);
if (tx->is_decred) { if (tx->is_decred) {
hasher_Update(&(tx->hasher), (const uint8_t *)&(tx->decred_expiry), 4); hasher_Update(&(tx->hasher), (const uint8_t *)&(tx->expiry), 4);
return 8; return 8;
} }
return 4; return 4;
@ -701,7 +701,7 @@ void tx_init(TxStruct *tx, uint32_t inputs_len, uint32_t outputs_len, uint32_t v
tx->size = 0; tx->size = 0;
tx->is_segwit = false; tx->is_segwit = false;
tx->is_decred = false; tx->is_decred = false;
tx->decred_expiry = 0; tx->expiry = 0;
hasher_Init(&(tx->hasher), hasher_sign); hasher_Init(&(tx->hasher), hasher_sign);
} }

2
firmware/transaction.h
View File

@ -34,7 +34,7 @@ typedef struct {
uint32_t version; uint32_t version;
uint32_t lock_time; uint32_t lock_time;
uint32_t decred_expiry; uint32_t expiry;
bool is_segwit; bool is_segwit;
bool is_decred; bool is_decred;

2
vendor/trezor-common vendored

@ -1 +1 @@
Subproject commit 0f7118bb3d27c3c51a89c776c1b083db91f50541 Subproject commit 018eebac7e64ed082486d746d78d279fe815c65d