miketlk
diff --git a/‎.github/workflows/Dockerfile
Lines changed: 22 additions & 6 deletions b/‎.github/workflows/Dockerfile
Lines changed: 22 additions & 6 deletions
diff --git a/‎.github/workflows/build_and_functional_tests.yml
Lines changed: 34 additions & 0 deletions b/‎.github/workflows/build_and_functional_tests.yml
Lines changed: 34 additions & 0 deletions
diff --git a/‎.github/workflows/builder-image-workflow.yml
Lines changed: 1 addition & 3 deletions b/‎.github/workflows/builder-image-workflow.yml
Lines changed: 1 addition & 3 deletions
diff --git a/‎.github/workflows/ci-workflow.yml
Lines changed: 45 additions & 91 deletions b/‎.github/workflows/ci-workflow.yml
Lines changed: 45 additions & 91 deletions
diff --git a/‎.github/workflows/codeql-workflow.yml
Lines changed: 47 additions & 0 deletions b/‎.github/workflows/codeql-workflow.yml
Lines changed: 47 additions & 0 deletions
diff --git a/‎.github/workflows/guidelines-enforcer.yml
Lines changed: 22 additions & 0 deletions b/‎.github/workflows/guidelines-enforcer.yml
Lines changed: 22 additions & 0 deletions
@@ -1,14 +1,30 @@
 # An image derived from ledgerhq/speculos but also containing the bitcoin-core binaries
+# compiled from the master branch
 
 FROM ghcr.io/ledgerhq/speculos:latest
 
-# install curl
-RUN apt update -y && apt install -y curl
+# install git and curl
+RUN apt update -y && apt install -y git curl
 
-# download bitcoin-core and decompress it to /bitcoin
-RUN curl -o /tmp/bitcoin.tar.gz https://bitcoin.org/bin/bitcoin-core-22.0/bitcoin-22.0-x86_64-linux-gnu.tar.gz && \
-    tar -xf /tmp/bitcoin.tar.gz -C / && \
-    mv /bitcoin-22.0 /bitcoin
+# install autotools bitcoin-core build dependencies
+RUN apt install -y automake autotools-dev bsdmainutils build-essential ccache git libboost-dev libboost-filesystem-dev libboost-system-dev libboost-test-dev libevent-dev libminiupnpc-dev libnatpmp-dev libqt5gui5 libqt5core5a libqt5dbus5 libsqlite3-dev libtool libzmq3-dev pkg-config python3 qttools5-dev qttools5-dev-tools qtwayland5 systemtap-sdt-dev
+
+# clone bitcoin-core from github and compile it
+RUN cd / && \
+    git clone --depth=1 https://github.com/bitcoin/bitcoin.git && \
+    cd bitcoin && \
+    ./autogen.sh && \
+    ./configure --enable-suppress-external-warnings && \
+    make -j "$(($(nproc)+1))" && \
+    mkdir bin && \
+    cp src/bitcoind src/bitcoin-cli src/bitcoin-tx src/bitcoin-util src/bitcoin-wallet ./bin
+
+
+FROM ghcr.io/ledgerhq/speculos:latest
+COPY --from=0 /bitcoin/bin /bitcoin/bin
+
+# install runtime dependencies for bitcoind
+RUN apt update -y && apt install -y libminiupnpc-dev libminiupnpc-dev libnatpmp-dev libevent-dev libzmq3-dev
 
 # Add bitcoin binaries to path
 ENV PATH=/bitcoin/bin:$PATH
@@ -0,0 +1,34 @@
+name: Build and run functional tests using ragger through reusable workflow
+
+# This workflow will build the app and then run functional tests using the Ragger framework upon Speculos emulation.
+# It calls a reusable workflow developed by Ledger's internal developer team to build the application and upload the
+# resulting binaries.
+# It then calls another reusable workflow to run the Ragger tests on the compiled application binary.
+#
+# While this workflow is optional, having functional testing on your application is mandatory and this workflow and
+# tooling environment is meant to be easy to use and adapt after forking your application
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - main
+      - develop
+  pull_request:
+
+jobs:
+  build_application:
+    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_binaries"
+      flags: "DEBUG=0 COIN=bitcoin_testnet"
+
+  ragger_tests:
+    name: Run ragger tests using the reusable workflow
+    needs: build_application
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_ragger_tests.yml@v1
+    with:
+      download_app_binaries_artifact: "compiled_app_binaries"
+
@@ -1,13 +1,11 @@
 name: Build custom speculos-bitcoin image
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - master
       - develop
