Merge main

Author: coderofstuff

.dockerignore

@@ -0,0 +1,2 @@
+.git
+target

Cargo.lock

@@ -225,7 +225,7 @@ rayon = "1.8.0"
 regex = "1.10.2"
 ripemd = { version = "0.1.3", default-features = false }
 rlimit = "0.10.1"
-rocksdb = "0.22.0"
+rocksdb = "0.24.0"
 rv = "0.16.4"
 secp256k1 = { version = "0.29.0", features = [
     "global-context",

Cargo.toml

@@ -1,6 +1,6 @@
 [![DeepWiki](https://img.shields.io/badge/DeepWiki-kaspanet%2Frusty--kaspa-blue.svg?logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAyCAYAAAAnWDnqAAAAAXNSR0IArs4c6QAAA05JREFUaEPtmUtyEzEQhtWTQyQLHNak2AB7ZnyXZMEjXMGeK/AIi+QuHrMnbChYY7MIh8g01fJoopFb0uhhEqqcbWTp06/uv1saEDv4O3n3dV60RfP947Mm9/SQc0ICFQgzfc4CYZoTPAswgSJCCUJUnAAoRHOAUOcATwbmVLWdGoH//PB8mnKqScAhsD0kYP3j/Yt5LPQe2KvcXmGvRHcDnpxfL2zOYJ1mFwrryWTz0advv1Ut4CJgf5uhDuDj5eUcAUoahrdY/56ebRWeraTjMt/00Sh3UDtjgHtQNHwcRGOC98BJEAEymycmYcWwOprTgcB6VZ5JK5TAJ+fXGLBm3FDAmn6oPPjR4rKCAoJCal2eAiQp2x0vxTPB3ALO2CRkwmDy5WohzBDwSEFKRwPbknEggCPB/imwrycgxX2NzoMCHhPkDwqYMr9tRcP5qNrMZHkVnOjRMWwLCcr8ohBVb1OMjxLwGCvjTikrsBOiA6fNyCrm8V1rP93iVPpwaE+gO0SsWmPiXB+jikdf6SizrT5qKasx5j8ABbHpFTx+vFXp9EnYQmLx02h1QTTrl6eDqxLnGjporxl3NL3agEvXdT0WmEost648sQOYAeJS9Q7bfUVoMGnjo4AZdUMQku50McDcMWcBPvr0SzbTAFDfvJqwLzgxwATnCgnp4wDl6Aa+Ax283gghmj+vj7feE2KBBRMW3FzOpLOADl0Isb5587h/U4gGvkt5v60Z1VLG8BhYjbzRwyQZemwAd6cCR5/XFWLYZRIMpX39AR0tjaGGiGzLVyhse5C9RKC6ai42ppWPKiBagOvaYk8lO7DajerabOZP46Lby5wKjw1HCRx7p9sVMOWGzb/vA1hwiWc6jm3MvQDTogQkiqIhJV0nBQBTU+3okKCFDy9WwferkHjtxib7t3xIUQtHxnIwtx4mpg26/HfwVNVDb4oI9RHmx5WGelRVlrtiw43zboCLaxv46AZeB3IlTkwouebTr1y2NjSpHz68WNFjHvupy3q8TFn3Hos2IAk4Ju5dCo8B3wP7VPr/FGaKiG+T+v+TQqIrOqMTL1VdWV1DdmcbO8KXBz6esmYWYKPwDL5b5FA1a0hwapHiom0r/cKaoqr+27/XcrS5UwSMbQAAAABJRU5ErkJggg==)](https://deepwiki.com/kaspanet/rusty-kaspa)
 <!-- DeepWiki badge generated by https://deepwiki.ryoppippi.com/ -->
-<h1>Kaspa On Rust</h1>
+<h1>Kaspa on Rust</h1>
 
 Welcome to the Rust-based implementation of the Kaspa full-node and its ancillary libraries. The contained node release serves as a drop-in replacement to the established <a href="https://github.com/kaspanet/kaspad">Golang node</a> and to date is the recommended node software for the Kaspa network, introducing developers to the possibilities of Rust in the Kaspa network's context.
 
@@ -158,6 +158,52 @@ To build WASM on MacOS you need to install `llvm` from homebrew (at the time of
 
  </details>
 
+ <details>
+ <summary> Building with Docker </summary>
+
+  You can build the project using Docker in two ways: a simple single-architecture build, or a multi-architecture build using the provided script.
+
+  #### 1. Simple Docker Build
+
+  To build for your current architecture (e.g., `linux/amd64`):
+
+  ```sh
+  docker build -f docker/Dockerfile.kaspad -t kaspad:latest .
+  ```
+
+  Replace `Dockerfile.kaspad` with the appropriate Dockerfile for your target (`kaspad`, `kaspa-wallet`, `rothschild`, or `simpa`).
+
+  #### 2. Multi-Architecture Build
+
+  To build images for multiple architectures (e.g., `linux/amd64` and `linux/arm64`) and optionally push them to a registry, use the `build-docker-multi-arch.sh` script:
+
+  ```sh
+  ./build-docker-multi-arch.sh --tag <tag> --artifact <artifact> [--arches "<arches>"] [--push]
+  ```
+
+  - `--tag <tag>`: **(required)** The Docker image tag to use.
+  - `--artifact <artifact>`: The build target/artifact (default: `kaspad`). Must match the Dockerfile name, e.g., `kaspad` for `Dockerfile.kaspad`.
+  - `--arches "<arches>"`: Space-separated list of architectures (default: `"linux/amd64 linux/arm64"`).
+  - `--push`: If specified, the built images will be pushed to your Docker registry.
+
+  **Examples:**
+
+  Build and push a multi-arch image for `kaspad`:
+
+  ```sh
+  ./build-docker-multi-arch.sh --tag myrepo/kaspad:latest --artifact kaspad --push
+  ```
+
+  Build a multi-arch image for `kaspa-wallet` without pushing:
+
+  ```sh
+  ./build-docker-multi-arch.sh --tag kaspa-wallet:test --artifact kaspa-wallet
+  ```
+
+  **Note:**  
+  In order to use `build-docker-multi-arch.sh`, you need Docker with Buildx enabled.
+ </details>
+
   <details>
 
   <summary>Building WASM32 SDK</summary>
@@ -253,7 +299,7 @@ Start the DevNet node with the following command:
 cargo run --bin kaspad -- --devnet --enable-unsynced-mining --rpclisten=127.0.0.1 --rpclisten-borsh=127.0.0.1 --utxoindex
 ```
 * `enable-unsynced-mining` is required when the network isn't synchronized, which is the case on the first launch
-* `uxtoindex` is required to broadcast mined blocks on this node
+* `uxtoindex` enables the UTXO index, which is necessary for wallet functionality.
 * `rpclisten-borsh` and `rpclisten-borsh` are likely to be required by mining softwares
 
 note: it will take a bit of time for difficulty to adjust, so you may need to wait a bit before you see blocks being mined consistently.

README.md

@@ -0,0 +1,83 @@
+#!/bin/sh
+
+set -e
+
+# Parse command line arguments for --tag and --repo
+ARCHES="linux/amd64 linux/arm64"
+ARTIFACT="kaspad"
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --tag)
+      shift
+      TAG="$1"
+      ;;
+    --arches)
+      shift
+      ARCHES="$1"
+      ;;
+    --push)
+      PUSH="push"
+      ;;
+    --artifact)
+      shift
+      ARTIFACT="$1"
+      ;;
+    --help|-h)
+      echo "Usage: $0 --tag <tag> --artifact <artifact> [--arches <arches>] [--push]"
+      echo ""
+      echo "  --tag <tag>         Docker image tag (required)"
+      echo "  --artifact <name>   Build target/artifact (default: \"$ARTIFACT\")"
+      echo "  --arches <arches>   Space-separated list of architectures (default: \"$ARCHES\")"
+      echo "  --push              Push the built images"
+      echo "  --help, -h          Show this help message"
+      exit 0
+      ;;
+    *)
+      break
+      ;;
+  esac
+  shift
+done
+
+if [ -z "$TAG" ]; then
+  echo "Error: --tag argument is required"
+  exit 1
+fi
+
+BUILD_DIR="$(dirname $0)"
+docker=docker
+id -nG $USER | grep -qw docker || docker="sudo $docker"
+
+multi_arch_build() {
+  echo
+  echo "===================================================="
+  echo " Running build for $1"
+  echo "===================================================="
+  dockerRepo="${DOCKER_REPO_PREFIX}-$1"
+  dockerRepoArgs=
+
+  if [ "$PUSH" = "push" ]; then
+    dockerRepoArgs="$dockerRepoArgs --push"
+  fi
+
+  dockerRepoArgs="$dockerRepoArgs --tag $TAG"
+  dockerRepoArgs="$dockerRepoArgs -f docker/Dockerfile.$1"
+
+  $docker buildx build --platform=$(echo $ARCHES | sed 's/ /,/g') $dockerRepoArgs \
+    --tag $TAG "$BUILD_DIR"
+  echo "===================================================="
+  echo " Completed build for $1"
+  echo "===================================================="
+}
+
+echo
+echo "===================================================="
+echo " Setup multi arch build ($ARCHES)"
+echo "===================================================="
+$docker buildx create --name mybuilder \
+--driver docker-container \
+--node mybuilder0 \
+--use --bootstrap
+$docker buildx create --name=mybuilder --append --node=mybuilder0 --platform=$(echo $ARCHES | sed 's/ /,/g') --bootstrap --use
+echo "SUCCESS - doing multi arch build"
+multi_arch_build $ARTIFACT

build-docker-multi-arch.sh

@@ -378,6 +378,10 @@ impl ConsensusSessionOwned {
         self.clone().spawn_blocking(move |c| c.get_block(hash)).await
     }
 
+    pub async fn async_get_block_body(&self, hash: Hash) -> ConsensusResult<Arc<Vec<Transaction>>> {
+        self.clone().spawn_blocking(move |c| c.get_block_body(hash)).await
+    }
+
     pub async fn async_get_block_even_if_header_only(&self, hash: Hash) -> ConsensusResult<Block> {
         self.clone().spawn_blocking(move |c| c.get_block_even_if_header_only(hash)).await
     }

components/consensusmanager/src/session.rs

@@ -305,6 +305,10 @@ pub trait ConsensusApi: Send + Sync {
         unimplemented!()
     }
 
+    fn get_block_body(&self, hash: Hash) -> ConsensusResult<Arc<Vec<Transaction>>> {
+        unimplemented!()
+    }
+
     fn get_block_even_if_header_only(&self, hash: Hash) -> ConsensusResult<Block> {
         unimplemented!()
     }

consensus/core/src/api/mod.rs

@@ -17,7 +17,7 @@ mod tests {
 
     #[test]
     fn merkle_root_test() {
-        let txs = vec![
+        let txs = [
             Transaction::new(
                 0,
                 vec![],

consensus/core/src/merkle.rs

@@ -1077,6 +1077,17 @@ impl ConsensusApi for Consensus {
         }
     }
 
+    fn get_block_body(&self, hash: Hash) -> ConsensusResult<Arc<Vec<Transaction>>> {
+        if match self.statuses_store.read().get(hash).unwrap_option() {
+            Some(status) => !status.has_block_body(),
+            None => true,
+        } {
+            return Err(ConsensusError::BlockNotFound(hash));
+        }
+
+        self.block_transactions_store.get(hash).unwrap_option().ok_or(ConsensusError::BlockNotFound(hash))
+    }
+
     fn get_block_even_if_header_only(&self, hash: Hash) -> ConsensusResult<Block> {
         let Some(status) = self.statuses_store.read().get(hash).unwrap_option().filter(|&status| status.has_block_header()) else {
             return Err(ConsensusError::HeaderNotFound(hash));

consensus/src/consensus/mod.rs

@@ -10,6 +10,7 @@ license.workspace = true
 repository.workspace = true
 
 [features]
+default = ["keccak?/asm"]
 no-asm = ["keccak"]
 
 [dependencies]
@@ -25,7 +26,7 @@ sha2.workspace = true
 wasm-bindgen.workspace = true
 workflow-wasm.workspace = true
 
-[target.'cfg(any(target_os = "windows", not(target_arch = "x86_64")))'.dependencies]
+[target.'cfg(not(target_arch = "x86_64"))'.dependencies]
 keccak.workspace = true
 
 [dev-dependencies]