Merge pull request #69 from Zondax/dev

Get upstream fixes
Zondax · Feb 12, 2021 · 1ef34cc · 1ef34cc
2 parents 75a0a6f + 2ce27c8
commit 1ef34cc
Show file tree

Hide file tree

Showing 8 changed files with 198 additions and 24 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -67,26 +67,6 @@ jobs:
             source /home/zondax/.cargo/env
             COIN=Ledgeracio make
 
-  test_fuzz_crash_fixes:
-    docker:
-      - image: zondax/circleci@sha256:37f78ab294b35a055768c2305b3f13813e55fb9db4e65f72745ede61dd842c08
-    steps:
-      - checkout
-      - run: git submodule update --init --recursive
-      - run: sudo apt update && sudo apt -y install clang-10
-      - run:
-          name: Build
-          command: |
-            cmake -B build \
-                    -DCMAKE_C_COMPILER=clang-10 \
-                    -DCMAKE_CXX_COMPILER=clang++-10 \
-                    -DCMAKE_BUILD_TYPE=Debug \
-                    -DENABLE_FUZZING=1 \
-                    -DENABLE_SANITIZERS=1 \
-                    .
-            make -C build
-      - run: ./run-fuzz-crashes.py
-
   test_zemu:
     machine:
       image: ubuntu-1604:201903-01

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,188 @@
+name: Build
+on: [push]
+
+jobs:
+  configure:
+    runs-on: ubuntu-latest
+    outputs:
+      uid_gid: ${{ steps.get-user.outputs.uid_gid }}
+    steps:
+      - id: get-user
+        run: echo "::set-output name=uid_gid::$(id -u):$(id -g)"
+
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Install deps
+        run: |
+          sudo update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+          make deps
+          brew install conan
+      - run: cmake -DCMAKE_BUILD_TYPE=Debug . && make
+      - run: GTEST_COLOR=1 ASAN_OPTIONS=detect_leaks=0 ctest -VV
+
+  build_only_rust:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Install deps
+        run: |
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+      - name: rustfmt
+        run: |
+          cd ./app/rust
+          cargo fmt --version
+          cargo fmt -- --check
+      - name: clippy
+        run: |
+          cd ./app/rust
+          cargo clippy --version
+          cargo clippy --all-features --all-targets || true
+      - name: audit
+        run: |
+          cd ./app/rust
+          cargo audit --version
+          cargo audit
+      - name: run tests
+        run: |
+          cd ./app/rust
+          cargo test
+
+  build_ledger:
+    needs: configure
+    runs-on: ubuntu-latest
+    container:
+      image: zondax/builder-bolos:latest
+      options: --user ${{ needs.configure.outputs.uid_gid }}
+    env:
+      BOLOS_SDK: /__w/ledger-kusama/ledger-kusama/deps/nanos-secure-sdk
+      BOLOS_ENV: /opt/bolos
+      HOME: /home/zondax_circle
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - name: Build Standard app
+        shell: bash -l {0}
+        run: |
+          source $HOME/.cargo/env
+          make
+      - name: Build SR25519 app
+        shell: bash -l {0}
+        run: |
+          source $HOME/.cargo/env
+          SUPPORT_SR25519=1 make
+      - name: Build Ledgeracio
+        shell: bash -l {0}
+        run: |
+          source $HOME/.cargo/env
+          COIN=Ledgeracio make
+
+  test_zemu:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Test
+        run: |
+          id
+          echo $HOME
+          echo $DISPLAY
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
+      - name: Install rust
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake binutils-dev libcurl4-openssl-dev libiberty-dev libelf-dev libdw-dev
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y;
+      - name: Install node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.4.0'
+      - name: Install yarn
+        run: |
+          npm install -g yarn
+      - name: Build Ledger app
+        run: |
+          make
+      - name: Build/Install build js deps
+        run: |
+          export PATH=~/.cargo/bin:$PATH
+          make zemu_install
+      - name: Run zemu tests
+        run: |
+          export PATH=~/.cargo/bin:$PATH
+          make zemu_test
+
+  test_zemu_ledgeracio:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
+      - name: Install rust
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake binutils-dev libcurl4-openssl-dev libiberty-dev libelf-dev libdw-dev
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y;
+      - name: Install node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.4.0'
+      - name: Install yarn
+        run: |
+          npm install -g yarn
+      - name: Build Ledger app
+        run: |
+          make build_ledgeracio
+      - name: Build/Install build js deps
+        run: |
+          export PATH=~/.cargo/bin:$PATH
+          make zemu_install
+      - name: Run zemu tests for Ledgeracio app
+        run: |
+          export PATH=~/.cargo/bin:$PATH
+          COIN=Ledgeracio make zemu_test
+
+  test_zemu_sr25519:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          submodules: true
+      - run: sudo apt-get update -y && sudo apt-get install -y libusb-1.0.0 libudev-dev
+      - name: Install rust
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake binutils-dev libcurl4-openssl-dev libiberty-dev libelf-dev libdw-dev
+          curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- --no-modify-path --default-toolchain none -y;
+      - name: Install node
+        uses: actions/setup-node@v2
+        with:
+          node-version: '14.4.0'
+      - name: Install yarn
+        run: |
+          npm install -g yarn
+      - name: Build Ledger app
+        run: |
+          make build_sr25519
+      - name: Build/Install build js deps
+        run: |
+          export PATH=~/.cargo/bin:$PATH
+          make zemu_install
+      - name: Run zemu tests for sr25519
+        run: |
+          export PATH=~/.cargo/bin:$PATH
+          cd tests_zemu && yarn testSR25519
diff --git a/tests_zemu/package.json b/tests_zemu/package.json
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "@zondax/ledger-polkadot": "^0.13.0",
-    "@zondax/zemu": "^0.11.5"
+    "@zondax/zemu": "^0.11.6"
   },
   "devDependencies": {
     "@babel/cli": "^7.12.10",

diff --git a/tests_zemu/snapshots/s-mainmenu/00002.png b/tests_zemu/snapshots/s-mainmenu/00002.png
diff --git a/tests_zemu/snapshots/s-sign_basic_normal/00008.png b/tests_zemu/snapshots/s-sign_basic_normal/00008.png
diff --git a/tests_zemu/tests/Ledgeracio.test.js b/tests_zemu/tests/Ledgeracio.test.js
@@ -24,11 +24,13 @@ const Resolve = require("path").resolve;
 const APP_PATH = Resolve("../app/bin/app_ledgeracio.elf");
 
 const APP_SEED = "equip will roof matter pink blind book anxiety banner elbow sun young"
+let enableX11 = null;
+
 const simOptions = {
     logging: true,
     start_delay: 3000,
     custom: `-s "${APP_SEED}"`,
-    //X11: true
+    X11: enableX11 !== null ? enableX11 : !!process.env["$DISPLAY"]
 };
 
 jest.setTimeout(30000)

diff --git a/tests_zemu/tests/sr25519.test.js b/tests_zemu/tests/sr25519.test.js
@@ -27,11 +27,13 @@ const Resolve = require("path").resolve;
 const APP_PATH = Resolve("../app/bin/app_sr25519.elf");
 
 const APP_SEED = "equip will roof matter pink blind book anxiety banner elbow sun young"
+let enableX11 = null;
+
 const sim_options = {
     logging: true,
     start_delay: 3000,
     custom: `-s "${APP_SEED}"`,
-    X11: true
+    X11: enableX11 !== null ? enableX11 : !!process.env["$DISPLAY"]
 };
 
 jest.setTimeout(60000)

diff --git a/tests_zemu/tests/test.js b/tests_zemu/tests/test.js
@@ -25,11 +25,13 @@ const APP_PATH_S = Resolve("../app/bin/app_s.elf");
 const APP_PATH_X = Resolve("../app/bin/app_x.elf");
 
 const APP_SEED = "equip will roof matter pink blind book anxiety banner elbow sun young"
+let enableX11 = null;
+
 var simOptions = {
     logging: true,
     start_delay: 3000,
     custom: `-s "${APP_SEED}"`
-    , X11: true
+    , X11: enableX11 !== null ? enableX11 : !!process.env["$DISPLAY"]
 };
 
 let models = [