Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
- `create_order`, `conclude_order`, `fill_order`, `freeze_order` were renamed to
`order_create`, `order_conclude`, `order_fill`, `order_freeze`.

- The format of `PartiallySignedTransaction was changed again.
- The format of `PartiallySignedTransaction` was changed again.

- Node RPC:
- The result of `chainstate_order_info` now also indicates whether the order is frozen.
Expand Down Expand Up @@ -58,6 +58,10 @@ The format is loosely based on [Keep a Changelog](https://keepachangelog.com/en/
- Parameters and/or returned values having the "plain" `Destination` type were incorrectly
designated as "bech32 string", while in reality they are "hexified destination".

- General
- Fixed a bug that could lead to indefinite stalling of the node during initial sync when there
are many peers and the host machine is slow.

## [1.2.0] - 2025-10-27

### Changed
Expand Down
16 changes: 7 additions & 9 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 8 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,9 @@ testing_logger = "0.1"
thiserror = "1.0"
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["registry", "env-filter", "json"] }
tokio = { version = "1.27", default-features = false }
# Note: we use an unreleased version of Tokio, because we need a certain bugfix, see the `[patch.crates-io]`
# section for additional details.
tokio = { git = "https://github.com/tokio-rs/tokio", rev = "0d6c7af3e43457350bdc03a6dbcafa276fab7352", default-features = false }
tokio-socks = "0.5"
tokio-stream = "0.1"
tokio-util = { version = "0.7", default-features = false }
Expand Down Expand Up @@ -324,3 +326,8 @@ default = ["trezor"]
# is fontconfig-parser <- fontdb <- cosmic-text <- various "iced" crates.
# TODO: investigate this further.
fontconfig-parser = { git = "https://github.com/Riey/fontconfig-parser", rev = "f7d13a779e6ee282ce75acbc00a1270c0350e0c2" }

# We need this PR - https://github.com/tokio-rs/tokio/pull/7879 - to fix potential indefinite stalling of the chainstate
# subsystem (reproducible on a slow machine during initial sync with 30+ connected peers).
# The PR was merged after 1.49, so it should probably be part of 1.50 when it comes out.
tokio = { git = "https://github.com/tokio-rs/tokio", rev = "0d6c7af3e43457350bdc03a6dbcafa276fab7352" }
1 change: 1 addition & 0 deletions deny.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[sources.allow-org]
github = [
"mintlayer", # allow any code from mintlayer's github
"tokio-rs", # we have to use an unreleased version of tokio at this moment
]

[licenses]
Expand Down
7 changes: 6 additions & 1 deletion do_checks.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@ PYTHON=$(which python || which python3)

cd "$SCRIPT_DIR"

echo "Running cargo fmt"
cargo fmt --check -- --config newline_style=Unix

# Install cargo deny first with: cargo install cargo-deny.
# Note: "--allow duplicate" silences the warning "found x duplicate entries for crate y".
echo "Running cargo deny"
cargo deny check --allow duplicate --hide-inclusion-graph

echo "Running cargo vet"
cargo vet check --locked

CLIPPY_VERSION_RESPONSE=$(cargo clippy --version)
Expand Down Expand Up @@ -46,6 +48,7 @@ fi
# replaced with `x.is_multiple_of(2)`, which is a questionable improvement.
# * "let_and_return" is disabled because having `let` before returning can be useful at least
# as a potential place for a breakpoint.
echo "Running clippy"
EXTRA_ARGS=()
if [[ $CLIPPY_VERSION -ge 1089 ]]; then
EXTRA_ARGS+=(-A clippy::infallible_try_from)
Expand Down Expand Up @@ -79,7 +82,9 @@ cargo clippy --all-features --workspace --lib --bins --examples -- \
-D clippy::fallible_impl_from \
-D clippy::string_slice

echo "Running codecheck.py"
"$PYTHON" "build-tools/codecheck/codecheck.py"

# Ensure that wasm documentation is up-to-date
echo "Checking WASM documentation"
cargo run -p wasm-doc-gen -- -o wasm-wrappers/WASM-API.md --check
6 changes: 3 additions & 3 deletions subsystem/src/calls/blocking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ use utils::shallow_clone::ShallowClone;

/// Blocking version of [Handle].
///
/// This should be used sparingly as blocking calls induce non-trivial overhead. The call takes up
/// a thread in the runtime thread pool. If there is not enough threads for all simultaneous
/// blocking calls, a new one is spawned.
/// The implementation is based on `tokio::task::block_in_place`, which hands off existing tasks
/// from the current thread to another one (via `spawn_blocking`) and then runs the provided
/// blocking closure on the current thread.
pub struct BlockingHandle<T: ?Sized>(Handle<T>);

impl<T: ?Sized> Clone for BlockingHandle<T> {
Expand Down
80 changes: 15 additions & 65 deletions supply-chain/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,12 @@ audit-as-crates-io = true
[policy.lmdb-rkv-sys]
audit-as-crates-io = false

[policy.tokio]
audit-as-crates-io = true

[policy.tokio-macros]
audit-as-crates-io = true

[policy.trezor-client]
audit-as-crates-io = false

Expand Down Expand Up @@ -132,10 +138,6 @@ criteria = "safe-to-deploy"
version = "0.5.1"
criteria = "safe-to-deploy"

[[exemptions.block2]]
version = "0.6.2"
criteria = "safe-to-deploy"

[[exemptions.borsh-derive]]
version = "1.5.7"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -558,7 +560,7 @@ criteria = "safe-to-deploy"

[[exemptions.iri-string]]
version = "0.7.9"
criteria = "safe-to-deploy"
criteria = "safe-to-run"

[[exemptions.jni-sys]]
version = "0.3.0"
Expand Down Expand Up @@ -700,10 +702,6 @@ criteria = "safe-to-deploy"
version = "0.29.0"
criteria = "safe-to-deploy"

[[exemptions.nu-ansi-term]]
version = "0.50.3"
criteria = "safe-to-deploy"

[[exemptions.num-format]]
version = "0.4.4"
criteria = "safe-to-deploy"
Expand All @@ -728,10 +726,6 @@ criteria = "safe-to-deploy"
version = "0.5.2"
criteria = "safe-to-deploy"

[[exemptions.objc2]]
version = "0.6.3"
criteria = "safe-to-deploy"

[[exemptions.objc2-app-kit]]
version = "0.2.2"
criteria = "safe-to-deploy"
Expand All @@ -752,10 +746,6 @@ criteria = "safe-to-deploy"
version = "0.2.2"
criteria = "safe-to-deploy"

[[exemptions.objc2-core-foundation]]
version = "0.3.2"
criteria = "safe-to-deploy"

[[exemptions.objc2-core-image]]
version = "0.2.2"
criteria = "safe-to-deploy"
Expand All @@ -764,18 +754,10 @@ criteria = "safe-to-deploy"
version = "0.2.2"
criteria = "safe-to-deploy"

[[exemptions.objc2-encode]]
version = "4.1.0"
criteria = "safe-to-deploy"

[[exemptions.objc2-foundation]]
version = "0.2.2"
criteria = "safe-to-deploy"

[[exemptions.objc2-foundation]]
version = "0.3.2"
criteria = "safe-to-deploy"

[[exemptions.objc2-link-presentation]]
version = "0.2.2"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -809,13 +791,9 @@ version = "0.1.2"
criteria = "safe-to-deploy"

[[exemptions.oneshot]]
version = "0.1.11"
version = "0.1.13"
criteria = "safe-to-deploy"

[[exemptions.oorandom]]
version = "11.1.5"
criteria = "safe-to-run"

[[exemptions.orbclient]]
version = "0.3.48"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -864,10 +842,6 @@ criteria = "safe-to-deploy"
version = "0.2.4"
criteria = "safe-to-deploy"

[[exemptions.pkg-config]]
version = "0.3.32"
criteria = "safe-to-deploy"

[[exemptions.plotters]]
version = "0.3.7"
criteria = "safe-to-run"
Expand Down Expand Up @@ -1068,14 +1042,6 @@ criteria = "safe-to-deploy"
version = "2.1.0"
criteria = "safe-to-deploy"

[[exemptions.rustls-pemfile]]
version = "1.0.4"
criteria = "safe-to-deploy"

[[exemptions.rustls-pemfile]]
version = "2.2.0"
criteria = "safe-to-deploy"

[[exemptions.rusty-fork]]
version = "0.3.1"
criteria = "safe-to-deploy"
Expand All @@ -1092,10 +1058,6 @@ criteria = "safe-to-run"
version = "0.1.28"
criteria = "safe-to-deploy"

[[exemptions.schemars]]
version = "0.9.0"
criteria = "safe-to-deploy"

[[exemptions.schemars]]
version = "1.0.4"
criteria = "safe-to-deploy"
Expand All @@ -1104,10 +1066,6 @@ criteria = "safe-to-deploy"
version = "0.11.5"
criteria = "safe-to-deploy"

[[exemptions.sct]]
version = "0.7.1"
criteria = "safe-to-deploy"

[[exemptions.sctk-adwaita]]
version = "0.10.1"
criteria = "safe-to-deploy"
Expand All @@ -1122,7 +1080,7 @@ criteria = "safe-to-deploy"

[[exemptions.security-framework]]
version = "2.11.1"
criteria = "safe-to-deploy"
criteria = "safe-to-run"

[[exemptions.security-framework]]
version = "3.5.1"
Expand Down Expand Up @@ -1240,10 +1198,6 @@ criteria = "safe-to-deploy"
version = "0.1.19"
criteria = "safe-to-deploy"

[[exemptions.sync_wrapper]]
version = "0.1.2"
criteria = "safe-to-run"

[[exemptions.sync_wrapper]]
version = "1.0.2"
criteria = "safe-to-deploy"
Expand Down Expand Up @@ -1284,16 +1238,16 @@ criteria = "safe-to-deploy"
version = "1.10.0"
criteria = "safe-to-deploy"

[[exemptions.tokio-socks]]
version = "0.5.2"
[[exemptions.tokio]]
version = "1.49.0@git:0d6c7af3e43457350bdc03a6dbcafa276fab7352"
criteria = "safe-to-deploy"

[[exemptions.tower]]
version = "0.4.13"
[[exemptions.tokio-macros]]
version = "2.6.0@git:0d6c7af3e43457350bdc03a6dbcafa276fab7352"
criteria = "safe-to-deploy"

[[exemptions.tower-http]]
version = "0.4.4"
[[exemptions.tokio-socks]]
version = "0.5.2"
criteria = "safe-to-deploy"

[[exemptions.tower-http]]
Expand Down Expand Up @@ -1488,10 +1442,6 @@ criteria = "safe-to-deploy"
version = "0.10.1"
criteria = "safe-to-deploy"

[[exemptions.winreg]]
version = "0.50.0"
criteria = "safe-to-run"

[[exemptions.winres]]
version = "0.1.12"
criteria = "safe-to-deploy"
Expand Down
Loading