Skip to content

Commit 1f4ed3b

Browse files
apaillier-ledgerapaillier-ledger
authored
Merge pull request #300 from LedgerHQ/develop
App release 1.9.18
2 parents c0b85d2 + da51910 commit 1f4ed3b

File tree

479 files changed

+1923
-1170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

479 files changed

+1923
-1170
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
title: 'Fix [Subject of the issue]'
5+
labels: 'bug'
6+
assignees: ''
7+
8+
---
9+
10+
## Description
11+
12+
Describe your issue in as much detail as possible here.
13+
14+
## Your environment
15+
16+
* OS and version
17+
* branch that causes this issue
18+
* Device (Nano S, Nano X, Ledger Blue)
19+
20+
## Steps to reproduce
21+
22+
* Tell us how to reproduce this issue <br />
23+
* Where the issue is, if you know <br />
24+
* Which commands triggered the issue, if any
25+
26+
## Expected behaviour
27+
28+
Tell us what should happen
29+
30+
## Actual behaviour
31+
32+
Tell us what happens instead
33+
34+
## Logs
35+
36+
Please paste any logs here that demonstrate the issue, if they exist
37+
38+
## Proposed solution
39+
40+
If you have an idea of how to fix this issue, please write it down here, so we can begin discussing it

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Feature report
3+
about: Suggest an idea for this project
4+
title: 'Add [Subject of the issue]'
5+
labels: 'enhancement'
6+
assignees: ''
7+
8+
---
9+
10+
## Description
11+
12+
Describe your issue in as much detail as possible here.
13+
14+
## Your environment
15+
16+
* OS and version
17+
* branch that causes this issue
18+
* Device (Nano S, Nano X, Ledger Blue)

