d-bis/app-ethereum
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix nft transactions (#229)

Browse Source 
* Removed pluginType "hack"

* Fix some ERC 721 & 1155 function signature hashes

* Fix UI for ERC721 operations

* Explicit Batch Transfer UI with ERC1155

* Unified some ERC721 & 1155 non-static functions naming

* Fix UI for ERC1155 operations

* Added missing pin-lock check when signing transactions

* Fix the shell script that builds the elf files for testing

* Add tests dependency ethers

* Removed the space in the test filename

* Tests build script refactoring

* Now works when called from anywhere (not just the script's directory)
* Now handles LNS & LNX builds together (less duplicated code)

* Temporarily disable Nano X tests

Until Zemu supports Nano X 2.0 SDK

* Tests now start with blind signing disabled

Makes it closer to reality & very few of them requires it

* Update to the latest sdk version

* make eth_plugin_perform_init() readable

Introduce 2 functions.

* Now properly parses the apdu and displays the total quantity of NFT IDs transferred in ERC1155 batch transfer

* Add NFT prod public keys

* Added extra checks for the chain ID handling

Following the security review

* NFTs now only supported by LNS

* Version bump

Co-authored-by: Alexandre Paillier <alexandre.paillier@ledger.fr>
Co-authored-by: greenknot <greenknot@users.noreply.github.com>
This commit is contained in:
Jean P
2021-12-17 12:04:51 +01:00
committed by GitHub
parent 586155c0d4
commit a53a2428cc
40 changed files with 735 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src_plugins/erc721/erc721_plugin.c
View File

@@ -1,11 +1,13 @@
#ifdef HAVE_NFT_SUPPORT
#include "erc721_plugin.h"
#include "eth_plugin_internal.h"
static const uint8_t ERC721_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x13, 0x37, 0x42, 0x42};
static const uint8_t ERC721_APPROVE_SELECTOR[SELECTOR_SIZE] = {0x09, 0x5e, 0xa7, 0xb3};
static const uint8_t ERC721_APPROVE_FOR_ALL_SELECTOR[SELECTOR_SIZE] = {0xa2, 0x2c, 0xb4, 0x65};
static const uint8_t ERC721_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0x23, 0xb8, 0x72, 0xdd};
static const uint8_t ERC721_SAFE_TRANSFER_SELECTOR[SELECTOR_SIZE] = {0x42, 0x84, 0x2e, 0x0e};
static const uint8_t ERC721_SAFE_TRANSFER_DATA_SELECTOR[SELECTOR_SIZE] = {0xf2, 0x42, 0x43, 0x2a};
static const uint8_t ERC721_SAFE_TRANSFER_DATA_SELECTOR[SELECTOR_SIZE] = {0xb8, 0x8d, 0x4f, 0xde};
const uint8_t *const ERC721_SELECTORS[NUM_ERC721_SELECTORS] = {
ERC721_APPROVE_SELECTOR,
@@ -62,12 +64,12 @@ static void handle_finalize(void *parameters) {
case TRANSFER:
case SAFE_TRANSFER:
case SAFE_TRANSFER_DATA:
case SET_APPROVAL_FOR_ALL:
msg->numScreens = 3;
break;
case APPROVE:
msg->numScreens = 4;
break;
case SET_APPROVAL_FOR_ALL:
msg->numScreens = 3;
break;
default:
msg->result = ETH_PLUGIN_RESULT_ERROR;
return;
@@ -125,7 +127,7 @@ void erc721_plugin_call(int message, void *parameters) {
handle_init_contract(parameters);
} break;
case ETH_PLUGIN_PROVIDE_PARAMETER: {
handle_provide_parameter(parameters);
handle_provide_parameter_721(parameters);
} break;
case ETH_PLUGIN_FINALIZE: {
handle_finalize(parameters);
@@ -137,10 +139,12 @@ void erc721_plugin_call(int message, void *parameters) {
handle_query_contract_id(parameters);
} break;
case ETH_PLUGIN_QUERY_CONTRACT_UI: {
handle_query_contract_ui(parameters);
handle_query_contract_ui_721(parameters);
} break;
default:
PRINTF("Unhandled message %d\n", message);
break;
}
}
#endif // HAVE_NFT_SUPPORT

8
src_plugins/erc721/erc721_plugin.h
View File

@@ -1,3 +1,5 @@
#ifdef HAVE_NFT_SUPPORT
#pragma once
#include <string.h>
@@ -38,5 +40,7 @@ typedef struct erc721_context_t {
uint8_t selectorIndex;
} erc721_context_t;
void handle_provide_parameter(void *parameters);
void handle_query_contract_ui(void *parameters);
void handle_provide_parameter_721(void *parameters);
void handle_query_contract_ui_721(void *parameters);
#endif // HAVE_NFT_SUPPORT

8
src_plugins/erc721/erc721_provide_parameters.c
View File

@@ -1,3 +1,5 @@
#ifdef HAVE_NFT_SUPPORT
#include "erc721_plugin.h"
#include "eth_plugin_internal.h"
@@ -60,7 +62,7 @@ static void handle_approval_for_all(ethPluginProvideParameter_t *msg, erc721_con
}
}
void handle_provide_parameter(void *parameters) {
void handle_provide_parameter_721(void *parameters) {
ethPluginProvideParameter_t *msg = (ethPluginProvideParameter_t *) parameters;
erc721_context_t *context = (erc721_context_t *) msg->pluginContext;
@@ -90,4 +92,6 @@ void handle_provide_parameter(void *parameters) {
msg->result = ETH_PLUGIN_RESULT_ERROR;
break;
}
}
}
#endif // HAVE_NFT_SUPPORT

10
src_plugins/erc721/erc721_ui.c
View File

@@ -1,3 +1,5 @@
#ifdef HAVE_NFT_SUPPORT
#include "erc721_plugin.h"
static void set_approval_ui(ethQueryContractUI_t *msg, erc721_context_t *context) {
@@ -113,7 +115,7 @@ static void set_transfer_ui(ethQueryContractUI_t *msg, erc721_context_t *context
break;
case 2:
strlcpy(msg->title, "NFT Address", msg->titleLength);
getEthDisplayableAddress(msg->pluginSharedRO->txContent->destination,
getEthDisplayableAddress((uint8_t *)msg->item1->nft.contractAddress,
msg->msg,
msg->msgLength,
&global_sha3,
@@ -141,7 +143,7 @@ static void set_transfer_ui(ethQueryContractUI_t *msg, erc721_context_t *context
}
}
void handle_query_contract_ui(void *parameters) {
void handle_query_contract_ui_721(void *parameters) {
ethQueryContractUI_t *msg = (ethQueryContractUI_t *) parameters;
erc721_context_t *context = (erc721_context_t *) msg->pluginContext;
@@ -163,4 +165,6 @@ void handle_query_contract_ui(void *parameters) {
PRINTF("Unsupported selector index %d\n", context->selectorIndex);
break;
}
}
}
#endif // HAVE_NFT_SUPPORT