-    paths:
-      - .github/workflows/builder-image-workflow.yml
-      - .github/workflows/Dockerfile
 
 jobs:
   build:
 
@@ -13,7 +13,20 @@ on:
 
 jobs:
   job_build:
-    name: Compilation
+    name: Compilation for NanoS, X, S+, and Stax
+
+    strategy:
+      matrix:
+        include:
+          - model: nanos
+            SDK: "$NANOS_SDK"
+          - model: nanox
+            SDK: "$NANOX_SDK"
+          - model: nanosp
+            SDK: "$NANOSP_SDK"
+          - model: stax
+            SDK: "$STAX_SDK"
+
     runs-on: ubuntu-latest
 
     container:
@@ -25,29 +38,21 @@ jobs:
 
       - name: Build
         run: |
-          make DEBUG=0 COIN=bitcoin && mv bin/ bitcoin-bin/
-          make clean
-          make DEBUG=0 COIN=bitcoin_testnet && mv bin/ bitcoin-testnet-bin/
+          make DEBUG=0 COIN=bitcoin BOLOS_SDK=${{ matrix.SDK }} && mv bin/ bitcoin-bin/
           make clean
-          make DEBUG=0 COIN=bitcoin_testnet_lib && mv bin/ bitcoin-testnet-lib-bin/
+          make DEBUG=0 COIN=bitcoin_testnet BOLOS_SDK=${{ matrix.SDK }} && mv bin/ bitcoin-testnet-bin/
       - name: Upload Bitcoin app binary
         uses: actions/upload-artifact@v2
         with:
-          name: bitcoin-app
+          name: bitcoin-app-${{ matrix.model }}
           path: bitcoin-bin
 
       - name: Upload Bitcoin Testnet app binary
         uses: actions/upload-artifact@v2
         with:
-          name: bitcoin-testnet-app
+          name: bitcoin-testnet-app-${{ matrix.model }}
           path: bitcoin-testnet-bin
 
-      - name: Upload Bitcoin Testnet app binary (lib version)
-        uses: actions/upload-artifact@v2
-        with:
-          name: bitcoin-testnet-lib-app
-          path: bitcoin-testnet-lib-bin
-
   job_unit_test:
     name: Unit test
     needs: job_build
@@ -78,10 +83,10 @@ jobs:
           path: unit-tests/coverage
 
       - name: Upload to codecov.io
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v3
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          file: ./unit-tests/coverage.info
+          files: ./unit-tests/coverage.info
           flags: unittests
           name: codecov-app-bitcoin
           fail_ci_if_error: true
@@ -95,8 +100,16 @@ jobs:
           name: documentation
           path: doc/html
 
-  job_test:
-    name: Tests
+  job_test_mainnet:
+    name: Tests on mainnet
+    strategy:
+      matrix:
+        include:
+          - model: nanos
+          - model: nanox
+          - model: nanosp
+          - model: stax
+
     needs: job_build
     runs-on: ubuntu-latest
 
@@ -115,20 +128,20 @@ jobs:
       - name: Clone
         uses: actions/checkout@v2
 
-      - name: Download Bitcoin Testnet app binary
+      - name: Download Bitcoin app binary
         uses: actions/download-artifact@v2
         with:
-          name: bitcoin-testnet-app
+          name: bitcoin-app-${{matrix.model}}
           path: bin
 
       - name: Run tests
         run: |
-          cd tests
+          cd tests_mainnet
           pip install -r requirements.txt
-          PYTHONPATH=$PYTHONPATH:/speculos pytest --headless
+          PYTHONPATH=$PYTHONPATH:/speculos pytest --headless --model=${{ matrix.model }} --timeout=300
 
-  job_test_mainnet:
-    name: Tests on mainnet
+  job_test_python_lib_legacyapp:
+    name: Tests with the Python library and legacy Bitcoin app
     needs: job_build
     runs-on: ubuntu-latest
 
@@ -147,17 +160,12 @@ jobs:
       - name: Clone
         uses: actions/checkout@v2
 
-      - name: Download Bitcoin app binary
-        uses: actions/download-artifact@v2
-        with:
-          name: bitcoin-app
-          path: bin
-
       - name: Run tests
         run: |
-          cd tests_mainnet
+          cd bitcoin_client/tests
           pip install -r requirements.txt
