Skip to content

Commit

Permalink
Fix Unfreeze/Claim Rewards message
Browse files Browse the repository at this point in the history
  • Loading branch information
@fbsobreira
fbsobreira committed Feb 18, 2020
1 parent 07960b9 commit 57cebb8
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 82 deletions.
172 changes: 91 additions & 81 deletions src/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -925,6 +925,7 @@ typedef enum {
APPROVAL_WITNESSVOTE_TRANSACTION,
APPROVAL_FREEZEASSET_TRANSACTION,
APPROVAL_UNFREEZEASSET_TRANSACTION,
APPROVAL_WITHDRAWBALANCE_TRANSACTION,
APPROVAL_SIGN_PERSONAL_MESSAGE,
APPROVAL_CUSTOM_CONTRACT,
} ui_approval_blue_state_t;
Expand Down Expand Up @@ -1014,6 +1015,16 @@ const char *const ui_approval_blue_details_name[][7] = {
"CONFIRM TRANSACTION",
"Unfreeze TRX",
},
/*APPROVAL_WITHDRAWBALANCE_TRANSACTION*/
{
"FROM",
NULL,
NULL,
NULL,
NULL,
"CONFIRM TRANSACTION",
"Claim Rewards",
},
/*APPROVAL_SIGN_PERSONAL_MESSAGE*/
{
"HASH",
Expand Down Expand Up @@ -1651,6 +1662,16 @@ void ui_approval_unfreeze_transaction_blue_init(void) {
ui_approval_blue_init();
}

void ui_approval_withdraw_balance_transaction_blue_init(void) {
// wipe all cases
os_memset(ui_approval_blue_values, 0, sizeof(ui_approval_blue_values));
ui_approval_blue_ok = (bagl_element_callback_t)io_seproxyhal_touch_tx_ok;
ui_approval_blue_cancel =
(bagl_element_callback_t)io_seproxyhal_touch_cancel;
ui_approval_blue_values[0] = (const char*)fromAddress;
ui_approval_blue_init();
}

void ui_approval_exchange_create_blue_init(void) {
// wipe all cases
os_memset(ui_approval_blue_values, 0, sizeof(ui_approval_blue_values));
Expand Down Expand Up @@ -3704,6 +3725,14 @@ UX_STEP_NOCB(ux_approval_tx_data_warning_step,
"Present",
});

UX_STEP_NOCB(
ux_approval_from_address_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress
});

UX_STEP_VALID(
ux_approval_confirm_step,
pbb,
Expand Down Expand Up @@ -3772,18 +3801,11 @@ UX_STEP_NOCB(
.title = "Hash",
.text = fullHash
});
UX_STEP_NOCB(
ux_approval_st_flow_3_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress
});

UX_DEF(ux_approval_st_flow,
&ux_approval_st_flow_1_step,
&ux_approval_st_flow_2_step,
&ux_approval_st_flow_3_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -3792,7 +3814,7 @@ UX_DEF(ux_approval_st_data_warning_flow,
&ux_approval_st_flow_1_step,
&ux_approval_tx_data_warning_step,
&ux_approval_st_flow_2_step,
&ux_approval_st_flow_3_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -3828,21 +3850,13 @@ UX_STEP_NOCB(
.title = TRC20ActionSendAllow,
.text = toAddress,
});
UX_STEP_NOCB(
ux_approval_tx_5_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress,
});


