Some bridge-related changes#2048
Merged
ImplOfAnImpl merged 4 commits intomasterfrom Apr 28, 2026
Merged
Conversation
…s are not enabled
…" features are not enabled
e851b0b to
7fa80e8
Compare
OBorce
approved these changes
Apr 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fix project build when either one or both of "trezor"/"ledger" features are disabled.
In the bridge I need to be able to build
wallet-rpc-clientwithout those features, otherwise it would require the particular versions ofparity-scale-codecandledger-protothat the core uses to be explicitly specified in the bridge as well (and it's not something the bridge should know about). But for consistency I decided to fix it for the entire project, including the case when the entire workspace is built, e.g.cargo build --no-default-features --workspace.The end result is not super nice, as I had to add
default-features = falseto all dependencies that havedefault = ["trezor", "ledger"]in their[features]- without it the features would be enabled for some of the crates due to cargo's feature unification. E.g. ifapi-blockchain-scanner-daemonhad simplynode-comm = { path = "../../wallet/wallet-node-client" }, then duringcargo build --no-default-features --workspaceboth features would be enabled forwallet-node-client, which would propagate them towallet-types, but other packages, likewalletitself, would still be built without it, producing compilation errors.For consistency I also added "trezor"/"ledger" features and
default = ["trezor", "ledger"]totest/Cargo.toml(functional tests don't care about those features, but potentially they could).But perhaps the better approach would be to remove
default = ["trezor", "ledger"]from all libraries and only have it in the apps. Though I'm not sure.In
utils/src/fixed_hash.rsthe originalfixed_hashentities are now exposed via a submodule, so that the bridge doesn't need a direct dependency onfixed_hash.