Minor forgotten cleanup

Author: ImplOfAnImpl

build-tools/docker/build.py

@@ -1,7 +1,12 @@
-import toml
+import argparse
 import os
+import pathlib
 import subprocess
-import argparse
+import toml
+
+
+ROOT_DIR = pathlib.Path(__file__).resolve().parent.parent.parent
+ROOT_CARGO_TOML = ROOT_DIR.joinpath("Cargo.toml")
 
 
 def get_cargo_version(cargo_toml_path):
@@ -44,7 +49,7 @@ def build_docker_image(dockerfile_path, image_name, tags, num_jobs=None):
 
     try:
         # Run the command
-        subprocess.check_call(command, shell=True)
+        subprocess.check_call(command, shell=True, cwd=ROOT_DIR)
         print(f"Built {image_name} successfully (the tags are: {full_tags}).")
     except subprocess.CalledProcessError as error:
         print(f"Failed to build {image_name}: {error}")
@@ -121,7 +126,7 @@ def main():
     parser.add_argument('--local_tags', nargs='*', help='Additional tags to apply (these won\'t be pushed)', default=[])
     args = parser.parse_args()
 
-    version = args.version if args.version else get_cargo_version("Cargo.toml")
+    version = args.version if args.version else get_cargo_version(ROOT_CARGO_TOML)
     # Note: the CI currently takes the version from the release tag, so it always starts with "v",
     # but the version from Cargo.toml doesn't have this prefix.
     version = version.removeprefix("v")

build-tools/docker/example-mainnet/docker-compose.yml

@@ -65,6 +65,7 @@ services:
       - node-daemon
     environment:
       <<: *ml-common-env
+      ML_API_SCANNER_DAEMON_NETWORK: mainnet
       ML_API_SCANNER_DAEMON_POSTGRES_HOST: api-postgres-db
       ML_API_SCANNER_DAEMON_POSTGRES_USER: $API_SERVER_POSTGRES_USER
       ML_API_SCANNER_DAEMON_POSTGRES_PASSWORD: $API_SERVER_POSTGRES_PASSWORD
@@ -83,6 +84,7 @@ services:
       - node-daemon
     environment:
       <<: *ml-common-env
+      ML_API_WEB_SRV_NETWORK: mainnet
       ML_API_WEB_SRV_BIND_ADDRESS: 0.0.0.0:3000
       ML_API_WEB_SRV_POSTGRES_HOST: api-postgres-db
       ML_API_WEB_SRV_POSTGRES_USER: $API_SERVER_POSTGRES_USER

subsystem/src/calls/handle.rs

@@ -16,9 +16,9 @@
 //! Subsystem handle definitions (non-blocking versions)
 
 use futures::future::BoxFuture;
+use tracing::Instrument as _;
 
 use logging::log;
-use tracing::Instrument as _;
 use utils::shallow_clone::ShallowClone;
 
 use crate::{

wallet/wallet-cli-commands/src/lib.rs

@@ -994,8 +994,12 @@ pub enum WalletCommand {
         /// The starting height; normally, this will be the last height mentioned in
         /// the corresponding CHECKPOINTS_DATA array.
         start_height: BlockHeight,
-        /// The end (exclusive) height; normally, this will be some large number, which
-        /// is definitely bigger than the current best block height, e.g. a million.
+        /// The end (exclusive) height. For simplicity, you can set it to some large number
+        /// that is bigger than the current best block height, e.g. a million, in which case
+        /// the command will print checkpoints until the maximum possible height.
+        /// Note however that the last checkpoint that you put into CHECKPOINTS_DATA should
+        /// be at least 1000 below the current tip, to ensure that reorgs below that checkpoint
+        /// are no longer possible.
         end_height: BlockHeight,
         /// The step; in our current CHECKPOINTS_DATA arrays we use 500 as the step.
         step: NonZeroUsize,

wasm-wrappers/js-bindings-test/tests/test_input_commitments.ts

@@ -135,11 +135,11 @@ function test_impl(is_v1: boolean) {
     height = SIGHASH_INPUT_COMMITMENTS_V0_HEIGHT;
   };
 
-  const account_pubkey = make_default_account_privkey(
+  const account_privkey = make_default_account_privkey(
     MNEMONIC,
     Network.Testnet
   );
-  const receiving_privkey = make_receiving_address(account_pubkey, 0);
+  const receiving_privkey = make_receiving_address(account_privkey, 0);
 
   const produce_block_from_stake_output = encode_output_produce_block_from_stake(
     POOL_ID,