[update] Branch develop | Commit 5203780b6a3e26589aa4a424f713593e6a66e740

Author: ldg-github-ci

include/eth_internals.h

@@ -21,17 +21,14 @@
 
 #define RUN_APPLICATION  1
 
-#define COLLECTION_NAME_MAX_LEN (sizeof(tokenDefinition_t) - ADDRESS_LENGTH)
+#define COLLECTION_NAME_MAX_LEN 70
 
 typedef struct tokenDefinition_t {
+    uint8_t address[ADDRESS_LENGTH];  // must be first item
 #ifdef HAVE_CONTRACT_NAME_IN_DESCRIPTOR
     uint8_t contractName[ADDRESS_LENGTH];
 #endif
-    uint8_t address[ADDRESS_LENGTH];
     char ticker[MAX_TICKER_LEN];
-    char nft_pad[20];  // Adding some padding because the `nftInfo_t` is based on the size of a
-                       // `tokenDefinition_t`. By adding some padding here we give more space to the
-                       // collection name in the `nftInfo_t`. See `nftInfo_t` for more information.
     uint8_t decimals;
 } tokenDefinition_t;
 
@@ -54,9 +51,10 @@ typedef struct txContent_t {
 } txContent_t;
 
 typedef struct nftInfo_t {
-    char collectionName[COLLECTION_NAME_MAX_LEN];
-    char contractAddress[ADDRESS_LENGTH];
+    uint8_t contractAddress[ADDRESS_LENGTH];  // must be first item
+    char collectionName[COLLECTION_NAME_MAX_LEN + 1];
 } nftInfo_t;
+
 typedef union extraInfo_t {
     tokenDefinition_t token;
     nftInfo_t nft;

include/eth_plugin_interface.h

@@ -1,7 +1,6 @@
 /* This file is auto-generated, don't edit it */
-#ifndef __ETH_PLUGIN_INTERFACE_H__
-
-#define __ETH_PLUGIN_INTERFACE_H__
+#ifndef _ETH_PLUGIN_INTERFACE_H_
+#define _ETH_PLUGIN_INTERFACE_H_
 
 #include "os.h"
 #include "cx.h"
@@ -12,7 +11,8 @@ typedef enum {
     ETH_PLUGIN_INTERFACE_VERSION_1 = 1,
     ETH_PLUGIN_INTERFACE_VERSION_2 = 2,
     ETH_PLUGIN_INTERFACE_VERSION_3 = 3,
-    ETH_PLUGIN_INTERFACE_VERSION_LATEST = 4,
+    ETH_PLUGIN_INTERFACE_VERSION_4 = 4,
+    ETH_PLUGIN_INTERFACE_VERSION_LATEST = 5,
 } eth_plugin_interface_version_t;
 
 typedef enum {
@@ -178,4 +178,4 @@ typedef struct ethQueryContractUI_t {
 
 } ethQueryContractUI_t;
 
-#endif
+#endif  // _ETH_PLUGIN_INTERFACE_H_