Merge branch 'main' into prompt-queueing

Author: Ericson2314

.github/workflows/rust.yml

@@ -0,0 +1,98 @@
+name: Rust
+
+on:
+  push:
+    branches: [ main, develop ]
+  pull_request:
+    branches: [ main, develop ]
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'Manually triggered'
+
+env:
+  CARGO_TERM_COLOR: always
+
+jobs:
+  fmt:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          components: rust-src, rustfmt
+      - run: rustup component add rustfmt
+      - name: Cargo fmt
+        uses: actions-rs/cargo@v1
+        with:
+          command: fmt
+          args: --all -- --check
+  clippy:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        device: [nanos, nanox, nanosplus]
+    env:
+      OBJCOPY: arm-none-eabi-objcopy
+      NM: arm-none-eabi-nm
+    steps:
+      - name: arm-none-eabi-gcc
+        uses: fiam/[email protected]
+        with:
+          release: '9-2019-q4'
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Checkout SDK (targets)
+        uses: actions/checkout@v3
+        with:
+          repository: 'alamgu/ledger-nanos-sdk'
+          ref: memory-fixes
+          path: rsdk
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          components: rust-src, clippy
+      - run: rustup component add clippy
+      - name: Cargo clippy
+        uses: actions-rs/cargo@v1
+        with:
+          command: clippy
+          args: -Z build-std=core -Z build-std-features=compiler-builtins-mem --target ./rsdk/${{ matrix.device }}.json
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        device: [nanos, nanox, nanosplus]
+    env:
+      OBJCOPY: arm-none-eabi-objcopy
+      NM: arm-none-eabi-nm
+    steps:
+      - name: arm-none-eabi-gcc
+        uses: fiam/[email protected]
+        with:
+          release: '9-2019-q4'
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Checkout SDK (targets)
+        uses: actions/checkout@v3
+        with:
+          repository: 'alamgu/ledger-nanos-sdk'
+          ref: memory-fixes
+          path: rsdk
+      - name: Install clang
+        run: sudo apt-get update && sudo apt install -y clang
+      - uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          components: rust-src
+      - run: echo "$PWD/rsdk/scripts" >> $GITHUB_PATH
+      - name: Cargo build
+        uses: actions-rs/cargo@v1
+        with:
+          command: build
+          args: -Z build-std=core -Z build-std-features=compiler-builtins-mem --target ./rsdk/${{ matrix.device }}.json

src/lib.rs

@@ -241,30 +241,28 @@ impl HostIO {
             Ok(ref mut s) => {
                 if s.sent_command.is_some() {
                     Poll::Pending
-                } else {
-                    if s.requested_block == Some(sha) {
-                        match s.comm.borrow().get_data().ok().unwrap()[0].try_into() {
-                            Ok(HostToLedgerCmd::GetChunkResponseSuccess) => {
-                                Poll::Ready(Ok(Ref::map(s.comm.borrow(), |comm| {
-                                    &comm.get_data().ok().unwrap()[1..]
-                                })))
-                            }
-                            Ok(HostToLedgerCmd::GetChunkResponseFailure) => {
-                                Poll::Ready(Err(ChunkNotFound))
-                            }
-                            _ => {
-                                error!("Reached unreachable");
-                                panic!("Unreachable: should be filtered out by protocol rules before this point.")
-                            }
+                } else if s.requested_block == Some(sha) {
+                    match s.comm.borrow().get_data().ok().unwrap()[0].try_into() {
+                        Ok(HostToLedgerCmd::GetChunkResponseSuccess) => {
+                            Poll::Ready(Ok(Ref::map(s.comm.borrow(), |comm| {
+                                &comm.get_data().ok().unwrap()[1..]
+                            })))
+                        }
+                        Ok(HostToLedgerCmd::GetChunkResponseFailure) => {
+                            Poll::Ready(Err(ChunkNotFound))
+                        }
+                        _ => {
+                            error!("Reached unreachable");
+                            panic!("Unreachable: should be filtered out by protocol rules before this point.")
                         }
-                    } else {
-                        s.requested_block = Some(sha);
-                        s.sent_command = Some(LedgerToHostCmd::GetChunk);
-                        let mut io = s.comm.borrow_mut();
-                        io.append(&[LedgerToHostCmd::GetChunk as u8]);
-                        io.append(&sha);
-                        Poll::Pending
                     }
+                } else {
+                    s.requested_block = Some(sha);
+                    s.sent_command = Some(LedgerToHostCmd::GetChunk);
+                    let mut io = s.comm.borrow_mut();
+                    io.append(&[LedgerToHostCmd::GetChunk as u8]);
+                    io.append(&sha);
+                    Poll::Pending
                 }
             }
             Err(_) => Poll::Pending,