From 474fe19e18cb587533a4c4929146afcd7c5b33dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 15:28:36 +0100 Subject: [PATCH 01/12] Makefile: remove unused MACRO --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index d673ef5b..65a8635d 100644 --- a/Makefile +++ b/Makefile @@ -87,7 +87,6 @@ ifeq ($(TARGET_NAME),TARGET_STAX) else DEFINES += HAVE_BAGL HAVE_UX_FLOW ifneq ($(TARGET_NAME),TARGET_NANOS) - DEFINES += HAVE_GLO096 DEFINES += BAGL_WIDTH=128 BAGL_HEIGHT=64 DEFINES += HAVE_BAGL_ELLIPSIS # long label truncation feature DEFINES += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX From 4ef646e2f5a72232f9bf01c27f6f7916d6860d98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 15:45:22 +0100 Subject: [PATCH 02/12] Makefile: remove already defined in Makefile.defines --- Makefile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 65a8635d..b0f54a1b 100644 --- a/Makefile +++ b/Makefile @@ -86,13 +86,6 @@ ifeq ($(TARGET_NAME),TARGET_STAX) SDK_SOURCE_PATH += qrcode else DEFINES += HAVE_BAGL HAVE_UX_FLOW - ifneq ($(TARGET_NAME),TARGET_NANOS) - DEFINES += BAGL_WIDTH=128 BAGL_HEIGHT=64 - DEFINES += HAVE_BAGL_ELLIPSIS # long label truncation feature - DEFINES += HAVE_BAGL_FONT_OPEN_SANS_REGULAR_11PX - DEFINES += HAVE_BAGL_FONT_OPEN_SANS_EXTRABOLD_11PX - DEFINES += HAVE_BAGL_FONT_OPEN_SANS_LIGHT_16PX - endif endif # Enabling debug PRINTF @@ -130,12 +123,12 @@ endif CC := $(CLANGPATH)clang -CFLAGS += -O3 -Os -Wall -Wextra -Wno-incompatible-pointer-types-discards-qualifiers +CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers AS := $(GCCPATH)arm-none-eabi-gcc LD := $(GCCPATH)arm-none-eabi-gcc -LDFLAGS += -O3 -Os + LDLIBS += -lm -lgcc -lc # import rules to compile glyphs(/pone) @@ -164,11 +157,6 @@ include $(BOLOS_SDK)/Makefile.rules listvariants: @echo VARIANTS APP tezos_baking -# Define DEP_DIR to keep compatibility with old SDK -ifeq ($(DEP_DIR),) - DEP_DIR := dep -endif - # Generate delegates from baker list src/delegates.h: tools/gen-delegates.sh tools/BakersRegistryCoreUnfilteredData.json bash ./tools/gen-delegates.sh ./tools/BakersRegistryCoreUnfilteredData.json From d5b23518d94b6f8cea050dd788de0e99f2c510d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 15:51:09 +0100 Subject: [PATCH 03/12] Makefile: prepare variants for Makefile.standard_app --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index b0f54a1b..e23a2438 100644 --- a/Makefile +++ b/Makefile @@ -154,8 +154,11 @@ delete: # import generic rules from the sdk include $(BOLOS_SDK)/Makefile.rules +VARIANT_PARAM = APP +VARIANT_VALUES = tezos_baking + listvariants: - @echo VARIANTS APP tezos_baking + @echo VARIANTS $(VARIANT_PARAM) $(VARIANT_VALUES) # Generate delegates from baker list src/delegates.h: tools/gen-delegates.sh tools/BakersRegistryCoreUnfilteredData.json From 0c38cf974c784b01b2efc1d5c0dfc6dd2e1b1d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 15:55:01 +0100 Subject: [PATCH 04/12] Makefile: prepare icons for Makefile.standard_app --- Makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e23a2438..59b3a41c 100644 --- a/Makefile +++ b/Makefile @@ -37,12 +37,17 @@ else $(info COMMIT=$(COMMIT)) endif +ICON_NANOS = icons/nano-s-tezos.gif +ICON_NANOX = icons/nano-x-tezos.gif +ICON_NANOSP = $(ICON_NANOX) +ICON_STAX = icons/stax_tezos.gif + ifeq ($(TARGET_NAME),TARGET_NANOS) -ICONNAME=icons/nano-s-tezos.gif +ICONNAME=$(ICON_NANOS) else ifeq ($(TARGET_NAME),TARGET_STAX) -ICONNAME=icons/stax_tezos.gif +ICONNAME=$(ICON_STAX) else -ICONNAME=icons/nano-x-tezos.gif +ICONNAME=$(ICON_NANOX) endif ################ From 8af1f6c5c1f7e1fe3176711b071ee508c5ab0696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 15:56:38 +0100 Subject: [PATCH 05/12] Makefile: qrcode for Makefile.standard_app --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 59b3a41c..2e209208 100644 --- a/Makefile +++ b/Makefile @@ -86,6 +86,7 @@ else DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300 endif +ENABLE_NBGL_QRCODE = 1 ifeq ($(TARGET_NAME),TARGET_STAX) DEFINES += NBGL_QRCODE SDK_SOURCE_PATH += qrcode From 35dad2576a1e442dbd83592d6d5a0c717a6e9fec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 15:58:44 +0100 Subject: [PATCH 06/12] Makefile: prepare APP_FLAGS_APP_LOAD_PARAMS for Makefile.standard_app --- Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Makefile b/Makefile index 2e209208..2e50f974 100644 --- a/Makefile +++ b/Makefile @@ -6,9 +6,12 @@ include $(BOLOS_SDK)/Makefile.defines APPNAME = "Tezos Baking" +HAVE_APPLICATION_FLAG_LIBRARY = 1 ifeq ($(TARGET_NAME), TARGET_NANOS) APP_LOAD_FLAGS=--appFlags 0x800 # APPLICATION_FLAG_LIBRARY else +HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1 +HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1 APP_LOAD_FLAGS=--appFlags 0xa40 # APPLICATION_FLAG_LIBRARY + APPLICATION_FLAG_BOLOS_SETTINGS + BLE SUPPORT endif APP_LOAD_PARAMS=$(APP_LOAD_FLAGS) --curve ed25519 --curve secp256k1 --curve secp256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS) From e98e95e901e4fa0fd3202bca7e73edf3ce1fc5dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 16:08:37 +0100 Subject: [PATCH 07/12] Makefile: prepare enabling/disabling for Makefile.standard_app --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 2e50f974..fdcd0b2c 100644 --- a/Makefile +++ b/Makefile @@ -68,14 +68,18 @@ show-app: # Platform # ############ +DISABLE_STANDARD_APP_SYNC_RAPDU = 1 +DISABLE_STANDARD_APP_FILES = 1 DEFINES += OS_IO_SEPROXYHAL DEFINES += HAVE_SPRINTF +DISABLE_STANDARD_USB = 1 DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU DEFINES += HAVE_LEGACY_PID DEFINES += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M) DEFINES += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P) # DEFINES += _Static_assert\(...\)= +ENABLE_BLUETOOTH = 1 ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX)) DEFINES += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000 DEFINES += HAVE_BLE_APDU # basic ledger apdu transport over BLE From fc313ae7060d961aafdace93d64d9f014579f502 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 16:16:11 +0100 Subject: [PATCH 08/12] Makefile: LOAD_PARAMS for Makefile.standard_app --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index fdcd0b2c..8779627f 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,8 @@ HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1 APP_LOAD_FLAGS=--appFlags 0xa40 # APPLICATION_FLAG_LIBRARY + APPLICATION_FLAG_BOLOS_SETTINGS + BLE SUPPORT endif +CURVE_APP_LOAD_PARAMS = ed25519 secp256k1 secp256r1 +PATH_APP_LOAD_PARAMS = "44'/1729'" APP_LOAD_PARAMS=$(APP_LOAD_FLAGS) --curve ed25519 --curve secp256k1 --curve secp256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS) GIT_DESCRIBE ?= $(shell git describe --tags --abbrev=8 --always --long --dirty 2>/dev/null) From 9e8103c7ecd26b30692be4b8a24de74c5340f144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 17:17:00 +0100 Subject: [PATCH 09/12] Makefile: include Makefile.standard_app --- Makefile | 81 ++------------------------------------------------------ 1 file changed, 2 insertions(+), 79 deletions(-) diff --git a/Makefile b/Makefile index 8779627f..3ade634f 100644 --- a/Makefile +++ b/Makefile @@ -7,16 +7,12 @@ APPNAME = "Tezos Baking" HAVE_APPLICATION_FLAG_LIBRARY = 1 -ifeq ($(TARGET_NAME), TARGET_NANOS) -APP_LOAD_FLAGS=--appFlags 0x800 # APPLICATION_FLAG_LIBRARY -else +ifneq ($(TARGET_NAME), TARGET_NANOS) HAVE_APPLICATION_FLAG_GLOBAL_PIN = 1 HAVE_APPLICATION_FLAG_BOLOS_SETTINGS = 1 -APP_LOAD_FLAGS=--appFlags 0xa40 # APPLICATION_FLAG_LIBRARY + APPLICATION_FLAG_BOLOS_SETTINGS + BLE SUPPORT endif CURVE_APP_LOAD_PARAMS = ed25519 secp256k1 secp256r1 PATH_APP_LOAD_PARAMS = "44'/1729'" -APP_LOAD_PARAMS=$(APP_LOAD_FLAGS) --curve ed25519 --curve secp256k1 --curve secp256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS) GIT_DESCRIBE ?= $(shell git describe --tags --abbrev=8 --always --long --dirty 2>/dev/null) @@ -47,14 +43,6 @@ ICON_NANOX = icons/nano-x-tezos.gif ICON_NANOSP = $(ICON_NANOX) ICON_STAX = icons/stax_tezos.gif -ifeq ($(TARGET_NAME),TARGET_NANOS) -ICONNAME=$(ICON_NANOS) -else ifeq ($(TARGET_NAME),TARGET_STAX) -ICONNAME=$(ICON_STAX) -else -ICONNAME=$(ICON_NANOX) -endif - ################ # Default rule # ################ @@ -72,51 +60,14 @@ show-app: DISABLE_STANDARD_APP_SYNC_RAPDU = 1 DISABLE_STANDARD_APP_FILES = 1 -DEFINES += OS_IO_SEPROXYHAL -DEFINES += HAVE_SPRINTF DISABLE_STANDARD_USB = 1 DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU DEFINES += HAVE_LEGACY_PID DEFINES += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M) DEFINES += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P) -# DEFINES += _Static_assert\(...\)= ENABLE_BLUETOOTH = 1 -ifeq ($(TARGET_NAME),$(filter $(TARGET_NAME),TARGET_NANOX TARGET_STAX)) -DEFINES += HAVE_BLE BLE_COMMAND_TIMEOUT_MS=2000 -DEFINES += HAVE_BLE_APDU # basic ledger apdu transport over BLE - -SDK_SOURCE_PATH += lib_blewbxx lib_blewbxx_impl -endif - -ifeq ($(TARGET_NAME),TARGET_NANOS) -DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=128 -else -DEFINES += IO_SEPROXYHAL_BUFFER_SIZE_B=300 -endif - ENABLE_NBGL_QRCODE = 1 -ifeq ($(TARGET_NAME),TARGET_STAX) - DEFINES += NBGL_QRCODE - SDK_SOURCE_PATH += qrcode -else - DEFINES += HAVE_BAGL HAVE_UX_FLOW -endif - -# Enabling debug PRINTF -DEBUG ?= 0 -ifneq ($(DEBUG),0) - - ifeq ($(TARGET_NAME),TARGET_NANOS) - DEFINES += HAVE_PRINTF PRINTF=screen_printf - else - DEFINES += HAVE_PRINTF PRINTF=mcu_usb_printf - endif -else - DEFINES += PRINTF\(...\)= -endif - - ############## # Compiler # @@ -136,44 +87,16 @@ ifeq ($(GCCPATH),) $(info GCCPATH is not set: arm-none-eabi-* will be used from PATH) endif -CC := $(CLANGPATH)clang - CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers -AS := $(GCCPATH)arm-none-eabi-gcc - -LD := $(GCCPATH)arm-none-eabi-gcc - -LDLIBS += -lm -lgcc -lc - -# import rules to compile glyphs(/pone) -include $(BOLOS_SDK)/Makefile.glyphs - ### computed variables APP_SOURCE_PATH += src SDK_SOURCE_PATH += lib_stusb lib_stusb_impl -ifneq ($(TARGET_NAME),TARGET_STAX) -SDK_SOURCE_PATH += lib_ux -endif - - -DEFINES += HAVE_WEBUSB WEBUSB_URL_SIZE_B=0 WEBUSB_URL="" - -load: all - python3 -m ledgerblue.loadApp $(APP_LOAD_PARAMS) - -delete: - python3 -m ledgerblue.deleteApp $(COMMON_DELETE_PARAMS) - -# import generic rules from the sdk -include $(BOLOS_SDK)/Makefile.rules - VARIANT_PARAM = APP VARIANT_VALUES = tezos_baking -listvariants: - @echo VARIANTS $(VARIANT_PARAM) $(VARIANT_VALUES) +include $(BOLOS_SDK)/Makefile.standard_app # Generate delegates from baker list src/delegates.h: tools/gen-delegates.sh tools/BakersRegistryCoreUnfilteredData.json From 51db41e26fd9393e87d8771561217e3e4a4ff8c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 17:24:45 +0100 Subject: [PATCH 10/12] Makefile: use IO_USB_MAX_ENDPOINTS=4 The default value used in Makefile.standard_app --- Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile b/Makefile index 3ade634f..96678f78 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,6 @@ show-app: DISABLE_STANDARD_APP_SYNC_RAPDU = 1 DISABLE_STANDARD_APP_FILES = 1 -DISABLE_STANDARD_USB = 1 -DEFINES += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=6 IO_HID_EP_LENGTH=64 HAVE_USB_APDU DEFINES += HAVE_LEGACY_PID DEFINES += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M) DEFINES += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P) @@ -91,7 +89,6 @@ CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers ### computed variables APP_SOURCE_PATH += src -SDK_SOURCE_PATH += lib_stusb lib_stusb_impl VARIANT_PARAM = APP VARIANT_VALUES = tezos_baking From c2164e609b342e307fb3695a339b30a480ca9ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 17:27:39 +0100 Subject: [PATCH 11/12] Makefile: do not redefined app version --- Makefile | 4 ++-- src/version.h | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 96678f78..d66c8a1d 100644 --- a/Makefile +++ b/Makefile @@ -61,8 +61,8 @@ show-app: DISABLE_STANDARD_APP_SYNC_RAPDU = 1 DISABLE_STANDARD_APP_FILES = 1 DEFINES += HAVE_LEGACY_PID -DEFINES += VERSION=\"$(APPVERSION)\" APPVERSION_M=$(APPVERSION_M) -DEFINES += COMMIT=\"$(COMMIT)\" APPVERSION_N=$(APPVERSION_N) APPVERSION_P=$(APPVERSION_P) +DEFINES += VERSION=\"$(APPVERSION)\" +DEFINES += COMMIT=\"$(COMMIT)\" ENABLE_BLUETOOTH = 1 ENABLE_NBGL_QRCODE = 1 diff --git a/src/version.h b/src/version.h index 6c50929a..a459506a 100644 --- a/src/version.h +++ b/src/version.h @@ -1,9 +1,5 @@ #define CLASS 1 -#define MAJOR APPVERSION_M -#define MINOR APPVERSION_N -#define PATCH APPVERSION_P - typedef struct version { uint8_t class; uint8_t major; @@ -11,4 +7,4 @@ typedef struct version { uint8_t patch; } version_t; -const version_t version = {CLASS, MAJOR, MINOR, PATCH}; +const version_t version = {CLASS, MAJOR_VERSION, MINOR_VERSION, PATCH_VERSION}; From a04bacf789266bd0fc0b9bdc415bda85f88920b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Palmer?= Date: Fri, 23 Feb 2024 17:37:23 +0100 Subject: [PATCH 12/12] Makefile: reorganise the Makfile --- Makefile | 56 ++++++++++++++++++++++++++++++------------------------- README.md | 4 ++-- 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index d66c8a1d..4c517004 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,21 @@ include $(BOLOS_SDK)/Makefile.defines APPNAME = "Tezos Baking" +APP_SOURCE_PATH = src + +VARIANT_PARAM = APP +VARIANT_VALUES = tezos_baking + +# OPTION + +DISABLE_STANDARD_APP_SYNC_RAPDU = 1 +DISABLE_STANDARD_APP_FILES = 1 +DEFINES += HAVE_LEGACY_PID + +ENABLE_BLUETOOTH = 1 +ENABLE_NBGL_QRCODE = 1 + +# APP_LOAD_PARAMS HAVE_APPLICATION_FLAG_LIBRARY = 1 ifneq ($(TARGET_NAME), TARGET_NANOS) @@ -14,14 +29,23 @@ endif CURVE_APP_LOAD_PARAMS = ed25519 secp256k1 secp256r1 PATH_APP_LOAD_PARAMS = "44'/1729'" -GIT_DESCRIBE ?= $(shell git describe --tags --abbrev=8 --always --long --dirty 2>/dev/null) +# VERSION -VERSION_TAG ?= $(shell echo "$(GIT_DESCRIBE)" | cut -f1 -d-) APPVERSION_M=2 APPVERSION_N=4 APPVERSION_P=7 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P) +DEFINES += VERSION=\"$(APPVERSION)\" + +# COMMIT + +GIT_DESCRIBE ?= $(shell git describe --tags --abbrev=8 --always --long --dirty 2>/dev/null) +VERSION_TAG ?= $(shell echo "$(GIT_DESCRIBE)" | cut -f1 -d-) +COMMIT ?= $(shell echo "$(GIT_DESCRIBE)" | awk -F'-g' '{print $2}' | sed 's/-dirty/*/') + +DEFINES += COMMIT=\"$(COMMIT)\" + # Only warn about version tags if specified/inferred ifeq ($(VERSION_TAG),) $(warning VERSION_TAG not checked) @@ -31,13 +55,14 @@ else endif endif -COMMIT ?= $(shell echo "$(GIT_DESCRIBE)" | awk -F'-g' '{print $2}' | sed 's/-dirty/*/') ifeq ($(COMMIT),) $(warning COMMIT not specified and could not be determined with git from "$(GIT_DESCRIBE)") else $(info COMMIT=$(COMMIT)) endif +# ICONS + ICON_NANOS = icons/nano-s-tezos.gif ICON_NANOX = icons/nano-x-tezos.gif ICON_NANOSP = $(ICON_NANOX) @@ -53,23 +78,10 @@ all: show-app default show-app: @echo ">>>>> Building at commit $(COMMIT)" - -############ -# Platform # -############ - -DISABLE_STANDARD_APP_SYNC_RAPDU = 1 -DISABLE_STANDARD_APP_FILES = 1 -DEFINES += HAVE_LEGACY_PID -DEFINES += VERSION=\"$(APPVERSION)\" -DEFINES += COMMIT=\"$(COMMIT)\" - -ENABLE_BLUETOOTH = 1 -ENABLE_NBGL_QRCODE = 1 - ############## # Compiler # ############## + ifneq ($(BOLOS_ENV),) $(info BOLOS_ENV=$(BOLOS_ENV)) CLANGPATH := $(BOLOS_ENV)/clang-arm-fropi/bin/ @@ -87,15 +99,9 @@ endif CFLAGS += -Wno-incompatible-pointer-types-discards-qualifiers -### computed variables -APP_SOURCE_PATH += src - -VARIANT_PARAM = APP -VARIANT_VALUES = tezos_baking - -include $(BOLOS_SDK)/Makefile.standard_app - # Generate delegates from baker list src/delegates.h: tools/gen-delegates.sh tools/BakersRegistryCoreUnfilteredData.json bash ./tools/gen-delegates.sh ./tools/BakersRegistryCoreUnfilteredData.json $(DEP_DIR)/to_string.d $(DEP_DIR)/app/src/to_string.d: src/delegates.h + +include $(BOLOS_SDK)/Makefile.standard_app diff --git a/README.md b/README.md index 86c9677d..8692f551 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@ ### Building -Use the docker container (built by `make docker_ledger_app_builder` in the wallet app repo.) +Use the docker container `ledger-app-dev-tools` to access to the SDK ``` -docker run --rm -ti -v $(pwd):/app ledger-app-builder:latest +docker run --rm -ti -v $(pwd):/app ghcr.io/ledgerhq/ledger-app-builder/ledger-app-dev-tools:latest ``` Then build the baking app: