Merge pull request #33 from LedgerHQ/develop

Sync Ledger repo
blooo-io · Dec 31, 2024 · 38a082e · 38a082e
2 parents 31528f4 + 98f46b3
commit 38a082e
Show file tree

Hide file tree

Showing 8 changed files with 103 additions and 80 deletions.
diff --git a/.clang-format b/.clang-format
@@ -12,7 +12,6 @@ SortIncludes: false
 SpaceAfterCStyleCast: true
 AllowShortCaseLabelsOnASingleLine: false
 AllowAllArgumentsOnNextLine: false
-AllowAllParametersOfDeclarationOnNextLine: false
 AllowShortBlocksOnASingleLine: Never
 AllowShortFunctionsOnASingleLine: None
 BinPackArguments: false

diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml
@@ -117,6 +117,7 @@ jobs:
         with:
           repository: LedgerHQ/app-ethereum
           ref: ${{ ((github.base_ref || github.ref_name) == 'main' && 'master') || (github.base_ref || github.ref_name) }}
+          submodules: true
 
       - name: Build
         run: |

diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -0,0 +1,18 @@
+---
+name: Release build
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  build:
+    name: Build application using the reusable workflow
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_build.yml@v1
+    with:
+      upload_app_binaries_artifact: "compiled_app_bindaries"
diff --git a/Makefile b/Makefile
@@ -21,6 +21,6 @@ APPNAME = "StakeKit"
 # Application version
 APPVERSION_M = 1
 APPVERSION_N = 2
-APPVERSION_P = 1
+APPVERSION_P = 2
 
 include ethereum-plugin-sdk/standard_plugin.mk
diff --git a/ethereum-plugin-sdk b/ethereum-plugin-sdk
diff --git a/icons/flex_app_stakekit.gif b/icons/flex_app_stakekit.gif
diff --git a/ledger_app.toml b/ledger_app.toml
@@ -1,7 +1,7 @@
 [app]
 build_directory = "./"
 sdk = "C"
-devices = ["nanos", "nanox", "nanos+", "stax"]
+devices = ["nanos", "nanox", "nanos+", "stax", "flex"]
 
 [tests]
-pytest_directory = "./tests/"
+pytest_directory = "./tests/"
+118 −0		.github/workflows/_reusable_build_with_submodule_injection.yml
+49 −0		.github/workflows/build_and_test.yml
+23 −1		CHANGELOG.md
+0 −14		README.md
+4 −1		src/asset_info.h
+21 −10		src/common_utils.c
+14 −3		src/common_utils.h
+0 −3		src/eth_plugin_interface.h
+1 −1		src/main.c
+4 −2		standard_plugin.mk