From 1d444c384563f901ba860ace1ef45779dca9eff8 Mon Sep 17 00:00:00 2001 From: Eugene Rossokha Date: Tue, 14 Jan 2025 14:28:52 +0200 Subject: [PATCH] fix(core): add display_name for missing token_mint --- common/defs/solana/programs.json | 40 ++++++++++-- common/defs/solana/programs.md | 24 +++---- .../apps/solana/transaction/instructions.py | 64 +++++++++++++++++-- tests/ui_tests/fixtures.json | 12 ++-- 4 files changed, 114 insertions(+), 26 deletions(-) diff --git a/common/defs/solana/programs.json b/common/defs/solana/programs.json index 1531806d96..541ed6ae33 100644 --- a/common/defs/solana/programs.json +++ b/common/defs/solana/programs.json @@ -1637,9 +1637,13 @@ } ], "ui_properties": [ + { + "account": "mint", + "display_name": "Mint token" + }, { "parameter": "amount", - "display_name": "Mint tokens" + "display_name": "Mint amount" }, { "account": "account_to_mint", @@ -1681,9 +1685,13 @@ } ], "ui_properties": [ + { + "account": "token_mint", + "display_name": "Burn token" + }, { "parameter": "amount", - "display_name": "Burn tokens" + "display_name": "Burn amount" }, { "account": "account_to_burn_from", @@ -1759,6 +1767,10 @@ "account": "account_to_freeze", "display_name": "Freeze account" }, + { + "account": "token_mint", + "display_name": "Token" + }, { "account": "freeze_authority", "display_name": "Owner" @@ -1792,6 +1804,10 @@ "account": "account_to_freeze", "display_name": "Thaw account" }, + { + "account": "token_mint", + "display_name": "Token" + }, { "account": "freeze_authority", "display_name": "Owner" @@ -2428,9 +2444,13 @@ } ], "ui_properties": [ + { + "account": "mint", + "display_name": "Mint token" + }, { "parameter": "amount", - "display_name": "Mint tokens" + "display_name": "Mint amount" }, { "account": "account_to_mint", @@ -2472,9 +2492,13 @@ } ], "ui_properties": [ + { + "account": "token_mint", + "display_name": "Burn token" + }, { "parameter": "amount", - "display_name": "Burn tokens" + "display_name": "Burn amount" }, { "account": "account_to_burn_from", @@ -2550,6 +2574,10 @@ "account": "account_to_freeze", "display_name": "Freeze account" }, + { + "account": "token_mint", + "display_name": "Token" + }, { "account": "freeze_authority", "display_name": "Owner" @@ -2583,6 +2611,10 @@ "account": "account_to_freeze", "display_name": "Thaw account" }, + { + "account": "token_mint", + "display_name": "Token" + }, { "account": "freeze_authority", "display_name": "Owner" diff --git a/common/defs/solana/programs.md b/common/defs/solana/programs.md index d31e7fd081..f0c889ba78 100644 --- a/common/defs/solana/programs.md +++ b/common/defs/solana/programs.md @@ -348,19 +348,19 @@ _This file is generated by `programs.md.mako` via `make solana_templates`, do no | Label | Value | Type | |-------|-------|------| -| Mint tokens | `amount` | `u64` | +| Mint token | `mint` | `account` | +| Mint amount | `amount` | `u64` | | To | `account_to_mint` | `account` | | Mint authority | `minting_authority` | `account` | -| _(not shown)_ | `mint` | `account` | ### (8) Burn | Label | Value | Type | |-------|-------|------| -| Burn tokens | `amount` | `u64` | +| Burn token | `token_mint` | `account` | +| Burn amount | `amount` | `u64` | | From | `account_to_burn_from` | `account` | | Mint authority | `owner` | `account` | -| _(not shown)_ | `token_mint` | `account` | ### (9) Close Account @@ -375,16 +375,16 @@ _This file is generated by `programs.md.mako` via `make solana_templates`, do no | Label | Value | Type | |-------|-------|------| | Freeze account | `account_to_freeze` | `account` | +| Token | `token_mint` | `account` | | Owner | `freeze_authority` | `account` | -| _(not shown)_ | `token_mint` | `account` | ### (11) Thaw Account | Label | Value | Type | |-------|-------|------| | Thaw account | `account_to_freeze` | `account` | +| Token | `token_mint` | `account` | | Owner | `freeze_authority` | `account` | -| _(not shown)_ | `token_mint` | `account` | ### (12) Transfer Checked @@ -517,19 +517,19 @@ _This file is generated by `programs.md.mako` via `make solana_templates`, do no | Label | Value | Type | |-------|-------|------| -| Mint tokens | `amount` | `u64` | +| Mint token | `mint` | `account` | +| Mint amount | `amount` | `u64` | | To | `account_to_mint` | `account` | | Mint authority | `minting_authority` | `account` | -| _(not shown)_ | `mint` | `account` | ### (8) Burn | Label | Value | Type | |-------|-------|------| -| Burn tokens | `amount` | `u64` | +| Burn token | `token_mint` | `account` | +| Burn amount | `amount` | `u64` | | From | `account_to_burn_from` | `account` | | Mint authority | `owner` | `account` | -| _(not shown)_ | `token_mint` | `account` | ### (9) Close Account @@ -544,16 +544,16 @@ _This file is generated by `programs.md.mako` via `make solana_templates`, do no | Label | Value | Type | |-------|-------|------| | Freeze account | `account_to_freeze` | `account` | +| Token | `token_mint` | `account` | | Owner | `freeze_authority` | `account` | -| _(not shown)_ | `token_mint` | `account` | ### (11) Thaw Account | Label | Value | Type | |-------|-------|------| | Thaw account | `account_to_freeze` | `account` | +| Token | `token_mint` | `account` | | Owner | `freeze_authority` | `account` | -| _(not shown)_ | `token_mint` | `account` | ### (12) Transfer Checked diff --git a/core/src/apps/solana/transaction/instructions.py b/core/src/apps/solana/transaction/instructions.py index 4bcd888708..f98c5f7572 100644 --- a/core/src/apps/solana/transaction/instructions.py +++ b/core/src/apps/solana/transaction/instructions.py @@ -3229,10 +3229,17 @@ def get_instruction( ), ], [ + UIProperty( + None, + "mint", + "Mint token", + False, + None, + ), UIProperty( "amount", None, - "Mint tokens", + "Mint amount", False, None, ), @@ -3291,10 +3298,17 @@ def get_instruction( ), ], [ + UIProperty( + None, + "token_mint", + "Burn token", + False, + None, + ), UIProperty( "amount", None, - "Burn tokens", + "Burn amount", False, None, ), @@ -3406,6 +3420,13 @@ def get_instruction( False, None, ), + UIProperty( + None, + "token_mint", + "Token", + False, + None, + ), UIProperty( None, "freeze_authority", @@ -3453,6 +3474,13 @@ def get_instruction( False, None, ), + UIProperty( + None, + "token_mint", + "Token", + False, + None, + ), UIProperty( None, "freeze_authority", @@ -4381,10 +4409,17 @@ def get_instruction( ), ], [ + UIProperty( + None, + "mint", + "Mint token", + False, + None, + ), UIProperty( "amount", None, - "Mint tokens", + "Mint amount", False, None, ), @@ -4443,10 +4478,17 @@ def get_instruction( ), ], [ + UIProperty( + None, + "token_mint", + "Burn token", + False, + None, + ), UIProperty( "amount", None, - "Burn tokens", + "Burn amount", False, None, ), @@ -4558,6 +4600,13 @@ def get_instruction( False, None, ), + UIProperty( + None, + "token_mint", + "Token", + False, + None, + ), UIProperty( None, "freeze_authority", @@ -4605,6 +4654,13 @@ def get_instruction( False, None, ), + UIProperty( + None, + "token_mint", + "Token", + False, + None, + ), UIProperty( None, "freeze_authority", diff --git a/tests/ui_tests/fixtures.json b/tests/ui_tests/fixtures.json index fad80044dd..74abf3b0f5 100644 --- a/tests/ui_tests/fixtures.json +++ b/tests/ui_tests/fixtures.json @@ -5172,7 +5172,7 @@ "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[authorize_checked_with_seed]": "5266fa3e933e8bf203bfd0f1b9e8dd014d0ab11eb632e12ea12246774603aa20", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[authorize_nonce_account]": "368004ce6538e6c66950359d906bb7610fb4f6a848bccbc160a02de12025d634", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[authorize_with_seed]": "3a9cb44bb8933a1b35df49fa4b1bf2e287cacfd710dc84788e9ee93204f8fa66", -"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[burn]": "7ae3abe87dcc439d593fff1b5eb49a20ffbd962ef52acc0d1ea6c467c0b2cba0", +"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[burn]": "c2ac95f8a924c05388b9e7bd8a0391273777c968a4ea38bf804e5f8b2500d5cd", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[burn_checked]": "8017c70cb7ca945b985210e05195e0b29689527a0bd233ef65e6972a9a5bac20", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[burn_checked_-_multisig]": "7640124cb84555d1ed5abbfcf4098dfb0dbd4cd5461f9694de6518c14fe668c9", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[claim_instructions]": "5d4c657a9d6d2dd260748c452e85657a9c013a15c09a416da054b4f806fd929b", @@ -5189,8 +5189,8 @@ "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[create_token_account_and_transfer_token_-_predefined]": "75a9d45b62c0354cbb912f558fa46c7ca484a3a2c3eb95e772e4a16605f85527", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[deactivate]": "4f4e440f864933735427dadbdf9276928c4b77c32064cf571ded7064a7fa5994", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[delegate]": "c227efee90e84a86602a854007dd5871d11a58bc7a22dcf5806b1dcf0e97d590", -"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[freeze_account]": "e3f8c4de71faef72f033e5c76677feff6f8868ed6c0c458927aa57b85be75161", -"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[freeze_account_-_multisig]": "d6b60f9f65e5b65fe2ce7abbb8509ac9b10d3f84ba76e7486e328f4f3b356e76", +"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[freeze_account]": "080d121c3e0b7b479e9d1fa2c8eece59a4c54e4aceedefc5277d84d663c7f054", +"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[freeze_account_-_multisig]": "863bc81cfab3b6a1c5a4179c3a360b7962f4068886ed5778dfeefee91067baf2", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[initialize_account]": "ca2bcf86db8a5c004ce2377e7fb9e77b38a5b41ef3bcab1026dd3dc077c4e50b", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[initialize_checked]": "11256f6fed17f33d8c1387a596881a5ff275e31ee8bee2abf52168d9c641e80e", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[initialize_immutable_owner]": "5017efe44346781be112b5818c09fe4e6217c54d7f0df86602a5eabad41623eb", @@ -5203,7 +5203,7 @@ "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[memo]": "5565c6ee8e954b8b661885516f0efbfe9f0e49eaaf597400b5275f255afc4d6e", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[memo_legacy]": "8a5d133ce06a247988f6109d488a618e4926793f6ac2abcd621634e186af27fa", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[merge]": "cc804bf0c3615e42c948fb5b499e23a9befaec045d23217fe51d48be67eb5933", -"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[mint_to]": "3395dd949bed8c6ee1d2ee92734fe5937f84ffd29d6586e1eaf97f79a0c323b0", +"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[mint_to]": "541f5ad56a60d9717f5027309453ac589ea70865fd32223984f003bb82fb3574", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[mint_to_checked]": "c16c3812385c2e92107ab17e0699a21257511ba885681138bc27ee7756a4ce29", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[mint_to_checked_-_multisig]": "35d5a5f049541e8a0513523ab2ebae4fb8d3c21fe643cb2b3dfe796c2938d228", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[multiple_claim_instructions]": "0768123aada21b89a938bb5701d2ced2f7a27a52a98fbfdea357e0db7b6b612f", @@ -5220,8 +5220,8 @@ "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[stake_instructions_on_everstake]": "a496f0c67ea9ee5dd73d4b400d73221c480300b34f8098cf65037232b8aeb753", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[stake_instructions_with_warning]": "3b5d3b5a640d077c6aa4ab7590107ab8e54953721cb03034a7bd29b9ddee1117", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[sync_native]": "5a5cc506048b5025bac6cf82ef63d6d81be36fa01cef471eb69f9cd526787f96", -"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[thaw_account]": "0312b269438961cac1d5f8d05414f7a318318c390a235402446788fb59ab26a2", -"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[thaw_account_-_multisig]": "4613157fbf5d5b48ee47d638a68d814f88bcfa41e88d09e189017fcdeb9fa5f7", +"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[thaw_account]": "b852a41782ca83a93e56e6f55d827bdafb9c4f7c85f21c79624f41f182fe8acc", +"T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[thaw_account_-_multisig]": "ee61af4dd25ef257bab4f1484823a27c6f17c37a27615179f69feea3112c77f0", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[transfer0]": "1f52e2fcf8fc3560890cff045de1b0163c9358705b5f03e3c013a33cb299ace6", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[transfer1]": "7721e725a6bc353224b61a51136cedf0a1df0be3f7db52ae0d84a2d4a89c721d", "T2T1_en_solana-test_sign_tx.py::test_solana_sign_tx[transfer_checked]": "c09aa7d4ecfcd61df013cf7eb35927ace16f7efcb72f837366ed99543d353a3f",