Merge pull request #2037 from mintlayer/allow_disabling_ledger__fix_dockerfiles

Allow disabling ledger support, fix dockerfiles

Author: ImplOfAnImpl

Cargo.toml

@@ -335,12 +335,6 @@ overflow-checks = true
 [profile.test.package.script]
 opt-level = 2
 
-[features]
-tokio-console = []
-trezor = []
-ledger = []
-default = ["trezor", "ledger"]
-
 [patch.crates-io]
 # Using fontconfig-parser v0.5.8 completely breaks UI in node-gui on Linux - most of the text disappears and the few
 # characters that remain have broken spacing, so we force the usage of v0.5.7 via "patch".

build-tools/docker/Dockerfile.builder

@@ -11,7 +11,7 @@
 
 # Note: the base image here doesn't really matter, we just use the same one as in the "builder"
 # stage below.
-FROM rust:bookworm as source
+FROM rust:bookworm AS source
 COPY . /src
 RUN rm -r /src/build-tools
 
@@ -24,7 +24,9 @@ FROM rust:bookworm AS builder
 
 WORKDIR /usr/src/
 
-RUN apt-get update && apt-get install -y ca-certificates && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+    apt-get install -y ca-certificates libdbus-1-dev libusb-1.0-0-dev && \
+    rm -rf /var/lib/apt/lists/*
 
 COPY --from=source /src/ /usr/src/
 

build-tools/docker/Dockerfile.runner-base

@@ -2,7 +2,9 @@
 # in Dockerfile.builder.
 FROM debian:bookworm-slim
 
-RUN apt-get update && apt-get install -y gosu && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && \
+    apt-get install -y gosu libdbus-1-3 libusb-1.0-0 && \
+    rm -rf /var/lib/apt/lists/*
 
 WORKDIR /home/mintlayer
 

build-tools/p2p-test/Dockerfile

@@ -1,10 +1,9 @@
-FROM rust:1.75
-
+FROM rust:latest
 WORKDIR /src/
 
 RUN apt-get update && \
     apt-get install -y \
-    ca-certificates \
+    ca-certificates libdbus-1-dev libusb-1.0-0-dev \
     nmap procps net-tools iputils-ping dnsutils \
     && rm -rf /var/lib/apt/lists/*
 

build-tools/staking-test/.env

@@ -24,22 +24,22 @@ COMMON_NODE_DAEMON_ARGS="--create-datadir-if-missing=true $CHAIN_TYPE --rpc-bind
 
 COMMON_WALLET_RPC_DAEMON_ARGS="$CHAIN_TYPE --rpc-bind-address=0.0.0.0:$WALLET_RPC_INTERNAL_PORT --rpc-username=$WALLET_RPC_USER --rpc-password=$WALLET_RPC_PWD --node-rpc-username=$NODE_RPC_USER --node-rpc-password=$NODE_RPC_PWD $COMMON_ARGS"
 
-NODE_00_RPC_HOST_PORT=40000
-NODE_01_RPC_HOST_PORT=40001
-NODE_02_RPC_HOST_PORT=40002
-NODE_03_RPC_HOST_PORT=40003
-NODE_04_RPC_HOST_PORT=40004
-NODE_05_RPC_HOST_PORT=40005
-NODE_06_RPC_HOST_PORT=40006
-NODE_07_RPC_HOST_PORT=40007
-NODE_08_RPC_HOST_PORT=40008
-
-WALLET_00_RPC_HOST_PORT=40100
-WALLET_01_RPC_HOST_PORT=40101
-WALLET_02_RPC_HOST_PORT=40102
-WALLET_03_RPC_HOST_PORT=40103
-WALLET_04_RPC_HOST_PORT=40104
-WALLET_05_RPC_HOST_PORT=40105
-WALLET_06_RPC_HOST_PORT=40106
-WALLET_07_RPC_HOST_PORT=40107
-WALLET_08_RPC_HOST_PORT=40108
+NODE_00_RPC_HOST_PORT=40100
+NODE_01_RPC_HOST_PORT=40101
+NODE_02_RPC_HOST_PORT=40102
+NODE_03_RPC_HOST_PORT=40103
+NODE_04_RPC_HOST_PORT=40104
+NODE_05_RPC_HOST_PORT=40105
+NODE_06_RPC_HOST_PORT=40106
+NODE_07_RPC_HOST_PORT=40107
+NODE_08_RPC_HOST_PORT=40108
+
+WALLET_00_RPC_HOST_PORT=40200
+WALLET_01_RPC_HOST_PORT=40201
+WALLET_02_RPC_HOST_PORT=40202
+WALLET_03_RPC_HOST_PORT=40203
+WALLET_04_RPC_HOST_PORT=40204
+WALLET_05_RPC_HOST_PORT=40205
+WALLET_06_RPC_HOST_PORT=40206
+WALLET_07_RPC_HOST_PORT=40207
+WALLET_08_RPC_HOST_PORT=40208

build-tools/staking-test/Dockerfile

@@ -1,13 +1,12 @@
 ARG CARGO_TARGET_DIR=/src/target
-ARG RUST_VER=1.78
 
 # Use a separate "source" stage so that build-tools is not copied into the builder image,
 # while still not excluding it from the build context (it's needed to copy node_runner.sh below).
-FROM rust:$RUST_VER as source
+FROM rust:bookworm AS source
 COPY . /src
 RUN rm -r /src/build-tools
 
-FROM rust:$RUST_VER as builder
+FROM rust:bookworm AS builder
 ARG CARGO_TARGET_DIR
 
 WORKDIR /src/
@@ -20,14 +19,18 @@ ARG NUM_JOBS=16
 # directory specified in their .cargo/config.toml).
 ENV CARGO_TARGET_DIR=$CARGO_TARGET_DIR
 
+RUN apt-get update && \
+    apt-get install -y libdbus-1-dev libusb-1.0-0-dev && \
+    rm -rf /var/lib/apt/lists/*
+
 RUN cargo build --release -j${NUM_JOBS} --bin node-daemon --bin wallet-cli --bin wallet-rpc-daemon
 
 FROM debian:bookworm-slim
 ARG CARGO_TARGET_DIR
 
 RUN apt-get update && \
-    apt-get install -y dnsutils \
-    && rm -rf /var/lib/apt/lists/*
+    apt-get install -y dnsutils libdbus-1-3 libusb-1.0-0 && \
+    rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /workdir
 WORKDIR /workdir

build-tools/staking-test/common.py

@@ -46,8 +46,8 @@
 # Note: node index will be added to each of these numbers to form the actual port number,
 # so make sure the ranges don't overlap.
 # These values are also hard-coded in the .env file.
-NODE_RPC_PORT_BASE = 40000
-WALLET_RPC_PORT_BASE = 40100
+NODE_RPC_PORT_BASE = 40100
+WALLET_RPC_PORT_BASE = 40200
 
 # RPC username and password for node-daemon and wallet-rpc-daemon".
 # These values are also hard-coded in the .env file.

build-tools/staking-test/init_and_start_staking.py

@@ -109,7 +109,10 @@ def create_pool_and_delegate(self, amount, portion_to_pledge):
             pledge_amount = MIN_POOL_PLEDGE
 
         response = self.wallet.staking_create_pool(
-            0, { "atoms": f"{pledge_amount}" }, { "atoms": "0" }, f"{margin_ratio_per_thousand}", self.address, { "in_top_x_mb" : None })
+            0, { "atoms": f"{pledge_amount}" }, { "atoms": "0" }, f"{margin_ratio_per_thousand}",
+            self.address, None, None, { "in_top_x_mb" : None }
+        )
+
         tx_id = response["tx_id"]
         tx_ids.append(tx_id)
 

node-daemon/Cargo.toml

@@ -19,3 +19,6 @@ rpc-description = { path = "../rpc/description" }
 
 assert_cmd.workspace = true
 expect-test.workspace = true
+
+[features]
+tokio-console = ["utils/tokio-console"]

node-gui/Cargo.toml

@@ -39,6 +39,7 @@ tokio.workspace = true
 winres = "0.1"
 
 [features]
+tokio-console = ["utils/tokio-console"]
 trezor = [
   "wallet-controller/trezor",
   "wallet-types/trezor",