Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #30

Merged
merged 4 commits into from
Dec 6, 2024
Merged

Fix #30

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Makefile.version
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ APPVERSION_M=2
# This is the minor version
APPVERSION_N=4
# This is the patch version
APPVERSION_P=1
APPVERSION_P=2
17 changes: 16 additions & 1 deletion app/src/evm/parser_impl_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,22 @@ static parser_error_t printGeneric(const parser_context_t *ctx, uint8_t displayI
break;
case 1:
snprintf(outKey, outKeyLen, "Coin asset");
snprintf(outVal, outValLen, "Flare");
switch (eth_tx_obj.chainId.chain_id_decoded) {
case FLARE_MAINNET_CHAINID:
snprintf(outVal, outValLen, "Flare");
break;
case COSTON_CHAINID:
snprintf(outVal, outValLen, "Coston Flare");
break;
case SONG_BIRD_CHAINID:
snprintf(outVal, outValLen, "Songbird");
break;
case COSTON2_CHAINID:
snprintf(outVal, outValLen, "Coston2 Flare");
break;
default:
return parser_invalid_chain_id;
}
break;
case 2:
snprintf(outKey, outKeyLen, "Value");
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/fl-mainmenu/00004.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests_zemu/snapshots/s-mainmenu/00005.png
Binary file modified tests_zemu/snapshots/s-mainmenu/00009.png
Binary file modified tests_zemu/snapshots/sp-mainmenu/00005.png
Binary file modified tests_zemu/snapshots/sp-mainmenu/00009.png
Binary file modified tests_zemu/snapshots/st-mainmenu/00004.png
Binary file modified tests_zemu/snapshots/x-mainmenu/00005.png
Binary file modified tests_zemu/snapshots/x-mainmenu/00009.png
13 changes: 13 additions & 0 deletions tests_zemu/tests/eth_tests.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,19 @@ const SIGN_TEST_DATA = [
op: Buffer.from('eb80856d6e2edc00832dc6c094c67dce33d7a8efa5ffeb961899c73fe01bce92738203e884b302f3930e8080', 'hex'),
blindsign_required: true,
},
{
name: 'deposit_dummy_contract_coston_network',
op: Buffer.from('eb80856d6e2edc00832dc6c094c67dce33d7a8efa5ffeb961899c73fe01bce92738203e884b302f393108080', 'hex'),
blindsign_required: true,
},
{
name: 'erc20_transfer_coston_network',
op: Buffer.from(
'f86c80856d6e2edc00832dc6c0941d80c49bbbcd1c0911346656b529df9e5c2f783d8203e8b844a9059cbb000000000000000000000000b7784e5ad303d44067d2a6353441b784c226ccaf00000000000000000000000000000000000000000000000000000000075bca00108080',
'hex',
),
blindsign_required: false,
},
]

jest.setTimeout(90000)
Expand Down
Loading