‎.github/ISSUE_TEMPLATE/network_request.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: Network request
3+
about: Request of new chain or network
4+
title: 'Add {NameChain} network ({SYMBOL})'
5+
labels: 'enhancement, chain/network'
6+
assignees: ''
7+
8+
---
9+
10+
## Description
11+
- [ ] Symbol:
12+
- [ ] ChainId:
13+
- [ ] Website:
14+
- [ ] Block-Explorer:
15+
- [ ] [slip-0044](https://github.com/satoshilabs/slips/blob/master/slip-0044.md) type:
16+
17+
## Additional comments
18+
19+
Please post additional comments in this section if you have them, otherwise delete it.

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
name: 'Commit and push if the version file has changed'
2+
3+
inputs:
4+
name:
5+
description: 'The name of the commiter'
6+
required: true
7+
default: 'github-actions[bot]'
8+
email:
9+
description: 'The email of the commiter'
10+
required: true
11+
default: 'github-actions[bot]@users.noreply.github.com'
12+
message:
13+
description: 'The commit message'
14+
required: true
15+
default: 'New release version(s)'
16+
files:
17+
description: 'The file(s) to add in the commit'
18+
required: true
19+
default: '*'
20+
directory:
21+
description: 'The directory in which the action will be performed'
22+
required: true
23+
default: '.'
24+
branch:
25+
description: 'Checkout (or create) on a specific branch before commit/push'
26+
required: true
27+
default: 'master'
28+
secret:
29+
description: 'A token allowing to push the commit on the repository'
30+
required: true
31+
default: '.'
32+
repository:
33+
description: 'The repository where to push'
34+
required: true
35+
default: ''
36+
37+
runs:
38+
using: 'composite'
39+
steps:
40+
- name: Commit the changes
41+
id: commit
42+
run: |
43+
git config --global user.name ${{ inputs.name }}
44+
ORIGIN="$(pwd)"
45+
cd ${{ inputs.directory }}
46+
git switch ${{ inputs.branch }} 2>/dev/null || git switch -c ${{ inputs.branch }}
47+
echo "-----------------------------------------------------------"
48+
echo "Initial repo status"
49+
git status
50+
CHANGES="$(git status --porcelain ${{ inputs.files }})"
51+
if [ -z "${CHANGES}" ]; \
52+
then \
53+
echo "-----------------------------------------------------------"; \
54+
echo "No changes, stopping now"; \
55+
echo "COMMIT=NO" > $GITHUB_ENV; \
56+
cd "${ORIGIN}"; \
57+
exit 0; \
58+
fi
59+
echo -e "Changes:\n${CHANGES}"
60+
git add ${{ inputs.files }}
61+
echo "-----------------------------------------------------------"
62+
echo "Repo status before commit"
63+
git status
64+
git commit -am "${{ inputs.message }}"
65+
echo "COMMIT=YES" > $GITHUB_ENV
66+
git log -n 2
67+
cd "${ORIGIN}"
68+
shell: bash
69+
70+
- run: echo "${{ env.COMMIT }}"
71+
shell: bash
72+
73+
- name: Push commit
74+
if: ${{ env.COMMIT == 'YES' }}
75+
uses: ad-m/github-push-action@master
76+
with:
77+
github_token: ${{ inputs.secret }}
78+
branch: ${{ inputs.branch }}
79+
directory: ${{ inputs.directory }}
80+
repository: ${{ inputs.repository }}

‎.github/pull_request_template.md‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
## Description
2+
3+
Please provide a detailed description of what was done in this PR.
4+
(And mentioned if linked to an issue [docs](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue))
5+
6+
## Changes include
7+
8+
- [ ] Bugfix (non-breaking change that solves an issue)
9+
- [ ] New feature (non-breaking change that adds functionality)
10+
- [ ] Breaking change (change that is not backwards-compatible and/or changes current functionality)
11+
- [ ] Tests
12+
- [ ] Documentation
13+
- [ ] Other (for changes that might not fit in any category)
14+
15+
## Breaking changes
16+
17+
Please complete this section if any breaking changes have been made, otherwise delete it.
18+
19+
## Additional comments
20+
21+
Please post additional comments in this section if you have them, otherwise delete it.

‎.github/workflows/auto-author-assign.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: 'Auto Author Assign'
2+
3+
on:
4+
pull_request_target:
5+
types: [opened, reopened]
6+
7+
permissions:
8+
pull-requests: write
9+
10+
jobs:
11+
assign-author:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: toshimaru/[email protected]

‎.github/workflows/ci-workflow.yml‎

Lines changed: 36 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
name: Compilation & tests
22

33
on:
4+
workflow_dispatch:
45
push:
56
branches:
67
- master
78
pull_request:
89
branches:
910
- master
11+
- develop
1012

1113
jobs:
1214
job_build_debug_nano_s:
@@ -102,8 +104,27 @@ jobs:
102104
name: scan-build
103105
path: scan-build
104106

107+
building_for_e2e_tests:
108+
name: Building binaries for E2E tests
109+
runs-on: ubuntu-latest
110+
container:
111+
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
112+
113+
steps:
114+
- uses: actions/checkout@v2
115+
116+
- name: Build testing binaries
117+
run: cd tests && ./build_local_test_elfs.sh
118+
119+
- name: Upload app binaries
120+
uses: actions/upload-artifact@v2
121+
with:
122+
name: e2e_elfs
123+
path: ./tests/elfs/
124+
105125
jobs-e2e-tests:
106-
needs: [job_build_debug_nano_s, job_build_debug_nano_x]
126+
name: E2E tests
127+
needs: [building_for_e2e_tests]
107128
runs-on: ubuntu-latest
108129
steps:
109130
- name: Test
@@ -113,28 +134,30 @@ jobs:
113134
echo $DISPLAY
114135
- name: Checkout
115136
uses: actions/checkout@v2
137+
116138
- run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
139+
117140
- name: Install node
118141
uses: actions/setup-node@v2
119142
with:
120143
node-version: "14.4.0"
144+
121145
- name: Install yarn
122-
run: |
123-
npm install -g yarn
146+
run: npm install -g yarn
147+
124148
- name: Build/Install build js deps
125-
run: |
126-
cd tests && yarn install
149+
run: cd tests && yarn install
150+
127151
- name: Create tmp folder for artifacts
128-
run: |
129-
mkdir tests/elfs
152+
run: mkdir tests/elfs
153+
130154
- name: Download app binaries
131155
uses: actions/download-artifact@v2
132156
with:
133-
path: tests/elfs
157+
path: tmp/
158+
134159
- name: Gather elfs
135-
run: |
136-
cd tests/elfs
137-
cp `find . -name "*.elf"` .
160+
run: cp `find tmp/e2e_elfs/ -name "*.elf"` tests/elfs/
161+
138162
- name: Run zemu tests
139-
run: |
140-
cd tests && yarn test
163+
run: cd tests && yarn test

‎.github/workflows/lint-workflow.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
pull_request:
88
branches:
99
- master
10+
- develop
1011

1112
jobs:
1213
job_lint:
@@ -18,8 +19,8 @@ jobs:
1819
uses: actions/checkout@v2
1920

2021
- name: Lint
21-
uses: DoozyX/clang-format-lint-action@v0.11
22+
uses: DoozyX/clang-format-lint-action@v0.13
2223
with:
2324
source: "./"
2425
extensions: "h,c"
25-
clangFormatVersion: 10
26+
clangFormatVersion: 12.0.0

‎.github/workflows/sdk-generation.yml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
name: Updating the SDK
2+
3+
on:
4+
workflow_dispatch:
5+
push:
6+
branches:
7+
- master
8+
- develop
9+
10+
jobs:
11+
updating_SDK:
12+
name: Updating the SDK
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- name: Clone
17+
uses: actions/checkout@v2
18+
with:
19+
# by default the action uses fetch-depth = 1, which creates
20+
# shallow repositories from which we can't push
21+
fetch-depth: 0
22+
submodules: recursive
23+
# needed, else the push inside the action will use default credentials
24+
# instead of provided ones
25+
persist-credentials: false
26+
27+
- name: Build new SDK
28+
run: python tools/build_sdk.py
29+
30+
- name: Extract branch name
31+
shell: bash
32+
run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
33+
id: extract_branch
34+
35+
- name: Commit & push changes in the SDK if any
36+
uses: ./.github/actions/commit-changes
37+
with:
38+
name: 'ldg-github-ci'
39+
directory: ethereum-plugin-sdk
40+
branch: ${{ steps.extract_branch.outputs.branch }}
41+
message: "[update] Branch ${{ steps.extract_branch.outputs.branch }} | Commit ${GITHUB_SHA}"
42+
secret: ${{ secrets.CI_BOT_TOKEN }}
43+
repository: LedgerHQ/ethereum-plugin-sdk
44+
45+
- name: Update the SDK submodule in the Ethereum app
46+
uses: ./.github/actions/commit-changes
47+
with:
48+
name: 'ldg-github-ci'
49+
files: ethereum-plugin-sdk
50+
branch: ${{ steps.extract_branch.outputs.branch }}
51+
message: "[update][SDK] Branch ${{ steps.extract_branch.outputs.branch }} | Commit ${GITHUB_SHA}"
52+
secret: ${{ secrets.CI_BOT_TOKEN }}
53+
repository: LedgerHQ/app-ethereum

‎CHANGELOG.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,28 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](http://keepachangelog.com/)
66
and this project adheres to [Semantic Versioning](http://semver.org/).
77

8+
## [1.9.18](https://github.com/ledgerhq/app-ethereum/compare/1.9.17...1.9.18) - 2022-04-25
9+
10+
### Added
11+
12+
- Easier way of adding a chain into the Makefile
13+
- EIP 1024 support
14+
- Conflux chain
15+
- Moonbeam chain
16+
- KardiaChain
17+
- BitTorrent Chain
18+
- Wethio chain
19+
20+
### Changed
21+
22+
- More uniform naming between the ERC-721 & ERC-1155 screens
23+
24+
### Fixed
25+
26+
- CI (mostly Zemu tests)
27+
- App crashing when trying to approve an NFT transaction without having received the NFT information beforehand
28+
- App refusing to approve an NFT transaction with a long collection name
29+
830
## [1.9.17](https://github.com/ledgerhq/app-ethereum/compare/1.9.16...1.9.17) - 2022-01-14
931

1032
### Added

0 commit comments

Comments
 (0)