feat(scripts): consolidate external deps in `cargo_sort.py` #9637

muXxer · 2025-12-16T09:10:35Z

Description of change

This PR adds a new "consolidation mode" to cargo_sort.py, which will analyze all dependencies across the workspace and:

If an external dependency is used by multiple crates: adds it to root [workspace.dependencies] and updates crates to use package.workspace = true
If an external dependency is used by only one crate: removes it from root and gives the crate the full version spec

How the change has been tested

Basic tests (linting, compilation, formatting, unit/integration tests)
Patch-specific tests (correctness, functionality coverage)
I have added tests that prove my fix is effective or that my feature works
I have checked that new and existing unit tests pass locally with my changes

vercel · 2025-12-16T09:10:39Z

The latest updates on your projects. Learn more about Vercel for GitHub.

6 Skipped Deployments

Project	Deployment	Review	Updated (UTC)
apps-backend	Ignored	Preview	Jan 5, 2026 7:15pm
apps-ui-kit	Ignored	Preview	Jan 5, 2026 7:15pm
iota-evm-bridge	Ignored	Preview	Jan 5, 2026 7:15pm
iota-multisig-toolkit	Ignored	Preview	Jan 5, 2026 7:15pm
rebased-explorer	Ignored	Preview	Jan 5, 2026 7:15pm
wallet-dashboard	Ignored	Preview	Jan 5, 2026 7:15pm

semenov-vladyslav

default-features = false in a member crate dependency has no effect and may be misleading. Default features are enabled/disabled in workspace manifest.