UX_DEF(ux_approval_tx_flow,
&ux_approval_tx_1_step,
&ux_approval_tx_2_step,
&ux_approval_tx_3_step,
&ux_approval_tx_4_step,
&ux_approval_tx_5_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -3853,7 +3867,7 @@ UX_DEF(ux_approval_tx_data_warning_flow,
&ux_approval_tx_2_step,
&ux_approval_tx_3_step,
&ux_approval_tx_4_step,
&ux_approval_tx_5_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -3896,15 +3910,8 @@ UX_STEP_NOCB(
.title = "Amount 2",
.text = G_io_apdu_buffer+100,
});
UX_STEP_NOCB(
ux_approval_exchange_create_6_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress,
});
UX_STEP_VALID(
ux_approval_exchange_create_7_step,
ux_approval_exchange_create_confirm_step,
pbb,
io_seproxyhal_touch_tx_ok(NULL),
{
Expand All @@ -3919,8 +3926,8 @@ UX_DEF(ux_approval_exchange_create_flow,
&ux_approval_exchange_create_3_step,
&ux_approval_exchange_create_4_step,
&ux_approval_exchange_create_5_step,
&ux_approval_exchange_create_6_step,
&ux_approval_exchange_create_7_step,
&ux_approval_from_address_step,
&ux_approval_exchange_create_confirm_step,
&ux_approval_reject_step
);

Expand All @@ -3931,8 +3938,8 @@ UX_DEF(ux_approval_exchange_create_data_warning_flow,
&ux_approval_exchange_create_3_step,
&ux_approval_exchange_create_4_step,
&ux_approval_exchange_create_5_step,
&ux_approval_exchange_create_6_step,
&ux_approval_exchange_create_7_step,
&ux_approval_from_address_step,
&ux_approval_exchange_create_confirm_step,
&ux_approval_reject_step
);

Expand Down Expand Up @@ -3981,13 +3988,6 @@ UX_STEP_NOCB(
.title = (char *)(G_io_apdu_buffer+voteSlot(4, VOTE_ADDRESS)),
.text = (char *)(G_io_apdu_buffer+voteSlot(4, VOTE_AMOUNT)),
});
UX_STEP_NOCB(
ux_approval_vote_flow_7_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress,
});

// 11 slots for dynamic NanoS/NanoX UX voting steps
const ux_flow_step_t * ux_approval_vote_flow[11];
Expand Down Expand Up @@ -4023,21 +4023,13 @@ UX_STEP_NOCB(
.title = "Freeze To",
.text = toAddress,
});
UX_STEP_NOCB(
ux_approval_freeze_flow_5_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress,
});


