From e0ea3697f6fba936473d3b0d336970f42afe76ed Mon Sep 17 00:00:00 2001
From: Alexandre Paillier <alexandre.paillier@ledger.fr>
Date: Wed, 16 Aug 2023 10:37:41 +0200
Subject: [PATCH] Renamed CAL_TEST_KEY to CAL_STAGING_KEY & CAL_CI_KEY to
 CAL_TEST_KEY

---
 .github/workflows/ci-workflow.yml |  2 +-
 Makefile                          | 14 ++++++++++----
 src/tokens.h                      | 18 +++++++-----------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
index b1259e7..c260b35 100644
--- a/.github/workflows/ci-workflow.yml
+++ b/.github/workflows/ci-workflow.yml
@@ -171,7 +171,7 @@ jobs:
     uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_build.yml@v1
     with:
       upload_app_binaries_artifact: "ragger_elfs"
-      flags: "DEBUG=1 CAL_CI_KEY=1 DOMAIN_NAME_TEST_KEY=1"
+      flags: "DEBUG=1 CAL_TEST_KEY=1 DOMAIN_NAME_TEST_KEY=1"
 
   jobs-ragger-tests:
     name: Run Ragger tests
diff --git a/Makefile b/Makefile
index b984e4b..efc8f6b 100644
--- a/Makefile
+++ b/Makefile
@@ -169,12 +169,18 @@ endif
 
 # CryptoAssetsList key
 CAL_TEST_KEY:=0
-CAL_CI_KEY:=0
 ifneq ($(CAL_TEST_KEY),0)
-DEFINES += HAVE_CAL_TEST_KEY
+    DEFINES += HAVE_CAL_TEST_KEY
 endif
-ifneq ($(CAL_CI_KEY),0)
-DEFINES += HAVE_CAL_CI_KEY
+CAL_STAGING_KEY:=0
+ifneq ($(CAL_STAGING_KEY),0)
+    # Key used by the staging CAL
+    DEFINES += HAVE_CAL_STAGING_KEY
+endif
+ifneq (,$(filter $(DEFINES),HAVE_CAL_TEST_KEY))
+    ifneq (, $(filter $(DEFINES),HAVE_CAL_STAGING_KEY))
+        $(error Multiple alternative CAL keys set at once)
+    endif
 endif
 
 # ENS
diff --git a/src/tokens.h b/src/tokens.h
index 1a261c3..feeecb8 100644
--- a/src/tokens.h
+++ b/src/tokens.h
@@ -43,24 +43,20 @@ extern tokenDefinition_t const TOKENS_EXTRA[NUM_TOKENS_EXTRA];
 
 #ifndef HAVE_TOKENS_LIST
 
-#if defined(HAVE_CAL_TEST_KEY) && defined(HAVE_CAL_CI_KEY)
-#error "CAL key contradiction, two alternative keys selected at once"
-#endif
-
 static const uint8_t LEDGER_SIGNATURE_PUBLIC_KEY[] = {
 #if defined(HAVE_CAL_TEST_KEY)
-    // test key 2019-01-11 03:07PM (erc20signer)
-    0x04, 0x20, 0xda, 0x62, 0x00, 0x3c, 0x0c, 0xe0, 0x97, 0xe3, 0x36, 0x44, 0xa1, 0x0f,
-    0xe4, 0xc3, 0x04, 0x54, 0x06, 0x9a, 0x44, 0x54, 0xf0, 0xfa, 0x9d, 0x4e, 0x84, 0xf4,
-    0x50, 0x91, 0x42, 0x9b, 0x52, 0x20, 0xaf, 0x9e, 0x35, 0xc0, 0xb2, 0xd9, 0x28, 0x93,
-    0x80, 0x13, 0x73, 0x07, 0xde, 0x4d, 0xd1, 0xd4, 0x18, 0x42, 0x8c, 0xf2, 0x1a, 0x93,
-    0xb3, 0x35, 0x61, 0xbb, 0x09, 0xd8, 0x8f, 0xe5, 0x79
-#elif defined(HAVE_CAL_CI_KEY)
     0x04, 0x4c, 0xca, 0x8f, 0xad, 0x49, 0x6a, 0xa5, 0x04, 0x0a, 0x00, 0xa7, 0xeb, 0x2f,
     0x5c, 0xc3, 0xb8, 0x53, 0x76, 0xd8, 0x8b, 0xa1, 0x47, 0xa7, 0xd7, 0x05, 0x4a, 0x99,
     0xc6, 0x40, 0x56, 0x18, 0x87, 0xfe, 0x17, 0xa0, 0x96, 0xe3, 0x6c, 0x3b, 0x52, 0x3b,
     0x24, 0x4f, 0x3e, 0x2f, 0xf7, 0xf8, 0x40, 0xae, 0x26, 0xc4, 0xe7, 0x7a, 0xd3, 0xbc,
     0x73, 0x9a, 0xf5, 0xde, 0x6f, 0x2d, 0x77, 0xa7, 0xb6
+#elif defined(HAVE_CAL_STAGING_KEY)
+    // staging key 2019-01-11 03:07PM (erc20signer)
+    0x04, 0x20, 0xda, 0x62, 0x00, 0x3c, 0x0c, 0xe0, 0x97, 0xe3, 0x36, 0x44, 0xa1, 0x0f,
+    0xe4, 0xc3, 0x04, 0x54, 0x06, 0x9a, 0x44, 0x54, 0xf0, 0xfa, 0x9d, 0x4e, 0x84, 0xf4,
+    0x50, 0x91, 0x42, 0x9b, 0x52, 0x20, 0xaf, 0x9e, 0x35, 0xc0, 0xb2, 0xd9, 0x28, 0x93,
+    0x80, 0x13, 0x73, 0x07, 0xde, 0x4d, 0xd1, 0xd4, 0x18, 0x42, 0x8c, 0xf2, 0x1a, 0x93,
+    0xb3, 0x35, 0x61, 0xbb, 0x09, 0xd8, 0x8f, 0xe5, 0x79
 #else
     // production key 2019-01-11 03:07PM (erc20signer)
     0x04, 0x5e, 0x6c, 0x10, 0x20, 0xc1, 0x4d, 0xc4, 0x64, 0x42, 0xfe, 0x89, 0xf9, 0x7c,