For example, if two member crates have a common dependency, but one crate needs default-features = false and another uses default features, then the default features must be disabled in workspace manifest (eg. [workspace.dependencies] dep = { "0.1", default-features = false }, and enabled in member crate that needs them (eg. dep = { workspace = true, default-features = true }. The other way around will not work.

This should be another check by cargo_sort.py probably.

crates/iota-core/Cargo.toml

crates/iota-genesis-builder/Cargo.toml

DaughterOfMars · 2026-01-05T10:21:21Z

Nice!!!

semenov-vladyslav · 2026-01-06T11:59:31Z

crates/iota-genesis-builder/Cargo.toml

 flate2.workspace = true
 itertools.workspace = true
-packable = { version = "0.8", default-features = false, features = ["io"] }
+packable = { workspace = true, features = ["io"] }


Suggested change

packable = { workspace = true, features = ["io"] }

packable.workspace = true

"io" feature is enabled in the root.

semenov-vladyslav · 2026-01-06T11:59:51Z

crates/iota-types/Cargo.toml

 num-traits = "0.2.18"
 once_cell.workspace = true
-packable = { version = "0.8", default-features = false, features = ["io"] }
+packable = { workspace = true, features = ["io"] }


Suggested change

packable = { workspace = true, features = ["io"] }

packable.workspace = true

"io" feature is enabled in the root.

semenov-vladyslav · 2026-01-06T12:11:39Z

crates/iota-types/Cargo.toml

 lru.workspace = true
 nonempty.workspace = true
-num-bigint = { version = "0.4", default-features = false, features = ["rand"] }
+num-bigint = { workspace = true, features = ["rand"] }


Is "rand" feature really used? I haven't found a place where we generate random BigInts.

semenov-vladyslav · 2026-01-06T12:23:44Z

iota-execution/latest/iota-move-natives/Cargo.toml

 better_any.workspace = true
 fastcrypto.workspace = true
-fastcrypto-vdf.workspace = true
+fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "69d496c71fb37e3d22fe85e5bbfd4256d61422b9", features = ["experimental"] }


Wouldn't it make sense to keep fastcrypto-vdf dependency in the root Cargo.toml close to other fastcrypto deps that also have the same rev? Otherwise fastcrypto deps might go out of sync.

semenov-vladyslav · 2026-01-06T12:31:54Z

external-crates/move/crates/move-ir-to-bytecode/Cargo.toml

 codespan-reporting.workspace = true
 log.workspace = true
-ouroboros.workspace = true
+ouroboros = "0.17.2"


Can we update it to "0.18" to avoid duplicates? ouroboros-0.18 is used in typed-store.

semenov-vladyslav · 2026-01-06T12:50:43Z

crates/iota-move-lsp/Cargo.toml

 [dependencies]
 # external dependencies
-clap = { version = "4.1.4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }


Suggested change

clap = { workspace = true, features = ["derive"] }

clap.workspace = true

"derive" feature is enabled in the root.

semenov-vladyslav · 2026-01-06T12:51:10Z

crates/iota-replay/Cargo.toml

 async-trait.workspace = true
 bcs.workspace = true
-clap = { version = "4.1.4", features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }


Suggested change

clap = { workspace = true, features = ["derive"] }

clap.workspace = true

"derive" feature is enabled in the root.

semenov-vladyslav · 2026-01-06T13:01:24Z

Cargo.toml

 tonic-prost-build = "0.14"
 tonic-rustls = "0.3.0"
-tower = { version = "0.4.12", features = ["full", "util", "timeout", "load-shed", "limit"] }
+tower = { version = "0.4.12", default-features = false, features = ["full", "util", "timeout", "load-shed", "limit"] }


Do we really need "full" feature? It enables everything, the other features including.

semenov-vladyslav · 2026-01-06T13:02:08Z

crates/iota-http/Cargo.toml

-tower = { version = "0.4", default-features = false, features = ["util"] }
-tracing = { version = "0.1" }
+tokio-util.workspace = true
+tower = { workspace = true, features = ["util"] }


Suggested change

tower = { workspace = true, features = ["util"] }

tower.workspace = true

"util" feature is enabled in the root.

semenov-vladyslav · 2026-01-06T13:09:07Z

scripts/cargo_sort/cargo_sort.py

+- If an external dependency is only used by one crate:
+  - Removes it from root Cargo.toml (if present)
+  - Ensures the crate has the full version spec
+"""


Maybe add a note how features are handled, it's not trivial after all.

muXxer requested review from a team, DaughterOfMars, Dr-Electron, alexsporn, msarcev and thibault-martinez as code owners December 16, 2025 09:10

github-actions bot added the ci Issues related to our CI pipeline label Dec 16, 2025

iota-ci added core-protocol node Issues related to the Core Node team labels Dec 16, 2025

semenov-vladyslav requested changes Dec 16, 2025

View reviewed changes

crates/iota-core/Cargo.toml Outdated Show resolved Hide resolved

crates/iota-genesis-builder/Cargo.toml Outdated Show resolved Hide resolved

muXxer added 5 commits January 5, 2026 19:11

feat(scripts): consolidate external deps in cargo_sort.py

9a5d564

chore(deps): consolidate deps via cargo_sort.py

32106b4

fix(script): handle default-features=false properly in cargo_sort.py

e647125

feat(scripts): add version conflict warning and --strict mode

64e84e0

fix(cargo): remove useless default-features

a04f638

muXxer force-pushed the feat/scripts-cargo-sort-consolidate-external-deps branch from 353dfa8 to a04f638 Compare January 5, 2026 18:11

feat(cargo): use workspace versions where possible

42975b5

muXxer force-pushed the feat/scripts-cargo-sort-consolidate-external-deps branch from 266b996 to 42975b5 Compare January 5, 2026 19:14

DaughterOfMars approved these changes Jan 6, 2026

View reviewed changes

semenov-vladyslav requested changes Jan 6, 2026

View reviewed changes

	packable = { workspace = true, features = ["io"] }
	packable.workspace = true

	clap = { workspace = true, features = ["derive"] }
	clap.workspace = true

	tower = { workspace = true, features = ["util"] }
	tower.workspace = true

feat(scripts): consolidate external deps in cargo_sort.py #9637

Are you sure you want to change the base?

feat(scripts): consolidate external deps in cargo_sort.py #9637

Conversation

muXxer commented Dec 16, 2025

Description of change

How the change has been tested

Uh oh!

vercel bot commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

semenov-vladyslav left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

DaughterOfMars commented Jan 5, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

feat(scripts): consolidate external deps in `cargo_sort.py` #9637

feat(scripts): consolidate external deps in `cargo_sort.py` #9637

vercel bot commented Dec 16, 2025 •

edited

Loading