Merge branch 'darkfi-master-track' into fix/dependencies_sqlcipher

.github/workflows/book.yml

@@ -23,14 +23,14 @@ jobs:
             - name: Install Rust (nightly)
               uses: actions-rs/toolchain@v1
               with:
-                toolchain: nightly
+                toolchain: nightly-2024-02-01
                 components: rustfmt, clippy
                 override: true
 
             - name: Install Rust (wasm32)
               uses: actions-rs/toolchain@v1
               with:
-                toolchain: nightly
+                toolchain: nightly-2024-02-01
                 target: wasm32-unknown-unknown
                 override: true
 
@@ -40,7 +40,7 @@ jobs:
               run: |
                 pip install ghp-import
                 pip install prettytable
-                sudo apt -y install make wget libasound2-dev
+                sudo apt -y install make wget libasound2-dev wabt
                 wget "https://github.com/badboy/mdbook-toc/releases/download/0.14.1/mdbook-toc-0.14.1-x86_64-unknown-linux-gnu.tar.gz"
                 wget "https://github.com/lzanini/mdbook-katex/releases/download/v0.5.7/mdbook-katex-v0.5.7-x86_64-unknown-linux-gnu.tar.gz"
                 wget "https://github.com/badboy/mdbook-mermaid/releases/download/v0.12.6/mdbook-mermaid-v0.12.6-x86_64-unknown-linux-gnu.tar.gz"
@@ -56,7 +56,7 @@ jobs:
                 git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
                 git config --local user.name "bookworm"
                 cd doc
-                make github
+                make CARGO="cargo +nightly-2024-02-01" github
                 git checkout gh-pages
 
             - name: Push changes

.github/workflows/ci.yml

@@ -13,11 +13,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-02-01
           override: true
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-02-01
           target: wasm32-unknown-unknown
           override: true
 
@@ -30,11 +30,11 @@ jobs:
 
       - name: Run test units
         run: |
-          make test
+          make CARGO="cargo +nightly-2024-02-01" test
 
       - name: Compile all bins
         run: |
-          make
+          make CARGO="cargo +nightly-2024-02-01"
 
   feature-powerset:
     name: Test crate feature powerset on ${{ matrix.os }}
@@ -47,11 +47,11 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-02-01
           override: true
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-02-01
           target: wasm32-unknown-unknown
           override: true
       - uses: taiki-e/install-action@cargo-hack
@@ -64,7 +64,7 @@ jobs:
 
       - name: Run feature powerset builds
         run: |
-          make check
+          make CARGO="cargo +nightly-2024-02-01" check
 
   fmt:
     name: rustfmt
@@ -74,8 +74,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions-rs/toolchain@v1
         with:
-          toolchain: nightly
+          toolchain: nightly-2024-02-01
           components: rustfmt
           override: true
       - run: |
-          cargo fmt -- --check
+          cargo +nightly-2024-02-01 fmt -- --check

.gitignore

@@ -5,17 +5,24 @@
 *.wasm
 *.zk.bin
 
+witness.json
 *_circuit_layout.png
 
 /bin/zkas/zkas
 /zkas
 
-/bin/darkfid2/darkfid2
-/darkfid2
+/bin/darkfid/darkfid
+/darkfid
+
+/bin/minerd/minerd
+/minerd
 
 /bin/darkfi-mmproxy/darkfi-mmproxy
 /darkfi-mmproxy
 
+/bin/drk/drk
+/drk
+
 /bin/darkirc/darkirc
 /darkirc
 
@@ -28,6 +35,9 @@
 /bin/lilith/lilith
 /lilith
 
+/bin/swapd/swapd
+/swapd
+
 /bin/tau/taud/taud
 /taud