Merge pull request #318 from LedgerHQ/develop

App release 1.9.19

Author: apaillier-ledger

.github/actions/commit-changes/action.yml

@@ -21,10 +21,14 @@ inputs:
     description: 'The directory in which the action will be performed'
     required: true
     default: '.'
-  branch:
-    description: 'Checkout (or create) on a specific branch before commit/push'
-    required: true
-    default: 'master'
+  src_branch:
+    description: 'Checkout (or create) a specific branch before commit/push. Defaults to current branch'
+    required: false
+    default: ''
+  dst_branch:
+    description: 'Push the created commit on a specific branch. Defaults to current branch'
+    required: false
+    default: ''
   secret:
     description: 'A token allowing to push the commit on the repository'
     required: true
@@ -43,38 +47,73 @@ runs:
         git config --global user.name ${{ inputs.name }}
         ORIGIN="$(pwd)"
         cd ${{ inputs.directory }}
-        git switch ${{ inputs.branch }} 2>/dev/null || git switch -c ${{ inputs.branch }}
+
+        CURRENT_BRANCH=${GITHUB_REF#refs/heads/};
+        # calculating source branch
+        if [ -n  "${{ inputs.src_branch }}" ]; \
+        then \
+          git switch ${{ inputs.src_branch }} 2>/dev/null || git switch -c ${{ inputs.src_branch }}; \
+          SRC_BRANCH=${{ inputs.src_branch }}; \
+        else \
+          SRC_BRANCH=`git branch --show-current`; \
+          if [ -z "$SRC_BRANCH" ]; \
+          then \
+            SRC_BRANCH=$CURRENT_BRANCH; \
+          fi \
+        fi
+
+        # calculating destination branch
+        if [ -n "${{ inputs.dst_branch }}" ]; \
+        then \
+          DST_BRANCH=${{ inputs.dst_branch }}; \
+        else \
+          DST_BRANCH=`git branch --show-current`; \
+          if [ -z "$DST_BRANCH" ]; \
+          then \
+            DST_BRANCH=$CURRENT_BRANCH; \
+          fi \
+        fi
+
         echo "-----------------------------------------------------------"
         echo "Initial repo status"
         git status
+        # checking changes, commit if needed
         CHANGES="$(git status --porcelain ${{ inputs.files }})"
-        if [ -z "${CHANGES}" ]; \
+        if [ -n "${CHANGES}" ]; \
         then \
+          echo -e "Changes:\n${CHANGES}"; \
+          git add ${{ inputs.files }}; \
           echo "-----------------------------------------------------------"; \
-          echo "No changes, stopping now"; \
-          echo "COMMIT=NO" > $GITHUB_ENV; \
-          cd "${ORIGIN}"; \
-          exit 0; \
+          echo "Repo status before commit"; \
+          git status; \
+          git commit -am "${{ inputs.message }}"; \
         fi
-        echo -e "Changes:\n${CHANGES}"
-        git add ${{ inputs.files }}
-        echo "-----------------------------------------------------------"
-        echo "Repo status before commit"
-        git status
-        git commit -am "${{ inputs.message }}"
-        echo "COMMIT=YES" > $GITHUB_ENV
+
+        # compute if a push is needed
+        if [ -n "${CHANGES}" -o "$SRC_BRANCH" != "$DST_BRANCH" ]; \
+        then \
+          PUSH="YES"; \
+        else \
+          PUSH="NO"; \
+        fi
+
         git log -n 2
         cd "${ORIGIN}"
-      shell: bash
 
-    - run: echo "${{ env.COMMIT }}"
+        echo " -- Env SRC_BRANCH: $SRC_BRANCH";
+        echo " -- Env DST_BRANCH: $DST_BRANCH";
+        echo " -- Env PUSH: $PUSH"
+        # exporting these variables for next steps
+        echo "##[set-output name=src_branch;]$(echo $SRC_BRANCH)";
+        echo "##[set-output name=dst_branch;]$(echo $DST_BRANCH)";
+        echo "##[set-output name=push;]$(echo $PUSH)";
       shell: bash
 
     - name: Push commit
-      if: ${{ env.COMMIT == 'YES' }}
+      if: steps.commit.outputs.push == 'YES'
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ inputs.secret }}
-        branch: ${{ inputs.branch }}
+        branch: ${{ steps.commit.outputs.src_branch }}:${{ steps.commit.outputs.dst_branch }}
         directory: ${{ inputs.directory }}
         repository: ${{ inputs.repository }}