-          PYTHONPATH=$PYTHONPATH:/speculos pytest --headless
+          PYTHONPATH=$PYTHONPATH:/speculos pytest --headless --timeout=300
+
 
   job_test_js_lib:
     name: Tests with the JS library
@@ -191,7 +199,7 @@ jobs:
       - name: Download Bitcoin Testnet app binary
         uses: actions/download-artifact@v2
         with:
-          name: bitcoin-testnet-app
+          name: bitcoin-testnet-app-nanos
           path: bin
 
       - name: Run tests
@@ -200,74 +208,20 @@ jobs:
           yarn install
           LOG_SPECULOS=1 LOG_APDUS=1 SPECULOS="/speculos/speculos.py" yarn test
 
-  job_test_legacy_native:
-    name: Legacy tests
-    needs: job_build
-    runs-on: ubuntu-latest
-
-    container:
-      image: ghcr.io/ledgerhq/app-bitcoin-new/speculos-bitcoin:latest
-      ports:
-        - 1234:1234
-        - 9999:9999
-        - 40000:40000
-        - 41000:41000
-        - 42000:42000
-        - 43000:43000
-      options: --entrypoint /bin/bash
 
-    steps:
-      - name: Clone
-        uses: actions/checkout@v2
-
-      - name: Download Bitcoin Testnet app binary
-        uses: actions/download-artifact@v2
-        with:
-          name: bitcoin-testnet-app
-          path: tests-legacy/bitcoin-testnet-bin
-
-      - name: Run tests
-        run: |
-          cd tests-legacy
-          pip install -r requirements.txt
-          PATH=$PATH:/speculos pytest
-
-
-  job_test_legacy_lib:
-    name: Legacy tests (library)
+  job_test_rust_client:
+    name: Tests for rust client library
     needs: job_build
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ledgerhq/app-bitcoin-new/speculos-bitcoin:latest
-      ports:
-        - 1234:1234
-        - 9999:9999
-        - 40000:40000
-        - 41000:41000
-        - 42000:42000
-        - 43000:43000
-      options: --entrypoint /bin/bash
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder:latest
 
     steps:
       - name: Clone
         uses: actions/checkout@v2
 
-      - name: Download Bitcoin app binary
-        uses: actions/download-artifact@v2
-        with:
-          name: bitcoin-app
-          path: tests-legacy/bitcoin-bin
-
-      - name: Download Bitcoin Testnet app binary (library version)
-        uses: actions/download-artifact@v2
-        with:
-          name: bitcoin-testnet-lib-app
-          path: tests-legacy/bitcoin-testnet-bin
-
-
       - name: Run tests
         run: |
-          cd tests-legacy
-          pip install -r requirements.txt
-          PATH=$PATH:/speculos pytest
+          cd bitcoin_client_rs/
+          cargo test --no-default-features --features="async"
@@ -0,0 +1,47 @@
+name: "CodeQL"
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+    branches:
+      - master
+      - develop
+
+jobs:
+  analyse:
+    name: CodeQL Analyse of boilerplate application
+    strategy: 
+      matrix:
+        include:
+          - SDK: "$NANOS_SDK"
+            artifact: boilerplate-app-nanoS
+          - SDK: "$NANOX_SDK"
+            artifact: boilerplate-app-nanoX
+          - SDK: "$NANOSP_SDK"
+            artifact: boilerplate-app-nanoSP
+        language: [ 'cpp' ]
+    runs-on: ubuntu-latest
+    container:
+      image: ghcr.io/ledgerhq/ledger-app-builder/ledger-app-builder-legacy:latest
+
+    steps:
+      - name: Clone
+        uses: actions/checkout@v3
+
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v2
+        with:
+          languages: ${{ matrix.language }}
+          queries: security-and-quality
+    
+      - name: Build
+        run: |
+          make BOLOS_SDK=${{ matrix.SDK }}
+        
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v2
+
@@ -0,0 +1,22 @@
+name: Ensure compliance with Ledger guidelines
+
+# This workflow is mandatory in all applications
+# It calls a reusable workflow guidelines_enforcer developed by Ledger's internal developer team.
+# The successful completion of the reusable workflow is a mandatory step for an app to be available on the Ledger
+# application store.
+#
+# More information on the guidelines can be found in the repository:
+# LedgerHQ/ledger-app-workflows/
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
+      - develop
+  pull_request:
+
+jobs:
+  guidelines_enforcer:
+    name: Call Ledger guidelines_enforcer
+    uses: LedgerHQ/ledger-app-workflows/.github/workflows/reusable_guidelines_enforcer.yml@v1