From 72c19e0222c36f03b0b4992fef5da45e2662afee Mon Sep 17 00:00:00 2001 From: Alexandre Paillier Date: Fri, 11 Aug 2023 17:59:42 +0200 Subject: [PATCH] Renamed NFT_TEST_KEY to NFT_STAGING_KEY --- .github/workflows/ci-workflow.yml | 6 +++--- Makefile | 8 ++++---- .../provideNFTInformation/cmd_provideNFTInfo.c | 10 +++++----- src_features/setPlugin/cmd_setPlugin.c | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index d5cf795..b1259e7 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -114,9 +114,9 @@ jobs: - name: Build testing binaries run: | mkdir tests/speculos/elfs - make clean && make -j DEBUG=1 NFT_TESTING_KEY=1 BOLOS_SDK=$NANOS_SDK && mv bin/app.elf tests/speculos/elfs/nanos.elf - make clean && make -j DEBUG=1 NFT_TESTING_KEY=1 BOLOS_SDK=$NANOX_SDK && mv bin/app.elf tests/speculos/elfs/nanox.elf - make clean && make -j DEBUG=1 NFT_TESTING_KEY=1 BOLOS_SDK=$NANOSP_SDK && mv bin/app.elf tests/speculos/elfs/nanosp.elf + make clean && make -j DEBUG=1 NFT_STAGING_KEY=1 BOLOS_SDK=$NANOS_SDK && mv bin/app.elf tests/speculos/elfs/nanos.elf + make clean && make -j DEBUG=1 NFT_STAGING_KEY=1 BOLOS_SDK=$NANOX_SDK && mv bin/app.elf tests/speculos/elfs/nanox.elf + make clean && make -j DEBUG=1 NFT_STAGING_KEY=1 BOLOS_SDK=$NANOSP_SDK && mv bin/app.elf tests/speculos/elfs/nanosp.elf - name: Upload app binaries uses: actions/upload-artifact@v3 diff --git a/Makefile b/Makefile index 96ca6f0..b984e4b 100644 --- a/Makefile +++ b/Makefile @@ -150,10 +150,10 @@ endif # NFTs ifneq ($(TARGET_NAME),TARGET_NANOS) DEFINES += HAVE_NFT_SUPPORT -# Enable the NFT testing key -NFT_TESTING_KEY:=0 -ifneq ($(NFT_TESTING_KEY),0) -DEFINES += HAVE_NFT_TESTING_KEY +# Enable the NFT staging key +NFT_STAGING_KEY:=0 +ifneq ($(NFT_STAGING_KEY),0) +DEFINES += HAVE_NFT_STAGING_KEY endif endif diff --git a/src_features/provideNFTInformation/cmd_provideNFTInfo.c b/src_features/provideNFTInformation/cmd_provideNFTInfo.c index 1971134..f6655b9 100644 --- a/src_features/provideNFTInformation/cmd_provideNFTInfo.c +++ b/src_features/provideNFTInformation/cmd_provideNFTInfo.c @@ -19,8 +19,8 @@ #define MIN_DER_SIG_SIZE 67 #define MAX_DER_SIG_SIZE 72 -#define TEST_NFT_METADATA_KEY 0 -#define PROD_NFT_METADATA_KEY 1 +#define STAGING_NFT_METADATA_KEY 0 +#define PROD_NFT_METADATA_KEY 1 #define ALGORITHM_ID_1 1 @@ -29,7 +29,7 @@ #define VERSION_1 1 static const uint8_t LEDGER_NFT_METADATA_PUBLIC_KEY[] = { -#ifdef HAVE_NFT_TESTING_KEY +#ifdef HAVE_NFT_STAGING_KEY 0x04, 0xf5, 0x70, 0x0c, 0xa1, 0xe8, 0x74, 0x24, 0xc7, 0xc7, 0xd1, 0x19, 0xe7, 0xe3, 0xc1, 0x89, 0xb1, 0x62, 0x50, 0x94, 0xdb, 0x6e, 0xa0, 0x40, 0x87, 0xc8, 0x30, 0x00, 0x7d, 0x0b, 0x46, 0x9a, 0x53, 0x11, 0xee, 0x6a, 0x1a, 0xcd, 0x1d, 0xa5, 0xaa, 0xb0, @@ -156,8 +156,8 @@ void handleProvideNFTInformation(uint8_t p1, PRINTF("KeyID: %d\n", keyId); switch (keyId) { -#ifdef HAVE_NFT_TESTING_KEY - case TEST_NFT_METADATA_KEY: +#ifdef HAVE_NFT_STAGING_KEY + case STAGING_NFT_METADATA_KEY: #endif case PROD_NFT_METADATA_KEY: rawKey = (uint8_t *) LEDGER_NFT_METADATA_PUBLIC_KEY; diff --git a/src_features/setPlugin/cmd_setPlugin.c b/src_features/setPlugin/cmd_setPlugin.c index d4ca3c1..76c5a0b 100644 --- a/src_features/setPlugin/cmd_setPlugin.c +++ b/src_features/setPlugin/cmd_setPlugin.c @@ -46,7 +46,7 @@ typedef enum AlgorithmID { // Only used for signing NFT plugins (ERC721 and ERC1155) static const uint8_t LEDGER_NFT_SELECTOR_PUBLIC_KEY[] = { -#ifdef HAVE_NFT_TESTING_KEY +#ifdef HAVE_NFT_STAGING_KEY 0x04, 0xf5, 0x70, 0x0c, 0xa1, 0xe8, 0x74, 0x24, 0xc7, 0xc7, 0xd1, 0x19, 0xe7, 0xe3, 0xc1, 0x89, 0xb1, 0x62, 0x50, 0x94, 0xdb, 0x6e, 0xa0, 0x40, 0x87, 0xc8, 0x30, 0x00, 0x7d, 0x0b, 0x46, 0x9a, 0x53, 0x11, 0xee, 0x6a, 0x1a, 0xcd, 0x1d, 0xa5, 0xaa, 0xb0, @@ -185,7 +185,7 @@ void handleSetPlugin(uint8_t p1, PRINTF("KeyID: %d\n", keyId); switch (keyId) { -#ifdef HAVE_NFT_TESTING_KEY +#ifdef HAVE_NFT_STAGING_KEY case TEST_PLUGIN_KEY: #endif case PROD_PLUGIN_KEY: