Merge branch 'development' into sw_fix_cucumber

.cargo/audit.toml

@@ -1,19 +1,9 @@
 [advisories]
 ignore = [
-    # All data structures using borsh ser/de have been reviewed for ZST's and we have found no reason for concern.
-    # TODO: Remove this line after borsh-rs has been upgraded to >=0.12.0
-    # https://github.com/near/borsh-rs/pull/146
-    "RUSTSEC-2023-0033",
-
-    # Repo flagged as unmaintained but our clap dependency uses it
-    # TODO: Remove this if clap is upgraded to >=3.0.0
-    "RUSTSEC-2021-0139",
 
     # We are not using a special allocator and will not suffer this issue
     "RUSTSEC-2021-0145",
+    # We are not using RSA
+    "RUSTSEC-2023-0071"
 
-    # PGP should be upgraded to 0.10.1 which removes the "unmaintained" dependency but we can't do this as pgp and snow
-    # specify different version dependencies for curve25519-dalek that are currently unresolvable.
-    # TODO: Check and see if pgp and snow can be resolved and if so, upgrade them and remove this ignore
-    "RUSTSEC-2023-0028",
 ]

.cargo/config.toml

@@ -0,0 +1,5 @@
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
+
+[target.riscv64gc-unknown-linux-gnu]
+linker = "riscv64-linux-gnu-gcc"

.config/nextest.toml

@@ -3,3 +3,15 @@ slow-timeout = { period = "60s", terminate-after=2}
 
 [profile.ci.junit]  # this can be some other profile, too
 path = "junit.xml"
+
+[profile.intellij]
+retries = 0
+slow-timeout = { period = "30s" }
+failure-output = "immediate-final"
+fail-fast = false
+
+[profile.intellij.junit]  # this can be some other profile, too
+path = "junit.xml"
+
+
+

.github/workflows/base_node_binaries.json

@@ -2,54 +2,49 @@
   {
     "name": "linux-x86_64",
     "runs-on": "ubuntu-20.04",
-    "rust": "nightly-2023-06-04",
+    "rust": "nightly-2024-02-04",
     "target": "x86_64-unknown-linux-gnu",
-    "cross": false,
-    "target_cpu": "x86-64",
-    "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
-    "features": "default, safe"
+    "cross": false
   },
   {
     "name": "linux-arm64",
     "runs-on": "ubuntu-latest",
     "rust": "stable",
     "target": "aarch64-unknown-linux-gnu",
     "cross": true,
-    "target_cpu": "generic",
-    "features": "safe",
-    "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
     "flags": "--workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests"
   },
+  {
+    "name": "linux-riscv64",
+    "runs-on": "ubuntu-latest",
+    "rust": "stable",
+    "target": "riscv64gc-unknown-linux-gnu",
+    "cross": true,
+    "flags": "--workspace --exclude minotari_mining_helper_ffi --exclude tari_integration_tests",
+    "build_enabled": true,
+    "best-effort": true
+  },
   {
     "name": "macos-x86_64",
     "runs-on": "macos-11",
     "rust": "stable",
     "target": "x86_64-apple-darwin",
-    "cross": false,
-    "target_cpu": "x86-64",
-    "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
-    "features": "default, safe"
+    "cross": false
   },
   {
     "name": "macos-arm64",
-    "runs-on": "macos-12",
+    "runs-on": "macos-14",
     "rust": "stable",
     "target": "aarch64-apple-darwin",
-    "cross": false,
-    "target_cpu": "generic",
-    "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
-    "features": "default, safe",
-    "build_enabled": true
+    "cross": false
   },
   {
     "name": "windows-x64",
     "runs-on": "windows-2019",
     "rust": "stable",
     "target": "x86_64-pc-windows-msvc",
     "cross": false,
-    "target_cpu": "x86-64",
     "features": "safe",
-    "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
     "flags": "--workspace --exclude tari_libtor"
   },
   {
@@ -58,9 +53,9 @@
     "rust": "stable",
     "target": "aarch64-pc-windows-msvc",
     "cross": false,
-    "target_cpu": "generic",
     "features": "safe",
-    "target_bins": "--bin minotari_node --bin minotari_console_wallet --bin minotari_merge_mining_proxy --bin minotari_miner",
+    "target_bins": "minotari_node, minotari_console_wallet, minotari_merge_mining_proxy, minotari_miner",
+    "flags": "--workspace --exclude tari_libtor",
     "build_enabled": false
   }
 ]