Merge branch 'kaspanet:master' into master

Author: aspect

.cargo/config.toml

@@ -0,0 +1,15 @@
+# Cargo configuration for musl builds
+# This configures linker flags to handle mimalloc conflicts with libstdc++
+# Since kaspa-alloc uses mimalloc with 'override' feature (which conflicts with
+# libstdc++'s operator new/delete in musl static builds), we use linker flags
+# to allow multiple definitions. The linker will use the first definition it encounters.
+
+[target.x86_64-unknown-linux-musl]
+rustflags = [
+    "-C", "link-arg=-Wl,--allow-multiple-definition",
+]
+
+# Static link CRT on Windows to avoid VCRedist dependency
+# (similar to how we use musl on Linux for portable binaries)
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]

.github/workflows/ci.yaml

@@ -181,6 +181,7 @@ jobs:
       - name: Install stable toolchain
         uses: dtolnay/rust-toolchain@stable
         with:
+          toolchain: 1.93.0
           components: rustfmt, clippy
 
       - name: Set up cache
@@ -192,6 +193,25 @@ jobs:
       - name: Run cargo clippy
         run: cargo clippy --workspace --tests --benches --examples -- -D warnings
 
+  check-no-std:
+    name: Check no_std
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install stable toolchain
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Add thumbv7em-none-eabi target
+        run: rustup target add thumbv7em-none-eabi
+
+      - name: Set up cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Run no_std cargo check for crypto/addresses
+        run: cargo check -p kaspa-addresses --no-default-features --target thumbv7em-none-eabi
+
 
   check-wasm32:
     name: Check WASM32
@@ -247,6 +267,74 @@ jobs:
 
       - name: Run cargo check of kaspa-wasm for wasm32 target
         run: cargo clippy -p kaspa-wasm --target wasm32-unknown-unknown
+  
+  test-wasm32:
+    name: Test WASM32
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install llvm
+        id: install_llvm
+        continue-on-error: true
+        run: |
+          wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          sudo apt-get install -y clang-15 lldb-15 lld-15 clangd-15 clang-tidy-15 clang-format-15 clang-tools-15 llvm-15-dev lld-15 lldb-15 llvm-15-tools libomp-15-dev libc++-15-dev libc++abi-15-dev libclang-common-15-dev libclang-15-dev libclang-cpp15-dev libunwind-15-dev
+          # Make Clang 15 default
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/lib/llvm-15/bin/clang++ 100
+          sudo update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-15/bin/clang 100
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/lib/llvm-15/bin/clang-format 100
+          sudo update-alternatives --install /usr/bin/clang-tidy clang-tidy /usr/lib/llvm-15/bin/clang-tidy 100
+          sudo update-alternatives --install /usr/bin/run-clang-tidy run-clang-tidy /usr/lib/llvm-15/bin/run-clang-tidy 100
+          # Alias cc to clang
+          sudo update-alternatives --install /usr/bin/cc cc /usr/lib/llvm-15/bin/clang 0
+          sudo update-alternatives --install /usr/bin/c++ c++ /usr/lib/llvm-15/bin/clang++ 0
+
+      - name: Install gcc-multilib
+        # gcc-multilib allows clang to find gnu libraries properly
+        run: |
+          sudo apt-get update
+          sudo apt install -y gcc-multilib
+
+      - name: Install stable toolchain
+        if: steps.install_llvm.outcome == 'success' && steps.install_llvm.conclusion == 'success'
+        uses: dtolnay/rust-toolchain@stable
+
+      - name: Install wasm-pack
+        uses: taiki-e/install-action@v2
+        with:
+          tool: wasm-pack
+
+      - name: Add wasm32 target
+        run: rustup target add wasm32-unknown-unknown
+        
+      - name: Set up cache
+        uses: Swatinem/rust-cache@v2
+
+      - name: Install Node.js
+        uses: actions/setup-node@v6
+        with:
+          node-version: 20
+
+      - name: Install NodeJS dependencies
+        run: npm install --global typedoc typescript
+
+      # append here any new crates that contains wasm test suites (and aren't already covered)
+      - name: Run wasm tests for consensus/core
+        run: wasm-pack test --node consensus/core
+
+      - name: Run wasm tests for crypto/addresses
+        run: wasm-pack test --node crypto/addresses
+
+      - name: Run wasm tests for wallet/pskt
+        run: wasm-pack test --node wallet/pskt
+
 
   build-wasm32:
     name: Build WASM32 SDK
@@ -339,20 +427,15 @@ jobs:
       - name: Set up Rust cache
         uses: Swatinem/rust-cache@v2
 
-      - name: Cache Toolchain
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/x-tools
-          key: ${{ runner.os }}-musl-${{ hashFiles('**/musl-toolchain/preset.sh') }}
-          restore-keys: |
-            ${{ runner.os }}-musl-
-
-      
       - name: Build RK with musl toolchain
         if: runner.os == 'Linux'
         run: |
           # Run build script for musl toolchain
           source musl-toolchain/build.sh