.github/workflows/sdk-generation.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           name: 'ldg-github-ci'
           directory: ethereum-plugin-sdk
-          branch: ${{ steps.extract_branch.outputs.branch }}
+          dst_branch: ${{ steps.extract_branch.outputs.branch }}
           message: "[update] Branch ${{ steps.extract_branch.outputs.branch }} | Commit ${GITHUB_SHA}"
           secret: ${{ secrets.CI_BOT_TOKEN }}
           repository: LedgerHQ/ethereum-plugin-sdk
@@ -47,7 +47,6 @@ jobs:
         with:
           name: 'ldg-github-ci'
           files: ethereum-plugin-sdk
-          branch: ${{ steps.extract_branch.outputs.branch }}
           message: "[update][SDK] Branch ${{ steps.extract_branch.outputs.branch }} | Commit ${GITHUB_SHA}"
           secret: ${{ secrets.CI_BOT_TOKEN }}
           repository: LedgerHQ/app-ethereum

CHANGELOG.md

@@ -5,17 +5,34 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.9.19](https://github.com/ledgerhq/app-ethereum/compare/1.9.18...1.9.19) - 2022-06-15
+
+### Added
+
+- (clone) OKXChain
+- (clone) Cube
+- (clone) Astar EVM
+- (clone) Shiden EVM
+
+### Changed
+
+- EIP-191 signatures now show (up to 99 characters on LNS and 255 on LNX & LNS) the actual data contained in the message (clear-signing)
+
+### Fixed
+
+- Bug with huge swap amounts
+
 ## [1.9.18](https://github.com/ledgerhq/app-ethereum/compare/1.9.17...1.9.18) - 2022-04-25
 
 ### Added
 
 - Easier way of adding a chain into the Makefile
 - EIP 1024 support
-- Conflux chain
-- Moonbeam chain
-- KardiaChain
-- BitTorrent Chain
-- Wethio chain
+- (clone) Conflux chain
+- (clone) Moonbeam chain
+- (clone) KardiaChain
+- (clone) BitTorrent Chain
+- (clone) Wethio chain
 
 ### Changed
 

Makefile

@@ -34,7 +34,7 @@ APP_LOAD_PARAMS += --path "1517992542'/1101353413'"
 
 APPVERSION_M=1
 APPVERSION_N=9
-APPVERSION_P=18
+APPVERSION_P=19
 APPVERSION=$(APPVERSION_M).$(APPVERSION_N).$(APPVERSION_P)
 APP_LOAD_FLAGS= --appFlags 0x240 --dep Ethereum:$(APPVERSION)
 
@@ -79,7 +79,7 @@ all: default
 ############
 
 DEFINES   += OS_IO_SEPROXYHAL
-DEFINES   += HAVE_BAGL HAVE_SPRINTF
+DEFINES   += HAVE_BAGL HAVE_SPRINTF HAVE_SNPRINTF_FORMAT_U
 DEFINES   += HAVE_IO_USB HAVE_L4_USBLIB IO_USB_MAX_ENDPOINTS=4 IO_HID_EP_LENGTH=64 HAVE_USB_APDU
 DEFINES   += LEDGER_MAJOR_VERSION=$(APPVERSION_M) LEDGER_MINOR_VERSION=$(APPVERSION_N) LEDGER_PATCH_VERSION=$(APPVERSION_P)