Skip to content

Commit 2d4a233

Browse files
authored
Merge pull request #10 from blooo-io/fix/LDG-481--nano-app-fix-build-on-mainnet
Fix/ldg 481 nano app fix build on mainnet
2 parents 622038f + 7223375 commit 2d4a233

File tree

502 files changed

+511
-9951
lines changed

Some content is hidden

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

502 files changed

+511
-9951
lines changed

.doxygen/Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "Bitcoin"
35+
PROJECT_NAME = "Acre"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version

.github/workflows/Dockerfile

-30
This file was deleted.

.github/workflows/build_and_functional_tests.yml

-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,3 @@ jobs:
3131
uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_ragger_tests.yml@v1
3232
with:
3333
download_app_binaries_artifact: "compiled_app_binaries"
34-

.github/workflows/builder-image-workflow.yml

-30
This file was deleted.

.github/workflows/ci-workflow.yml

+21-163
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@ on:
55
push:
66
branches:
77
- master
8+
- main
89
- develop
910
pull_request:
1011
branches:
1112
- master
13+
- main
1214
- develop
1315

1416
jobs:
@@ -38,42 +40,20 @@ jobs:
3840

3941
- name: Build
4042
run: |
41-
make DEBUG=0 COIN=bitcoin BOLOS_SDK=${{ matrix.SDK }} && mv bin/ bitcoin-bin/
43+
make DEBUG=0 COIN=bitcoin BOLOS_SDK=${{ matrix.SDK }} && mv bin/ acre-bin/
4244
make clean
43-
make DEBUG=0 COIN=bitcoin_testnet BOLOS_SDK=${{ matrix.SDK }} && mv bin/ bitcoin-testnet-bin/
44-
- name: Upload Bitcoin app binary
45+
make DEBUG=0 COIN=bitcoin_testnet BOLOS_SDK=${{ matrix.SDK }} && mv bin/ acre-testnet-bin/
46+
- name: Upload Acre app binary
4547
uses: actions/upload-artifact@v4
4648
with:
47-
name: bitcoin-app-${{ matrix.model }}
48-
path: bitcoin-bin
49+
name: acre-app-${{ matrix.model }}
50+
path: acre-bin
4951

50-
- name: Upload Bitcoin Testnet app binary
52+
- name: Upload Acre Testnet app binary
5153
uses: actions/upload-artifact@v4
5254
with:
53-
name: bitcoin-testnet-app-${{ matrix.model }}
54-
path: bitcoin-testnet-bin
55-
56-
job_build_app_perftest:
57-
name: Compile the UX-less version of the app on Nano S+ for performance tests
58-
59-
runs-on: ubuntu-latest
60-
61-
container:
62-
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
63-
64-
steps:
65-
- name: Clone
66-
uses: actions/checkout@v2
67-
68-
- name: Build
69-
run: |
70-
make DEBUG=0 COIN=bitcoin_testnet BOLOS_SDK="$NANOSP_SDK" AUTOAPPROVE_FOR_PERF_TESTS=1
71-
72-
- name: Upload Bitcoin Testnet app binary
73-
uses: actions/upload-artifact@v4
74-
with:
75-
name: bitcoin-testnet-perftest-app-nanosp
76-
path: bin
55+
name: acre-testnet-app-${{ matrix.model }}
56+
path: acre-testnet-bin
7757

7858
job_unit_test:
7959
name: Unit test
@@ -104,15 +84,15 @@ jobs:
10484
name: code-coverage
10585
path: unit-tests/coverage
10686

107-
- name: Upload to codecov.io
108-
uses: codecov/codecov-action@v3
109-
with:
110-
token: ${{ secrets.CODECOV_TOKEN }}
111-
files: ./unit-tests/coverage.info
112-
flags: unittests
113-
name: codecov-app-bitcoin
114-
fail_ci_if_error: true
115-
verbose: true
87+
# - name: Upload to codecov.io
88+
# uses: codecov/codecov-action@v3
89+
# with:
90+
# token: ${{ secrets.CODECOV_TOKEN }}
91+
# files: ./unit-tests/coverage.info
92+
# flags: unittests
93+
# name: app-acre
94+
# fail_ci_if_error: true
95+
# verbose: true
11696

11797
- name: HTML documentation
11898
run: doxygen .doxygen/Doxyfile
@@ -150,136 +130,14 @@ jobs:
150130
- name: Clone
151131
uses: actions/checkout@v2
152132

153-
- name: Download Bitcoin app binary
133+
- name: Download Acre app binary
154134
uses: actions/download-artifact@v4
155135
with:
156-
name: bitcoin-app-${{matrix.model}}
136+
name: acre-app-${{matrix.model}}
157137
path: bin
158138

159139
- name: Run tests
160140
run: |
161141
cd tests_mainnet
162142
pip install -r requirements.txt
163143
PYTHONPATH=$PYTHONPATH:/speculos pytest --headless --model=${{ matrix.model }} --timeout=300
164-
165-
job_test_python_lib_legacyapp:
166-
name: Tests with the Python library and legacy Bitcoin app
167-
needs: job_build
168-
runs-on: ubuntu-latest
169-
170-
container:
171-
image: ghcr.io/ledgerhq/app-bitcoin-new/speculos-bitcoin:latest
172-
ports:
173-
- 1234:1234
174-
- 9999:9999
175-
- 40000:40000
176-
- 41000:41000
177-
- 42000:42000
178-
- 43000:43000
179-
options: --entrypoint /bin/bash
180-
181-
steps:
182-
- name: Clone
183-
uses: actions/checkout@v2
184-
185-
- name: Run tests
186-
run: |
187-
cd bitcoin_client/tests
188-
pip install -r requirements.txt
189-
PYTHONPATH=$PYTHONPATH:/speculos pytest --headless --timeout=300 --model=nanos
190-
191-
job_perftests:
192-
name: Performance report
193-
194-
needs: job_build_app_perftest
195-
runs-on: ubuntu-latest
196-
197-
container:
198-
image: ghcr.io/ledgerhq/app-bitcoin-new/speculos-bitcoin:latest
199-
ports:
200-
- 1234:1234
201-
- 9999:9999
202-
- 40000:40000
203-
- 41000:41000
204-
- 42000:42000
205-
- 43000:43000
206-
options: --entrypoint /bin/bash
207-
208-
steps:
209-
- name: Clone
210-
uses: actions/checkout@v2
211-
212-
- name: Download Bitcoin app binary for perftests
213-
uses: actions/download-artifact@v4
214-
with:
215-
name: bitcoin-testnet-perftest-app-nanosp
216-
path: bin
217-
218-
- name: Run tests
219-
run: |
220-
cd tests_perf
221-
pip install -r requirements.txt
222-
PYTHONPATH=$PYTHONPATH:/speculos pytest --headless --model=nanosp --benchmark-json=benchmarks.json
223-
- name: Upload benchmarks summary
224-
uses: actions/upload-artifact@v4
225-
with:
226-
name: benchmarks-log
227-
path: tests_perf/benchmarks.json
228-
229-
job_test_js_lib:
230-
name: Tests with the JS library
231-
needs: job_build
232-
runs-on: ubuntu-latest
233-
234-
container:
235-
image: ghcr.io/ledgerhq/app-bitcoin-new/speculos-bitcoin:latest
236-
ports:
237-
- 1234:1234
238-
- 9999:9999
239-
- 40000:40000
240-
- 41000:41000
241-
- 42000:42000
242-
- 43000:43000
243-
options: --entrypoint /bin/bash
244-
245-
steps:
246-
- name: Clone
247-
uses: actions/checkout@v2
248-
249-
- name: Install node
250-
uses: actions/setup-node@v2
251-
with:
252-
node-version: "16"
253-
254-
- name: Install yarn
255-
run: |
256-
npm install -g yarn
257-
258-
- name: Download Bitcoin Testnet app binary
259-
uses: actions/download-artifact@v4
260-
with:
261-
name: bitcoin-testnet-app-nanosp
262-
path: bin
263-
264-
- name: Run tests
265-
run: |
266-
cd bitcoin_client_js
267-
yarn install
268-
LOG_SPECULOS=1 LOG_APDUS=1 SPECULOS="/speculos/speculos.py" yarn test
269-
270-
job_test_rust_client:
271-
name: Tests for rust client library
272-
needs: job_build
273-
runs-on: ubuntu-latest
274-
275-
container:
276-
image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
277-
278-
steps:
279-
- name: Clone
280-
uses: actions/checkout@v2
281-
282-
- name: Run tests
283-
run: |
284-
cd bitcoin_client_rs/
285-
cargo test --no-default-features --features="async"

.github/workflows/codeql-workflow.yml

-45
This file was deleted.

.github/workflows/guidelines-enforcer.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on:
1313
push:
1414
branches:
1515
- master
16+
- main
1617
- develop
1718
pull_request:
1819

.github/workflows/lint-workflow.yml

-28
This file was deleted.

0 commit comments

Comments
 (0)