diff --git a/.github/workflows/code-check.yml b/.github/workflows/code-check.yml index 2cd143f44..92b2ec36f 100644 --- a/.github/workflows/code-check.yml +++ b/.github/workflows/code-check.yml @@ -30,7 +30,7 @@ jobs: command: fmt args: --all --check - name: Install taplo CLI - run: cargo install taplo-cli --locked --version 0.9.3 + run: cargo install taplo-cli --locked --version 0.10.0 - name: Run taplo lint run: taplo lint - name: Run taplo fmt diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 9f9b3d8d1..907753a54 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -23,7 +23,7 @@ repos: - -D - warnings - repo: https://github.com/ComPWA/taplo-pre-commit - rev: v0.9.3 + rev: v0.10.0 hooks: - id: taplo-format - id: taplo-lint diff --git a/Cargo.toml b/Cargo.toml index e4fa5b245..d2c4ed057 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,72 +83,72 @@ resolver = "2" [workspace.dependencies] # Internal -lb-api-service = { default-features = false, path = "./services/api", package = "logos-blockchain-api-service" } -lb-blend = { default-features = false, path = "./blend/core", package = "logos-blockchain-blend" } -lb-blend-crypto = { default-features = false, path = "./blend/crypto", package = "logos-blockchain-blend-crypto" } -lb-blend-message = { default-features = false, path = "./blend/message", package = "logos-blockchain-blend-message" } -lb-blend-network = { default-features = false, path = "./blend/network", package = "logos-blockchain-blend-network" } -lb-blend-proofs = { default-features = false, path = "./blend/proofs", package = "logos-blockchain-blend-proofs" } -lb-blend-scheduling = { default-features = false, path = "./blend/scheduling", package = "logos-blockchain-blend-scheduling" } -lb-blend-service = { default-features = false, path = "./services/blend", package = "logos-blockchain-blend-service" } -lb-bundler = { default-features = false, path = "./bundler", package = "logos-blockchain-bundler" } -lb-cfgsync = { default-features = false, path = "./testnet/cfgsync", package = "logos-blockchain-cfgsync" } -lb-chain-broadcast-service = { default-features = false, path = "./services/chain/broadcast-service", package = "logos-blockchain-chain-broadcast-service" } -lb-chain-leader-service = { default-features = false, path = "./services/chain/chain-leader", package = "logos-blockchain-chain-leader-service" } -lb-chain-network-service = { default-features = false, path = "./services/chain/chain-network", package = "logos-blockchain-chain-network-service" } -lb-chain-service = { default-features = false, path = "./services/chain/chain-service", package = "logos-blockchain-chain-service" } -lb-chain-service-common = { default-features = false, path = "./services/chain/chain-common", package = "logos-blockchain-chain-service-common" } -lb-circuits-prover = { default-features = false, path = "./zk/circuits/prover", package = "logos-blockchain-circuits-prover" } -lb-circuits-utils = { default-features = false, path = "./zk/circuits/utils", package = "logos-blockchain-circuits-utils" } -lb-circuits-verifier = { default-features = false, path = "./zk/circuits/verifier", package = "logos-blockchain-circuits-verifier" } -lb-cli = { default-features = false, path = "./cli", package = "logos-blockchain-cli" } -lb-common-http-client = { default-features = false, path = "./nodes/node/http-client", package = "logos-blockchain-common-http-client" } -lb-core = { default-features = false, path = "./core", package = "logos-blockchain-core" } -lb-cryptarchia-engine = { default-features = false, path = "./consensus/cryptarchia-engine", package = "logos-blockchain-cryptarchia-engine" } -lb-cryptarchia-sync = { default-features = false, path = "./consensus/cryptarchia-sync", package = "logos-blockchain-cryptarchia-sync" } -lb-da-dispersal-service = { default-features = false, path = "./services/data-availability/dispersal", package = "logos-blockchain-da-dispersal-service" } -lb-da-messages = { default-features = false, path = "./da/network/messages", package = "logos-blockchain-da-messages" } -lb-da-network-core = { default-features = false, path = "./da/network/core", package = "logos-blockchain-da-network-core" } -lb-da-network-service = { default-features = false, path = "./services/data-availability/network", package = "logos-blockchain-da-network-service" } -lb-da-sampling-service = { default-features = false, path = "./services/data-availability/sampling", package = "logos-blockchain-da-sampling-service" } -lb-da-verifier-service = { default-features = false, path = "./services/data-availability/verifier", package = "logos-blockchain-da-verifier-service" } -lb-demo-archiver = { default-features = false, path = "./testnet/l2-sequencer-archival-demo/archiver", package = "logos-blockchain-demo-archiver" } -lb-demo-sequencer = { default-features = false, path = "./testnet/l2-sequencer-archival-demo/sequencer", package = "logos-blockchain-demo-sequencer" } -lb-executor = { default-features = false, path = "./nodes/executor/binary", package = "logos-blockchain-executor" } -lb-executor-http-client = { default-features = false, path = "./nodes/executor/http-client", package = "logos-blockchain-executor-http-client" } -lb-groth16 = { default-features = false, path = "./zk/groth16", package = "logos-blockchain-groth16" } -lb-http-api-common = { default-features = false, path = "./nodes/api-common", package = "logos-blockchain-http-api-common" } -lb-key-management-system-keys = { default-features = false, path = "./kms/keys", package = "logos-blockchain-key-management-system-keys" } -lb-key-management-system-macros = { default-features = false, path = "./kms/macros", package = "logos-blockchain-key-management-system-macros" } -lb-key-management-system-service = { default-features = false, path = "./services/key-management-system", package = "logos-blockchain-key-management-system-service" } -lb-kzgrs = { default-features = false, path = "./da/kzgrs", package = "logos-blockchain-kzgrs" } -lb-kzgrs-backend = { default-features = false, path = "./da/kzgrs-backend", package = "logos-blockchain-kzgrs-backend" } -lb-ledger = { default-features = false, path = "./ledger", package = "logos-blockchain-ledger" } -lb-libp2p = { default-features = false, path = "./libp2p", package = "logos-blockchain-libp2p" } -lb-mmr = { default-features = false, path = "./mmr", package = "logos-blockchain-mmr" } -lb-network-service = { default-features = false, path = "./services/network", package = "logos-blockchain-network-service" } -lb-node = { default-features = false, path = "./nodes/node/binary", package = "logos-blockchain-node" } -lb-poc = { default-features = false, path = "./zk/proofs/poc", package = "logos-blockchain-poc" } -lb-pol = { default-features = false, path = "./zk/proofs/pol", package = "logos-blockchain-pol" } -lb-poq = { default-features = false, path = "./zk/proofs/poq", package = "logos-blockchain-poq" } -lb-poseidon2 = { default-features = false, path = "./zk/poseidon2", package = "logos-blockchain-poseidon2" } -lb-sdp-service = { default-features = false, path = "./services/sdp", package = "logos-blockchain-sdp-service" } -lb-services-utils = { default-features = false, path = "./services/utils", package = "logos-blockchain-services-utils" } -lb-storage-service = { default-features = false, path = "./services/storage", package = "logos-blockchain-storage-service" } -lb-subnetworks-assignations = { default-features = false, path = "./da/network/subnetworks-assignations", package = "logos-blockchain-subnetworks-assignations" } -lb-system-sig-service = { default-features = false, path = "./services/system-sig", package = "logos-blockchain-system-sig-service" } -lb-tests = { default-features = false, path = "./tests", package = "logos-blockchain-tests" } -lb-time-service = { default-features = false, path = "./services/time", package = "logos-blockchain-time-service" } -lb-tracing = { default-features = false, path = "./tracing", package = "logos-blockchain-tracing" } -lb-tracing-service = { default-features = false, path = "./services/tracing", package = "logos-blockchain-tracing-service" } -lb-tx-service = { default-features = false, path = "./services/tx-service", package = "logos-blockchain-tx-service" } -lb-utils = { default-features = false, path = "./utils", package = "logos-blockchain-utils" } -lb-utxotree = { default-features = false, path = "./utxotree", package = "logos-blockchain-utxotree" } -lb-wallet = { default-features = false, path = "./wallet", package = "logos-blockchain-wallet" } -lb-wallet-http-client = { default-features = false, path = "./wallet-http-client", package = "logos-blockchain-wallet-http-client" } -lb-wallet-service = { default-features = false, path = "./services/wallet", package = "logos-blockchain-wallet-service" } -lb-witness-generator = { default-features = false, path = "./zk/circuits/witness-generator", package = "logos-blockchain-witness-generator" } -lb-zksign = { default-features = false, path = "./zk/proofs/zksign", package = "logos-blockchain-zksign" } +lb-api-service = { default-features = false, package = "logos-blockchain-api-service", path = "./services/api" } +lb-blend = { default-features = false, package = "logos-blockchain-blend", path = "./blend/core" } +lb-blend-crypto = { default-features = false, package = "logos-blockchain-blend-crypto", path = "./blend/crypto" } +lb-blend-message = { default-features = false, package = "logos-blockchain-blend-message", path = "./blend/message" } +lb-blend-network = { default-features = false, package = "logos-blockchain-blend-network", path = "./blend/network" } +lb-blend-proofs = { default-features = false, package = "logos-blockchain-blend-proofs", path = "./blend/proofs" } +lb-blend-scheduling = { default-features = false, package = "logos-blockchain-blend-scheduling", path = "./blend/scheduling" } +lb-blend-service = { default-features = false, package = "logos-blockchain-blend-service", path = "./services/blend" } +lb-bundler = { default-features = false, package = "logos-blockchain-bundler", path = "./bundler" } +lb-cfgsync = { default-features = false, package = "logos-blockchain-cfgsync", path = "./testnet/cfgsync" } +lb-chain-broadcast-service = { default-features = false, package = "logos-blockchain-chain-broadcast-service", path = "./services/chain/broadcast-service" } +lb-chain-leader-service = { default-features = false, package = "logos-blockchain-chain-leader-service", path = "./services/chain/chain-leader" } +lb-chain-network-service = { default-features = false, package = "logos-blockchain-chain-network-service", path = "./services/chain/chain-network" } +lb-chain-service = { default-features = false, package = "logos-blockchain-chain-service", path = "./services/chain/chain-service" } +lb-chain-service-common = { default-features = false, package = "logos-blockchain-chain-service-common", path = "./services/chain/chain-common" } +lb-circuits-prover = { default-features = false, package = "logos-blockchain-circuits-prover", path = "./zk/circuits/prover" } +lb-circuits-utils = { default-features = false, package = "logos-blockchain-circuits-utils", path = "./zk/circuits/utils" } +lb-circuits-verifier = { default-features = false, package = "logos-blockchain-circuits-verifier", path = "./zk/circuits/verifier" } +lb-cli = { default-features = false, package = "logos-blockchain-cli", path = "./cli" } +lb-common-http-client = { default-features = false, package = "logos-blockchain-common-http-client", path = "./nodes/node/http-client" } +lb-core = { default-features = false, package = "logos-blockchain-core", path = "./core" } +lb-cryptarchia-engine = { default-features = false, package = "logos-blockchain-cryptarchia-engine", path = "./consensus/cryptarchia-engine" } +lb-cryptarchia-sync = { default-features = false, package = "logos-blockchain-cryptarchia-sync", path = "./consensus/cryptarchia-sync" } +lb-da-dispersal-service = { default-features = false, package = "logos-blockchain-da-dispersal-service", path = "./services/data-availability/dispersal" } +lb-da-messages = { default-features = false, package = "logos-blockchain-da-messages", path = "./da/network/messages" } +lb-da-network-core = { default-features = false, package = "logos-blockchain-da-network-core", path = "./da/network/core" } +lb-da-network-service = { default-features = false, package = "logos-blockchain-da-network-service", path = "./services/data-availability/network" } +lb-da-sampling-service = { default-features = false, package = "logos-blockchain-da-sampling-service", path = "./services/data-availability/sampling" } +lb-da-verifier-service = { default-features = false, package = "logos-blockchain-da-verifier-service", path = "./services/data-availability/verifier" } +lb-demo-archiver = { default-features = false, package = "logos-blockchain-demo-archiver", path = "./testnet/l2-sequencer-archival-demo/archiver" } +lb-demo-sequencer = { default-features = false, package = "logos-blockchain-demo-sequencer", path = "./testnet/l2-sequencer-archival-demo/sequencer" } +lb-executor = { default-features = false, package = "logos-blockchain-executor", path = "./nodes/executor/binary" } +lb-executor-http-client = { default-features = false, package = "logos-blockchain-executor-http-client", path = "./nodes/executor/http-client" } +lb-groth16 = { default-features = false, package = "logos-blockchain-groth16", path = "./zk/groth16" } +lb-http-api-common = { default-features = false, package = "logos-blockchain-http-api-common", path = "./nodes/api-common" } +lb-key-management-system-keys = { default-features = false, package = "logos-blockchain-key-management-system-keys", path = "./kms/keys" } +lb-key-management-system-macros = { default-features = false, package = "logos-blockchain-key-management-system-macros", path = "./kms/macros" } +lb-key-management-system-service = { default-features = false, package = "logos-blockchain-key-management-system-service", path = "./services/key-management-system" } +lb-kzgrs = { default-features = false, package = "logos-blockchain-kzgrs", path = "./da/kzgrs" } +lb-kzgrs-backend = { default-features = false, package = "logos-blockchain-kzgrs-backend", path = "./da/kzgrs-backend" } +lb-ledger = { default-features = false, package = "logos-blockchain-ledger", path = "./ledger" } +lb-libp2p = { default-features = false, package = "logos-blockchain-libp2p", path = "./libp2p" } +lb-mmr = { default-features = false, package = "logos-blockchain-mmr", path = "./mmr" } +lb-network-service = { default-features = false, package = "logos-blockchain-network-service", path = "./services/network" } +lb-node = { default-features = false, package = "logos-blockchain-node", path = "./nodes/node/binary" } +lb-poc = { default-features = false, package = "logos-blockchain-poc", path = "./zk/proofs/poc" } +lb-pol = { default-features = false, package = "logos-blockchain-pol", path = "./zk/proofs/pol" } +lb-poq = { default-features = false, package = "logos-blockchain-poq", path = "./zk/proofs/poq" } +lb-poseidon2 = { default-features = false, package = "logos-blockchain-poseidon2", path = "./zk/poseidon2" } +lb-sdp-service = { default-features = false, package = "logos-blockchain-sdp-service", path = "./services/sdp" } +lb-services-utils = { default-features = false, package = "logos-blockchain-services-utils", path = "./services/utils" } +lb-storage-service = { default-features = false, package = "logos-blockchain-storage-service", path = "./services/storage" } +lb-subnetworks-assignations = { default-features = false, package = "logos-blockchain-subnetworks-assignations", path = "./da/network/subnetworks-assignations" } +lb-system-sig-service = { default-features = false, package = "logos-blockchain-system-sig-service", path = "./services/system-sig" } +lb-tests = { default-features = false, package = "logos-blockchain-tests", path = "./tests" } +lb-time-service = { default-features = false, package = "logos-blockchain-time-service", path = "./services/time" } +lb-tracing = { default-features = false, package = "logos-blockchain-tracing", path = "./tracing" } +lb-tracing-service = { default-features = false, package = "logos-blockchain-tracing-service", path = "./services/tracing" } +lb-tx-service = { default-features = false, package = "logos-blockchain-tx-service", path = "./services/tx-service" } +lb-utils = { default-features = false, package = "logos-blockchain-utils", path = "./utils" } +lb-utxotree = { default-features = false, package = "logos-blockchain-utxotree", path = "./utxotree" } +lb-wallet = { default-features = false, package = "logos-blockchain-wallet", path = "./wallet" } +lb-wallet-http-client = { default-features = false, package = "logos-blockchain-wallet-http-client", path = "./wallet-http-client" } +lb-wallet-service = { default-features = false, package = "logos-blockchain-wallet-service", path = "./services/wallet" } +lb-witness-generator = { default-features = false, package = "logos-blockchain-witness-generator", path = "./zk/circuits/witness-generator" } +lb-zksign = { default-features = false, package = "logos-blockchain-zksign", path = "./zk/proofs/zksign" } # External blake2 = { default-features = false, version = "0.10" } diff --git a/blend/crypto/Cargo.toml b/blend/crypto/Cargo.toml index 5dac16d22..22f2d0010 100644 --- a/blend/crypto/Cargo.toml +++ b/blend/crypto/Cargo.toml @@ -18,7 +18,7 @@ lb-groth16 = { workspace = true } lb-poq = { workspace = true } lb-poseidon2 = { workspace = true } lb-utils = { features = ["rng"], workspace = true } -rs-merkle-tree = { default-features = false, version = "0.1", features = ["memory_store"] } +rs-merkle-tree = { default-features = false, features = ["memory_store"], version = "0.1" } thiserror = "1" [dev-dependencies] diff --git a/blend/network/Cargo.toml b/blend/network/Cargo.toml index 1b2379de9..dcf4f0c80 100644 --- a/blend/network/Cargo.toml +++ b/blend/network/Cargo.toml @@ -30,7 +30,7 @@ async-trait = { version = "0.1" } lb-blend-message = { features = ["unsafe-test-functions"], workspace = true } lb-blend-scheduling = { features = ["unsafe-test-functions"], workspace = true } lb-groth16 = { default-features = false, workspace = true } -libp2p = { default-features = false, workspace = true, features = ["plaintext", "tcp", "yamux"] } +libp2p = { default-features = false, features = ["plaintext", "tcp", "yamux"], workspace = true } libp2p-stream = { workspace = true } libp2p-swarm-test = { default-features = false, features = ["tokio"], version = "0.5.0" } test-log = { default-features = false, version = "0.2.18" } diff --git a/blend/scheduling/Cargo.toml b/blend/scheduling/Cargo.toml index 487698f8a..d6fa67a42 100644 --- a/blend/scheduling/Cargo.toml +++ b/blend/scheduling/Cargo.toml @@ -21,7 +21,7 @@ lb-blend-message = { workspace = true } lb-blend-proofs = { workspace = true } lb-core = { workspace = true } lb-key-management-system-keys = { workspace = true } -lb-utils = { workspace = true, features = ["rng"] } +lb-utils = { features = ["rng"], workspace = true } multiaddr = { default-features = false, version = "0.18" } rand = { features = ["alloc"], workspace = true } serde = { workspace = true } @@ -31,11 +31,11 @@ tokio-stream = { default-features = false, version = "0.1" } tracing = { workspace = true } [dev-dependencies] -lb-blend-message = { workspace = true, features = ["unsafe-test-functions"] } -lb-blend-proofs = { workspace = true, features = ["unsafe-test-functions"] } +lb-blend-message = { features = ["unsafe-test-functions"], workspace = true } +lb-blend-proofs = { features = ["unsafe-test-functions"], workspace = true } lb-groth16 = { workspace = true } libp2p = { workspace = true } -test-log = { default-features = false, version = "0.2.18", features = ["trace"] } +test-log = { default-features = false, features = ["trace"], version = "0.2.18" } [features] unsafe-test-functions = [] diff --git a/c-bindings/Cargo.toml b/c-bindings/Cargo.toml index 1b5846859..3f7acf1d2 100644 --- a/c-bindings/Cargo.toml +++ b/c-bindings/Cargo.toml @@ -17,7 +17,7 @@ lb-cryptarchia-engine = { workspace = true } lb-key-management-system-keys = { workspace = true } lb-node = { default-features = true, workspace = true } lb-wallet-service = { workspace = true } -num-bigint = { version = "0.4", default-features = false } +num-bigint = { default-features = false, version = "0.4" } overwatch = { workspace = true } serde_json = { workspace = true } serde_yaml = { default-features = false, workspace = true } diff --git a/consensus/cryptarchia-engine/Cargo.toml b/consensus/cryptarchia-engine/Cargo.toml index 6b8c21366..ec6849cd1 100644 --- a/consensus/cryptarchia-engine/Cargo.toml +++ b/consensus/cryptarchia-engine/Cargo.toml @@ -19,7 +19,7 @@ workspace = true [dependencies] cfg_eval = { optional = true, version = "0.1" } lb-utils = { features = ["time"], optional = true, workspace = true } -serde = { workspace = true, optional = true } +serde = { optional = true, workspace = true } serde_with = { features = ["macros"], optional = true, workspace = true } thiserror = "1" time = { default-features = false, version = "0.3" } diff --git a/core/Cargo.toml b/core/Cargo.toml index 3dcf6b257..cb44228cd 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -20,21 +20,21 @@ bincode = "1.3" blake2 = { default-features = false, version = "0.10" } bytes = { workspace = true } const-hex = { default-features = false, features = ["alloc"], version = "1" } -futures = { version = "0.3", default-features = false, features = ["alloc"] } +futures = { default-features = false, features = ["alloc"], version = "0.3" } generic-array = "1.2.0" -hex = { version = "0.4", default-features = false, features = ["alloc"] } +hex = { default-features = false, features = ["alloc"], version = "0.4" } lb-blend-proofs = { workspace = true } lb-cryptarchia-engine = { features = ["serde"], workspace = true } -lb-groth16 = { workspace = true, features = ["deser"] } +lb-groth16 = { features = ["deser"], workspace = true } lb-key-management-system-keys = { workspace = true } lb-pol = { workspace = true } lb-poseidon2 = { workspace = true } lb-utils = { workspace = true } multiaddr = { default-features = false, version = "0.18" } -nom = { version = "8", default-features = false, features = ["alloc"] } -num-bigint = { version = "0.4", default-features = false } +nom = { default-features = false, features = ["alloc"], version = "8" } +num-bigint = { default-features = false, version = "0.4" } serde = { workspace = true } -strum = { version = "0.27", features = ["derive"] } +strum = { features = ["derive"], version = "0.27" } thiserror = "1.0" tracing = { workspace = true } diff --git a/kms/keys/Cargo.toml b/kms/keys/Cargo.toml index 26e7bf46e..6f4fad477 100644 --- a/kms/keys/Cargo.toml +++ b/kms/keys/Cargo.toml @@ -15,7 +15,7 @@ workspace = true [dependencies] async-trait = { default-features = false, version = "0.1" } bytes = { workspace = true } -ed25519-dalek = { workspace = true, features = ["rand_core", "serde", "zeroize"] } +ed25519-dalek = { features = ["rand_core", "serde", "zeroize"], workspace = true } generic-array = { default-features = false, version = "1.2.0" } lb-blend-proofs = { workspace = true } lb-groth16 = { workspace = true } @@ -28,9 +28,9 @@ rand_core = { default-features = false, version = "0.6.4" serde = { default-features = false, features = ["derive"], version = "1" } subtle = { workspace = true } thiserror = { default-features = false, version = "2" } -tokio = { default-features = false, version = "1", features = ["rt"] } +tokio = { default-features = false, features = ["rt"], version = "1" } tracing = { default-features = false, version = "0.1" } -x25519-dalek = { workspace = true, features = ["serde", "static_secrets", "zeroize"] } +x25519-dalek = { features = ["serde", "static_secrets", "zeroize"], workspace = true } zeroize = { workspace = true } [features] diff --git a/kms/macros/Cargo.toml b/kms/macros/Cargo.toml index 6c7c01a90..626a3dee5 100644 --- a/kms/macros/Cargo.toml +++ b/kms/macros/Cargo.toml @@ -15,7 +15,7 @@ proc-macro = true [dependencies] proc-macro2 = { default-features = false, version = "1" } quote = { default-features = false, version = "1" } -syn = { version = "2", features = ["full"] } +syn = { features = ["full"], version = "2" } [lints] workspace = true diff --git a/libp2p/Cargo.toml b/libp2p/Cargo.toml index fe00d2e07..4d915b5b4 100644 --- a/libp2p/Cargo.toml +++ b/libp2p/Cargo.toml @@ -39,7 +39,7 @@ natpmp = { features = ["tokio"], version = "0.5" } netdev = { default-features = false, version = "0.31" } num_enum = { default-features = false, version = "0.7.4" } rand = { default-features = false, version = "0.8" } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } serde_with = { workspace = true } thiserror = "1.0.40" tokio = { features = ["macros", "test-util", "time"], version = "1" } diff --git a/mmr/Cargo.toml b/mmr/Cargo.toml index 218dccda8..e0f0f8325 100644 --- a/mmr/Cargo.toml +++ b/mmr/Cargo.toml @@ -14,7 +14,7 @@ ark-ff = { default-features = false, features = ["std"], version = "0.4" } lb-groth16 = { workspace = true } lb-poseidon2 = { workspace = true } rpds = { default-features = false, version = "1.1.1" } -serde = { workspace = true, features = ["derive"], optional = true } +serde = { features = ["derive"], optional = true, workspace = true } [dev-dependencies] proptest = { default-features = false, features = ["std"], version = "1.0" } diff --git a/nodes/api-common/Cargo.toml b/nodes/api-common/Cargo.toml index d5be23cca..f79d756b7 100644 --- a/nodes/api-common/Cargo.toml +++ b/nodes/api-common/Cargo.toml @@ -17,7 +17,7 @@ axum = { default-features = false, features = ["http1", governor = { default-features = false, version = "0.6" } lb-core = { workspace = true } lb-key-management-system-keys = { workspace = true } -serde = { workspace = true, features = ["alloc", "derive"] } +serde = { features = ["alloc", "derive"], workspace = true } serde_json = { workspace = true } serde_with = { default-features = false, features = ["macros"], workspace = true } tokio = { default-features = false, features = ["time"], optional = true, version = "1" } diff --git a/nodes/executor/binary/Cargo.toml b/nodes/executor/binary/Cargo.toml index afaebc3df..cea955045 100644 --- a/nodes/executor/binary/Cargo.toml +++ b/nodes/executor/binary/Cargo.toml @@ -57,10 +57,10 @@ utoipa = { workspace = true } [target.'cfg(windows)'.dependencies] # XCompiling from Unix has issues downloading assets. Use vendored instead. # This happens locally but might not on CI. -utoipa-swagger-ui = { workspace = true, features = ["axum", "vendored"] } +utoipa-swagger-ui = { features = ["axum", "vendored"], workspace = true } [target.'cfg(not(windows))'.dependencies] -utoipa-swagger-ui = { workspace = true, features = ["axum"] } +utoipa-swagger-ui = { features = ["axum"], workspace = true } [features] default = ["tracing"] diff --git a/nodes/node/binary/Cargo.toml b/nodes/node/binary/Cargo.toml index bf40301fc..a8f731611 100644 --- a/nodes/node/binary/Cargo.toml +++ b/nodes/node/binary/Cargo.toml @@ -31,7 +31,7 @@ lb-blend = { workspace = true } lb-blend-service = { features = ["libp2p"], workspace = true } lb-chain-broadcast-service = { workspace = true } lb-chain-leader-service = { workspace = true } -lb-chain-network-service = { workspace = true, features = ["libp2p"] } +lb-chain-network-service = { features = ["libp2p"], workspace = true } lb-chain-service = { workspace = true } lb-core = { workspace = true } lb-cryptarchia-engine = { workspace = true } @@ -58,7 +58,7 @@ lb-time-service = { features = ["ntp", "serde"], workspace = tr lb-tracing = { workspace = true } lb-tracing-service = { workspace = true } lb-tx-service = { features = ["rocksdb-backend"], workspace = true } -lb-utils = { workspace = true, features = ["serde"] } +lb-utils = { features = ["serde"], workspace = true } lb-wallet-service = { workspace = true } num-bigint = { default-features = false, version = "0.4" } overwatch = { workspace = true } @@ -85,13 +85,13 @@ tower-http = { default-features = false, features = ["cors", "limit", "timeout", [target.'cfg(windows)'.dependencies] # XCompiling from Unix has issues downloading assets. Use vendored instead. # This happens locally but might not on CI. -utoipa-swagger-ui = { workspace = true, features = ["axum", "vendored"] } +utoipa-swagger-ui = { features = ["axum", "vendored"], workspace = true } [target.'cfg(not(windows))'.dependencies] -utoipa-swagger-ui = { workspace = true, features = ["axum"] } +utoipa-swagger-ui = { features = ["axum"], workspace = true } [dev-dependencies] -test-log = { default-features = false, version = "0.2.18", features = ["trace"] } +test-log = { default-features = false, features = ["trace"], version = "0.2.18" } [features] block-explorer = ["lb-api-service/block-explorer"] diff --git a/services/blend/Cargo.toml b/services/blend/Cargo.toml index 8b8613a8a..19d45e63d 100644 --- a/services/blend/Cargo.toml +++ b/services/blend/Cargo.toml @@ -22,7 +22,7 @@ lb-chain-service = { workspace = true } lb-core = { workspace = true } lb-cryptarchia-engine = { workspace = true } lb-groth16 = { default-features = false, workspace = true } -lb-key-management-system-service = { workspace = true, features = ["unsafe"] } +lb-key-management-system-service = { features = ["unsafe"], workspace = true } lb-ledger = { workspace = true } lb-libp2p = { optional = true, workspace = true } lb-network-service = { workspace = true } @@ -47,7 +47,7 @@ lb-blend = { features = ["unsafe-test-functions"], workspace = true } libp2p = { default-features = false, features = ["plaintext", "tcp", "yamux"], workspace = true } libp2p-swarm-test = { default-features = false, version = "0.5.0" } tempfile = { workspace = true } -test-log = { default-features = false, version = "0.2.18", features = ["trace"] } +test-log = { default-features = false, features = ["trace"], version = "0.2.18" } [features] default = [] diff --git a/services/chain/broadcast-service/Cargo.toml b/services/chain/broadcast-service/Cargo.toml index 9c12c7d73..16eb41d0e 100644 --- a/services/chain/broadcast-service/Cargo.toml +++ b/services/chain/broadcast-service/Cargo.toml @@ -18,7 +18,7 @@ derivative = { default-features = false, version = "2" } futures = { default-features = false, version = "0.3" } lb-core = { workspace = true } overwatch = { workspace = true } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } tokio = { default-features = false, version = "1" } tokio-stream = { default-features = false, version = "0.1" } tracing = { workspace = true } diff --git a/services/chain/chain-common/Cargo.toml b/services/chain/chain-common/Cargo.toml index 65b3497fb..3e74eb095 100644 --- a/services/chain/chain-common/Cargo.toml +++ b/services/chain/chain-common/Cargo.toml @@ -11,4 +11,4 @@ version = { workspace = true } [dependencies] lb-core = { workspace = true } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } diff --git a/services/chain/chain-service/Cargo.toml b/services/chain/chain-service/Cargo.toml index 4477af395..f5540f404 100644 --- a/services/chain/chain-service/Cargo.toml +++ b/services/chain/chain-service/Cargo.toml @@ -25,7 +25,7 @@ lb-ledger = { features = ["serde"], workspace = true } lb-network-service = { workspace = true } lb-services-utils = { workspace = true } lb-storage-service = { workspace = true } -lb-time-service = { workspace = true, features = ["ntp"] } +lb-time-service = { features = ["ntp"], workspace = true } lb-utils = { workspace = true } num-bigint = { default-features = false, version = "0.4" } overwatch = { workspace = true } diff --git a/services/data-availability/network/Cargo.toml b/services/data-availability/network/Cargo.toml index 3213bc730..2ac6aadf1 100644 --- a/services/data-availability/network/Cargo.toml +++ b/services/data-availability/network/Cargo.toml @@ -38,7 +38,7 @@ log = "0.4.22" multiaddr = { default-features = false, version = "0.18" } overwatch = { workspace = true } rand = { workspace = true } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } thiserror = "1" tokio = { default-features = false, features = ["macros", "sync"], version = "1" } tokio-stream = { default-features = false, version = "0.1" } diff --git a/services/key-management-system/Cargo.toml b/services/key-management-system/Cargo.toml index 8f502da00..39edc66b8 100644 --- a/services/key-management-system/Cargo.toml +++ b/services/key-management-system/Cargo.toml @@ -17,17 +17,17 @@ async-trait = "0.1" lb-key-management-system-keys = { workspace = true } log = "0.4.22" overwatch = { workspace = true } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } thiserror = { default-features = false, version = "2" } -tokio = { default-features = false, version = "1", features = ["rt"] } +tokio = { default-features = false, features = ["rt"], version = "1" } tracing = { default-features = false, version = "0.1" } [dev-dependencies] bytes = { workspace = true } -lb-key-management-system-keys = { workspace = true, features = ["unsafe"] } +lb-key-management-system-keys = { features = ["unsafe"], workspace = true } num-bigint = { default-features = false, version = "0.4" } rand = { features = ["getrandom"], workspace = true } -serde = { workspace = true, features = ["std"] } +serde = { features = ["std"], workspace = true } serde_yaml = "0.9" [features] diff --git a/services/network/Cargo.toml b/services/network/Cargo.toml index 3f0ef3284..f2b8f8534 100644 --- a/services/network/Cargo.toml +++ b/services/network/Cargo.toml @@ -21,7 +21,7 @@ lb-libp2p = { optional = true, workspace = true } overwatch = { workspace = true } rand = { features = ["std"], optional = true, workspace = true } rand_chacha = { default-features = false, optional = true, version = "0.3" } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } tokio = { default-features = false, features = ["macros", "sync"], version = "1" } tokio-stream = { default-features = false, version = "0.1" } tracing = { workspace = true } diff --git a/services/sdp/Cargo.toml b/services/sdp/Cargo.toml index 83a5cdf28..44d7c608e 100644 --- a/services/sdp/Cargo.toml +++ b/services/sdp/Cargo.toml @@ -19,7 +19,7 @@ lb-core = { workspace = true } lb-key-management-system-keys = { workspace = true } lb-tx-service = { workspace = true } overwatch = { workspace = true } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } thiserror = { workspace = true } tokio = { default-features = false, version = "1" } tokio-stream = { default-features = false, version = "0.1" } diff --git a/services/time/Cargo.toml b/services/time/Cargo.toml index 67b221ab0..313dcd1bd 100644 --- a/services/time/Cargo.toml +++ b/services/time/Cargo.toml @@ -20,7 +20,7 @@ lb-cryptarchia-engine = { features = ["tokio"], workspace = true } lb-utils = { optional = true, workspace = true } log = "0.4.22" overwatch = { workspace = true } -serde = { workspace = true, features = ["derive"], optional = true } +serde = { features = ["derive"], optional = true, workspace = true } serde_with = { optional = true, workspace = true } sntpc = { default-features = false, features = ["std", "tokio-socket"], optional = true, version = "0.5" } thiserror = { default-features = false, optional = true, version = "2.0" } diff --git a/services/utils/Cargo.toml b/services/utils/Cargo.toml index 1e45d8a0c..a4f074d6e 100644 --- a/services/utils/Cargo.toml +++ b/services/utils/Cargo.toml @@ -31,6 +31,6 @@ tracing = { workspace = true } [dev-dependencies] overwatch-derive = { workspace = true } -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } tokio = { default-features = false, version = "1" } tracing = { default-features = false, version = "0.1" } diff --git a/services/wallet/Cargo.toml b/services/wallet/Cargo.toml index 2c91733ec..e5f52cab6 100644 --- a/services/wallet/Cargo.toml +++ b/services/wallet/Cargo.toml @@ -14,7 +14,7 @@ async-trait = "0.1" bytes = "1.0" futures = { default-features = false, version = "0.3" } hex = "0.4" -serde = { workspace = true, features = ["derive"] } +serde = { features = ["derive"], workspace = true } thiserror = "1.0" tokio = { features = ["sync"], version = "1" } tracing = { workspace = true } diff --git a/testnet/l2-sequencer-archival-demo/archiver/Cargo.toml b/testnet/l2-sequencer-archival-demo/archiver/Cargo.toml index aa05ae0d7..00200df68 100644 --- a/testnet/l2-sequencer-archival-demo/archiver/Cargo.toml +++ b/testnet/l2-sequencer-archival-demo/archiver/Cargo.toml @@ -14,7 +14,7 @@ workspace = true [dependencies] async-stream = { default-features = false, version = "0.3.6" } -axum = { default-features = false, version = "0.8.7", features = ["http2", "json", "tokio"] } +axum = { default-features = false, features = ["http2", "json", "tokio"], version = "0.8.7" } clap = { default-features = false, features = ["derive", "env", "std"], version = "4.5.13" } futures = { default-features = false, version = "0.3" } hex = { default-features = false, features = ["alloc"], version = "0.4" } @@ -31,5 +31,5 @@ thiserror = { workspace = true } tokio = { workspace = true } tokio-stream = { default-features = false, version = "0.1" } tokio-util = { default-features = false, version = "0.7" } -tower-http = { version = "0.6.8", features = ["cors"] } +tower-http = { features = ["cors"], version = "0.6.8" } url = { default-features = false, version = "2.5.4" } diff --git a/testnet/l2-sequencer-archival-demo/sequencer/Cargo.toml b/testnet/l2-sequencer-archival-demo/sequencer/Cargo.toml index 28b9477d1..a39706829 100644 --- a/testnet/l2-sequencer-archival-demo/sequencer/Cargo.toml +++ b/testnet/l2-sequencer-archival-demo/sequencer/Cargo.toml @@ -27,6 +27,6 @@ serde_json = { workspace = true } thiserror = { workspace = true } tokio = { default-features = false, features = ["macros", "net", "rt-multi-thread", "signal", "sync"], version = "1" } tokio-util = { version = "0.7" } -tower-http = { version = "0.6.8", features = ["cors"] } +tower-http = { features = ["cors"], version = "0.6.8" } tracing = { workspace = true } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +tracing-subscriber = { features = ["env-filter"], version = "0.3" } diff --git a/utils/Cargo.toml b/utils/Cargo.toml index e1a624582..11e059315 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -19,8 +19,8 @@ cipher = { version = "0.4" } const-hex = { default-features = false, version = "1" } humantime = { optional = true, version = "2.1" } overwatch = { workspace = true } -rand = { workspace = true, features = ["getrandom"] } -serde = { workspace = true, features = ["derive"], optional = true } +rand = { features = ["getrandom"], workspace = true } +serde = { features = ["derive"], optional = true, workspace = true } serde_with = { optional = true, workspace = true } time = { default-features = false, features = ["serde-human-readable"], optional = true, version = "0.3" } diff --git a/utxotree/Cargo.toml b/utxotree/Cargo.toml index e3a04297f..9d678b7b1 100644 --- a/utxotree/Cargo.toml +++ b/utxotree/Cargo.toml @@ -16,7 +16,7 @@ lb-groth16 = { features = ["deser"], workspace = true } lb-poseidon2 = { workspace = true } num-bigint = { default-features = false, version = "0.4" } rpds = { default-features = false, features = ["serde"], version = "1" } -serde = { workspace = true, features = ["alloc", "derive", "rc"], optional = true } +serde = { features = ["alloc", "derive", "rc"], optional = true, workspace = true } thiserror = "1.0" [dev-dependencies]