Merge pull request #21 from Foundation-Devices/jeandudey/sft-3119-upd…

…ate-foundation-rs-dependencies SFT-3119: Update foundation-rs dependencies.
Foundation-Devices · Jan 3, 2024 · fba34ea · fba34ea
2 parents 1530812 + a2cf185
commit fba34ea
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 17 deletions.
diff --git a/.github/workflows/basic-fuzzing.yaml b/.github/workflows/basic-fuzzing.yaml
@@ -8,7 +8,7 @@ jobs:
     name: Fuzz tests pass?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: nightly

diff --git a/.github/workflows/dependencies.yaml b/.github/workflows/dependencies.yaml
@@ -12,7 +12,7 @@ jobs:
     name: Pass security audit?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66
@@ -24,7 +24,7 @@ jobs:
     needs: [pass-security-audit]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66
@@ -36,7 +36,7 @@ jobs:
     needs: [pass-security-audit]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: nightly

diff --git a/.github/workflows/ffi.yaml b/.github/workflows/ffi.yaml
@@ -8,7 +8,7 @@ jobs:
     name: Is header file up to date?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66
@@ -22,15 +22,15 @@ jobs:
     name: Is integration code formatted?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: sudo apt-get install -y clang-format
       - run: clang-format --version
       - run: clang-format --dry-run --Werror ffi/integration/*.cpp
   integration-test-passes:
     name: Integration test passes?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66

diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -8,14 +8,14 @@ jobs:
     name: Is REUSE compliant?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: fsfe/reuse-action@v1
 
   is-the-code-compilable:
     name: Is the code compilable?
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66
@@ -33,7 +33,7 @@ jobs:
     needs: [is-the-code-compilable]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66
@@ -45,7 +45,7 @@ jobs:
     needs: [is-the-code-compilable]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/rust-toolchain
         with:
           toolchain: 1.66

diff --git a/Cargo.toml b/Cargo.toml
@@ -18,15 +18,11 @@ arbitrary = { version = "1", features = ["derive"] }
 bech32 = { version = "0.9", default-features = false }
 bip39 = { version = "2", default-features = false }
 bitcoin = { version = "0.30", default-features = false }
-bitcoin_hashes = { version = "0.12", default-features = false }
+bitcoin_hashes = { version = "0.13", default-features = false }
 bs58 = "0.5"
 crc = "3"
 criterion = { version = "0.4" }
-foundation-arena = { path = "arena" }
-foundation-codecs = { path = "codecs" }
-foundation-test-vectors = { path = "test-vectors" }
-foundation-urtypes = { path = "urtypes" }
-heapless = { version = "0.8", git = "https://github.com/japaric/heapless", default-features = false }
+heapless = { version = "0.8", default-features = false }
 hex = { version = "0.4.2", default-features = false }
 itertools = { version = "0.10", default-features = false }
 libfuzzer-sys = "0.4"
@@ -37,5 +33,11 @@ serde = { version = "1.0.156", features = ["derive"] }
 serde_json = "1"
 uuid = { version = "1", default-features = false }
 
+# The crates in this workspace.
+foundation-arena = { path = "arena" }
+foundation-codecs = { path = "codecs" }
+foundation-test-vectors = { path = "test-vectors" }
+foundation-urtypes = { path = "urtypes" }
+
 [profile.release]
 debug = 1
diff --git a/manifest.scm b/manifest.scm
@@ -0,0 +1,21 @@
+;;; SPDX-FileCopyrightText: © 2023 Foundation Devices, Inc. <[email protected]>
+;;; SPDX-License-Identifier: GPL-3.0-or-later
+
+;;; Manifest used to set up a development environment.
+;;;
+;;; guix shell
+
+(specifications->manifest
+  '("cmake"
+    "gcc-toolchain"
+    "guile"
+    "jq"
+    "make"
+    "reuse"
+    "rust"
+    "rust:cargo"
+    "rust:tools"
+
+    ;; Nice to have utilities.
+    "hal"
+    "vim")) ;; For xxd command.