-          # Build for musl
-          cargo --verbose build --bin kaspad --bin rothschild --bin kaspa-wallet --release --target x86_64-unknown-linux-musl
+          # Build bridge with allow-multiple-definition flag to handle mimalloc conflicts with libstdc++ in musl builds
+          # This flag is only needed for kaspa-stratum-bridge due to its dual mimalloc dependency structure
+          export RUSTFLAGS="$RUSTFLAGS -C link-arg=-Wl,--allow-multiple-definition"
+          
+          # Build other binaries first (without the allow-multiple-definition flag)
+          cargo build --bin kaspad --bin rothschild --bin kaspa-wallet --bin stratum-bridge --release --target x86_64-unknown-linux-musl
+          

.github/workflows/deploy.yaml

@@ -40,14 +40,6 @@ jobs:
             target/
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache Toolchain
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/x-tools
-          key: ${{ runner.os }}-musl-${{ hashFiles('**/musl-toolchain/preset.sh') }}
-          restore-keys: |
-            ${{ runner.os }}-musl-
 
       - name: Build on Linux
         if: runner.os == 'Linux'
@@ -59,8 +51,12 @@ jobs:
           # Go back to the workspace
           cd $GITHUB_WORKSPACE
           
-          # Build for musl
-          cargo --verbose build --bin kaspad --bin rothschild --bin kaspa-wallet --bin stratum-bridge --release --target x86_64-unknown-linux-musl
+          # Build non-bridge binaries first
+          cargo --verbose build --bin kaspad --bin rothschild --bin kaspa-wallet --release --target x86_64-unknown-linux-musl
+          # Build bridge with allow-multiple-definition to resolve mimalloc/libstdc++ symbol collisions.
+          # musl-toolchain/build.sh sets RUSTFLAGS directly, so we append this flag here explicitly.
+          export RUSTFLAGS="$RUSTFLAGS -C link-arg=-Wl,--allow-multiple-definition"
+          cargo --verbose build --bin stratum-bridge --release --target x86_64-unknown-linux-musl
           mkdir bin || true
           cp target/x86_64-unknown-linux-musl/release/kaspad bin/
           cp target/x86_64-unknown-linux-musl/release/rothschild bin/

.github/workflows/musl-toolchain.yaml

@@ -0,0 +1,79 @@
+name: Build musl toolchain
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'musl-toolchain/preset.sh'
+    branches:
+      - master
+
+jobs:
+  build-toolchain:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set preset
+        run: source musl-toolchain/preset.sh && echo "CTNG_PRESET=$CTNG_PRESET" >> $GITHUB_ENV
+
+      - name: Calculate preset hash
+        run: |
+          HASH=$(sha256sum musl-toolchain/preset.sh | awk '{print $1}')
+          echo "PRESET_HASH=$HASH" >> $GITHUB_ENV
+          echo "Preset hash: $HASH"
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y autoconf automake libtool libtool-bin unzip help2man python3-dev gperf bison flex texinfo gawk libncurses5-dev zstd
+
+      - name: Build crosstool-ng
+        run: |
+          cd musl-toolchain
+          git clone https://github.com/crosstool-ng/crosstool-ng
+          cd crosstool-ng
+          git checkout crosstool-ng-1.26.0
+          ./bootstrap
+          ./configure --prefix=$HOME/ctng
+          make
+          make install
+
+      - name: Build musl toolchain
+        run: |
+          export PATH=$HOME/ctng/bin:$PATH
+          cd musl-toolchain
+          ct-ng ${{ env.CTNG_PRESET }}
+          ct-ng build > build.log 2>&1
+          status=$?
+          if [ $status -eq 0 ]; then
+            echo "Build succeeded"
+            echo "${{ env.PRESET_HASH }}" > "$HOME/x-tools/preset_hash"
+            ls -la $HOME/x-tools
+          else
+            echo "Build failed:"
+            cat .config
+            cat build.log
+            exit 1
+          fi
+
+      - name: Package toolchain
+        run: |
+          tar --use-compress-program=zstd -cf x-tools.tar.zst -C "$HOME" x-tools
+          ls -lh x-tools.tar.zst
+
+      - name: Upload toolchain release
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          TAG="musl-toolchain-v1"
+          # Delete existing release if it exists
+          gh release delete "$TAG" --yes --cleanup-tag 2>/dev/null || true
+          # Create new release with the toolchain archive
+          gh release create "$TAG" x-tools.tar.zst \
+            --title "musl cross-compilation toolchain" \
+            --notes "Pre-built x86_64-multilib-linux-musl toolchain (crosstool-ng 1.26.0). Preset hash: ${{ env.PRESET_HASH }}" \
+            --latest=false