merge with origin/dev

Author: shamardy

.cargo/config.toml

@@ -1,8 +1,25 @@
 [env]
+# Enables unstable features for specific crates to take advantage of useful
+# functionality not yet stabilized. Remove a crate from the list once all
+# required features are stabilized.
+#
+# # Core crates (used in production)
+#
+# - mm2_state_machine: Depends on `negative_impls` and `auto_traits`.
+# - mm2_err_handle: Depends on `negative_impls`, `auto_traits` and `allocator_api`.
+#
+# # Test crates (not leaked into the binary)
+#
+# - mocktopus: nightly only dependency.
+# - mocktopus_macros: nightly only dependency.
+# - docker_tests_main: Depends on `custom_test_frameworks` and `test`.
+# - docker_tests_sia_unique: Depends on `custom_test_frameworks` and `test`.
+RUSTC_BOOTSTRAP = "mm2_state_machine,mm2_err_handle,mocktopus,mocktopus_macros,docker_tests_main,docker_tests_sia_unique"
+
 JEMALLOC_SYS_WITH_MALLOC_CONF = "background_thread:true,narenas:1,tcache:false,dirty_decay_ms:0,muzzy_decay_ms:0,metadata_thp:auto"
 
 [target.'cfg(all())']
-rustflags = [ "-Zshare-generics=y", '--cfg=curve25519_dalek_backend="fiat"' ]
+rustflags = [ '--cfg=curve25519_dalek_backend="fiat"' ]
 
 # # Install lld using package manager
 # [target.x86_64-unknown-linux-gnu]

.github/workflows/dev-build.yml

@@ -29,8 +29,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -92,8 +92,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add x86_64-apple-darwin
 
       - name: Install build deps
@@ -144,8 +144,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add aarch64-apple-darwin
 
       - name: Install build deps
@@ -196,8 +196,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -247,8 +247,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add x86_64-apple-darwin
 
       - name: Install build deps
@@ -314,8 +314,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add wasm32-unknown-unknown
 
       - name: Install wasm-pack
@@ -365,8 +365,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add aarch64-apple-ios
 
       - name: Install build deps
@@ -427,8 +427,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add aarch64-linux-android
 
       - name: Install build deps
@@ -494,8 +494,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add armv7-linux-androideabi
 
       - name: Install build deps

.github/workflows/fmt-and-lint.yml

@@ -18,8 +18,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal --component rustfmt,clippy
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal --component rustfmt,clippy
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -45,8 +45,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal --component clippy
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal --component clippy
+          rustup default 1.85.1
           rustup target add wasm32-unknown-unknown
 
       - name: Install build deps

.github/workflows/release-build.yml

@@ -29,8 +29,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -87,8 +87,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -135,8 +135,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add aarch64-apple-darwin
 
       - name: Install build deps
@@ -184,8 +184,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -232,8 +232,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add x86_64-apple-darwin
 
       - name: Install build deps
@@ -296,8 +296,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add wasm32-unknown-unknown
 
       - name: Install wasm-pack
@@ -344,8 +344,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add aarch64-apple-ios
 
       - name: Install build deps
@@ -403,8 +403,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add aarch64-linux-android
 
       - name: Install build deps
@@ -467,8 +467,8 @@ jobs:
 
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add armv7-linux-androideabi
 
       - name: Install build deps

.github/workflows/test.yml

@@ -25,8 +25,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -53,8 +53,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -81,8 +81,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -109,8 +109,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -138,8 +138,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -170,8 +170,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -206,8 +206,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
 
       - name: Install build deps
         uses: ./.github/actions/deps-install
@@ -235,8 +235,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install toolchain
         run: |
-          rustup toolchain install nightly-2025-01-03 --no-self-update --profile=minimal
-          rustup default nightly-2025-01-03
+          rustup toolchain install 1.85.1 --no-self-update --profile=minimal
+          rustup default 1.85.1
           rustup target add wasm32-unknown-unknown
 
       - name: Install build deps

Cargo.toml

@@ -106,7 +106,7 @@ futures-timer = "3.0"
 futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }
 fnv = "1.0.6"
 group = "0.8.0"
-gstuff = { version = "0.7", features = ["nightly"] }
+gstuff = { version = "0.7" }
 hash256-std-hasher = "0.15.2"
 hash-db = "0.15.2"
 hex = "0.4.2"

docs/DEV_ENVIRONMENT.md

@@ -38,6 +38,11 @@
        ```
 9. Try `cargo test --all --features run-docker-tests -- --test-threads=16`.
 
+   Note for MacOS users:
+    - The UTXO 'testblockchain' docker container may fail to start due to TCP port conflict with MacOS AirPlay Receiver (using the same 7000 port). Disabling AirPlay Receiver resolves this problem.
+
+    - The 'nucleusd' test docker container (and the dependent 'ibc-relayer' container) may fail to start on MacOS. The MacOS docker "Enable host networking" option may help with this issue.
+
 ## Running WASM tests
 
 1. Set up [WASM Build Environment](../docs/WASM_BUILD.md#Setting-up-the-environment)