UX_DEF(ux_approval_freeze_flow,
&ux_approval_freeze_flow_1_step,
&ux_approval_freeze_flow_2_step,
&ux_approval_freeze_flow_3_step,
&ux_approval_freeze_flow_4_step,
&ux_approval_freeze_flow_5_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -4048,7 +4040,7 @@ UX_DEF(ux_approval_freeze_data_warning_flow,
&ux_approval_freeze_flow_2_step,
&ux_approval_freeze_flow_3_step,
&ux_approval_freeze_flow_4_step,
&ux_approval_freeze_flow_5_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -4079,11 +4071,9 @@ UX_STEP_NOCB(

UX_DEF(ux_approval_unfreeze_flow,
&ux_approval_unfreeze_flow_1_step,
&ux_approval_tx_data_warning_step,
&ux_approval_unfreeze_flow_2_step,
&ux_approval_unfreeze_flow_3_step,
&ux_approval_freeze_flow_5_step,
&ux_approval_freeze_flow_5_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -4093,8 +4083,34 @@ UX_DEF(ux_approval_unfreeze_data_warning_flow,
&ux_approval_tx_data_warning_step,
&ux_approval_unfreeze_flow_2_step,
&ux_approval_unfreeze_flow_3_step,
&ux_approval_freeze_flow_5_step,
&ux_approval_freeze_flow_5_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);


// WITHDRAW BALANCE TRANSACTION
//////////////////////////////////////////////////////////////////////
UX_STEP_NOCB(
ux_approval_withdraw_balance_flow_1_step,
pnn,
{
&C_icon_eye,
"Claim",
"rewards",
});

UX_DEF(ux_approval_withdraw_balance_flow,
&ux_approval_withdraw_balance_flow_1_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);

UX_DEF(ux_approval_withdraw_balance_data_warning_flow,
&ux_approval_withdraw_balance_flow_1_step,
&ux_approval_tx_data_warning_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -4137,21 +4153,14 @@ UX_STEP_NOCB(
.title = "Expected",
.text = G_io_apdu_buffer+100,
});
UX_STEP_NOCB(
ux_approval_exchange_transaction_6_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress,
});

UX_DEF(ux_approval_exchange_transaction_flow,
&ux_approval_exchange_transaction_1_step,
&ux_approval_exchange_transaction_2_step,
&ux_approval_exchange_transaction_3_step,
&ux_approval_exchange_transaction_4_step,
&ux_approval_exchange_transaction_5_step,
&ux_approval_exchange_transaction_6_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -4163,7 +4172,7 @@ UX_DEF(ux_approval_exchange_transaction_data_warning_flow,
&ux_approval_exchange_transaction_3_step,
&ux_approval_exchange_transaction_4_step,
&ux_approval_exchange_transaction_5_step,
&ux_approval_exchange_transaction_6_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -4207,21 +4216,14 @@ UX_STEP_NOCB(
.title = "Amount",
.text = G_io_apdu_buffer,
});
UX_STEP_NOCB(
ux_approval_exchange_wi_6_step,
bnnn_paging,
{
.title = "From ADDRESS",
.text = fromAddress,
});

UX_DEF(ux_approval_exchange_wi_flow,
&ux_approval_exchange_wi_1_step,
&ux_approval_exchange_wi_2_step,
&ux_approval_exchange_wi_3_step,
&ux_approval_exchange_wi_4_step,
&ux_approval_exchange_wi_5_step,
&ux_approval_exchange_wi_6_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -4233,7 +4235,7 @@ UX_DEF(ux_approval_exchange_wi_data_warning_flow,
&ux_approval_exchange_wi_3_step,
&ux_approval_exchange_wi_4_step,
&ux_approval_exchange_wi_5_step,
&ux_approval_exchange_wi_6_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -4378,13 +4380,6 @@ UX_STEP_NOCB(
.title = "Call Amount",
.text = G_io_apdu_buffer,
});
UX_STEP_NOCB(
ux_approval_custom_contract_6_step,
bnnn_paging,
{
.title = "From Address",
.text = fromAddress,
});

UX_STEP_NOCB(ux_approval_custom_contract_warning_step,
pnn,
Expand All @@ -4401,7 +4396,7 @@ UX_DEF(ux_approval_custom_contract_flow,
&ux_approval_custom_contract_3_step,
&ux_approval_custom_contract_4_step,
&ux_approval_custom_contract_5_step,
&ux_approval_custom_contract_6_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand All @@ -4414,7 +4409,7 @@ UX_DEF(ux_approval_custom_contract_data_warning_flow,
&ux_approval_custom_contract_3_step,
&ux_approval_custom_contract_4_step,
&ux_approval_custom_contract_5_step,
&ux_approval_custom_contract_6_step,
&ux_approval_from_address_step,
&ux_approval_confirm_step,
&ux_approval_reject_step
);
Expand Down Expand Up @@ -4988,7 +4983,7 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer,
if (votes_count-- > 0)
ux_approval_vote_flow[step++] = &ux_approval_vote_flow_6_step;

ux_approval_vote_flow[step++] = &ux_approval_vote_flow_7_step;
ux_approval_vote_flow[step++] = &ux_approval_from_address_step;
ux_approval_vote_flow[step++] = &ux_approval_confirm_step;
ux_approval_vote_flow[step++] = &ux_approval_reject_step;
ux_approval_vote_flow[step++] = FLOW_END_STEP;
Expand Down Expand Up @@ -5051,6 +5046,21 @@ void handleSign(uint8_t p1, uint8_t p2, uint8_t *workBuffer,
THROW(0x6B00); // not implemented
#endif // #if TARGET_ID
break;
case WITHDRAWBALANCECONTRACT: // Claim Rewards
getBase58FromAddress(txContent.account,
(uint8_t *)toAddress, &sha2, truncateAddress);

#if defined(TARGET_BLUE)
G_ui_approval_blue_state = APPROVAL_WITHDRAWBALANCE_TRANSACTION;
ui_approval_withdraw_balance_transaction_blue_init();
#elif defined(HAVE_UX_FLOW)
ux_flow_init(0,
((txContent.dataBytes>0)? ux_approval_withdraw_balance_data_warning_flow : ux_approval_withdraw_balance_flow),
NULL);
#elif defined(TARGET_NANOS)
THROW(0x6B00); // not implemented
#endif // #if TARGET_ID
break;
case INVALID_CONTRACT:
THROW(0x6B00); // Contract not initialized
break;
Expand Down
2 changes: 1 addition & 1 deletion tests/test_trx.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def sign(self, path, tx, signatures=[], verbose=False):
# get next message field
newpos = self.get_next_length(tx)
assert(newpos<max_length)
if (len(data)+newpos) > (max_length-21 if len(to_send)==0 else max_length):
if (len(data)+newpos) > max_length:
# add chunk
to_send.append(data.hex())
data = bytearray()
Expand Down

0 comments on commit 57cebb8

Please sign in to comment.