Rk stratum2.0 fixed

.cargo/config.toml

@@ -1,3 +1,14 @@
+# 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]

.github/workflows/ci.yaml

@@ -28,10 +28,10 @@ jobs:
     name: Test Suite
     # runs-on: ${{ matrix.os }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      # matrix:
-      #   os: [ ubuntu-latest, macos-latest, windows-latest ]
+    # strategy:
+    #   fail-fast: false
+    #   matrix:
+    #     os: [ ubuntu-latest, macos-latest, windows-latest ]
     steps:
       # Clean unnecessary files to save disk space
       - name: clean unnecessary files to save space
@@ -422,5 +422,9 @@ jobs:
         run: |
           # Run build script for musl toolchain
           source musl-toolchain/build.sh
-          # Build for musl
+          # Build other binaries first (without the allow-multiple-definition flag)
           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"
+          cargo --verbose build --bin stratum-bridge --release --target x86_64-unknown-linux-musl

.github/workflows/deploy.yaml

@@ -59,8 +59,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/

Cargo.toml

@@ -386,4 +386,4 @@ opt-level = 2
 
 [workspace.lints.clippy]
 empty_docs = "allow"
-uninlined_format_args = "allow"
+uninlined_format_args = "allow"

bridge/.gitignore

@@ -1,5 +1,5 @@
 # ============================================
-# RustBridge .gitignore
+# RKStratum .gitignore
 # Only tracks: src/, Cargo.toml, config.yaml
 # ============================================
 
@@ -9,7 +9,7 @@ Cargo.lock
 
 # Log files (runtime artifacts)
 *.log
-rustbridge_*.log
+RKStratum_*.log
 
 # Backup files
 *.backup

bridge/Cargo.toml

@@ -22,6 +22,7 @@ kaspa-notify = { workspace = true }
 kaspa-core = { workspace = true }
 kaspa-utils = { workspace = true }
 kaspad = { workspace = true }
+kaspa-alloc = { workspace = true }
 dirs = { workspace = true }
 
 # External dependencies - using workspace versions where available
@@ -50,10 +51,19 @@ tracing-appender = "0.2"
 blake2 = "0.10"
 num-bigint = "0.4"
 prometheus = "0.13"
-yaml-rust = "0.4"
+serde_yaml = "0.9"
 faster-hex = "0.1"
-windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_System_Console"] }
 chrono = { workspace = true }
+include_dir = "0.7"
+
+[target.'cfg(windows)'.dependencies]
+windows-sys = { version = "0.52", features = ["Win32_Foundation", "Win32_System_Console"] }
+
+# For musl builds, we declare mimalloc without 'override' to override kaspa-alloc's version
+# The .cargo/config.toml linker flag handles any remaining conflicts
+[target.'cfg(all(not(target_os = "macos"), target_env = "musl"))'.dependencies]
+mimalloc = { version = "0.1.48", default-features = false }
+
 
 [dev-dependencies]
 tokio-test = "0.4"
@@ -62,5 +72,8 @@ tokio-test = "0.4"
 name = "stratum-bridge"
 path = "src/main.rs"
 
+[features]
+rkstratum_cpu_miner = []
+
 [lints]
 workspace = true

bridge/config.yaml

@@ -1,84 +1,57 @@
-# RustBridge Multi-Instance Test Configuration
+# RKStratum Multi-Instance Test Configuration
 # This configuration runs 4 instances for testing the multi-instance feature
 # All instances share the same Kaspa node (kaspad_address)
+#
+# NOTE: Comments in this file will be lost if you update the configuration
+# through the web dashboard. The web UI uses serde_yaml which does not
+# preserve comments. For production, consider keeping a backup or using
+# version control.
 
-# ============================================
-# GLOBAL SETTINGS (shared by all instances)
-# ============================================
-
-# Kaspa node gRPC address (SHARED - all instances use the same node)
-# Format: "HOST:PORT" or "grpc://HOST:PORT"
-# Default HTTP gRPC port is typically 16110
-# Use 127.0.0.1 instead of localhost to force IPv4
 kaspad_address: "127.0.0.1:16110"
-
-# Block template wait time in milliseconds (shared)
-# How long to wait between checking for new block templates
 block_wait_time: 1000
-
-# Print statistics to console (shared)
 print_stats: true
-
-# Default log to file setting (can be overridden per-instance)
 log_to_file: true
-
-# Health check server port (optional, leave empty to disable)
-# This is a GLOBAL health check endpoint
 health_check_port: ""
-
-# Variable difficulty settings (defaults, can be overridden per-instance)
-var_diff: false
-shares_per_min: 20
-var_diff_stats: false
-
-# Power-of-2 difficulty clamping (default, can be overridden per-instance)
+web_dashboard_port: ":3030"
+var_diff: true
+shares_per_min: 30
+var_diff_stats: true
 pow2_clamp: true
-
-# Extranonce size (auto-detected per client, this is just for backward compatibility)
 extranonce_size: 2
-
-# Optional: append a custom identifier to the built-in coinbase tag (applies to BOTH node modes).
-# You CANNOT change/override the built-in base tag; you can only append a suffix.
-# Built-in base tag is fixed:
-# - "RK-Stratum"
-# Set this to a short identifier (no leading slash). It will be appended as `/SUFFIX`.
-# Examples (if coinbase_tag_suffix: "supertypo"):
-# - "RK-Stratum/supertypo"
 coinbase_tag_suffix: ""
 
-# ============================================
-# INSTANCE CONFIGURATIONS
-# ============================================
-# Each instance runs independently with its own:
-# - Stratum port (REQUIRED, must be unique)
-# - Minimum share difficulty (REQUIRED)
-# - Prometheus port (OPTIONAL, per-instance)
-# - Log to file (OPTIONAL, per-instance, defaults to global setting)
-
 instances:
-  # Instance 1: Low difficulty pool (for smaller miners or testing)
+  - stratum_port: ":5559"
+    min_share_diff: 4
+    prom_port: ":2118"
+    log_to_file: true
+
+  - stratum_port: ":5560"
+    min_share_diff: 512
+    prom_port: ":2119"
+    log_to_file: true
+
+  - stratum_port: ":5561"
+    min_share_diff: 1024
+    prom_port: ":2120"
+    log_to_file: true
+
   - stratum_port: ":5555"
     min_share_diff: 2048
     prom_port: ":2114"
     log_to_file: true
 
-  # Instance 2: Medium difficulty pool
   - stratum_port: ":5556"
     min_share_diff: 4096
     prom_port: ":2115"
     log_to_file: true
 
-  # Instance 3: High difficulty pool (for powerful miners)
   - stratum_port: ":5557"
     min_share_diff: 8192
     prom_port: ":2116"
     log_to_file: true
 
-  # Instance 4: Very high difficulty pool (for very powerful miners)
   - stratum_port: ":5558"
     min_share_diff: 16384
     prom_port: ":2117"
     log_to_file: true
-    # Optional: instance-specific overrides
-    # var_diff: true
-    # shares_per_min: 30