From 11a84bf8780f400a10a1d7478939fa5bd3ef7585 Mon Sep 17 00:00:00 2001 From: Ekleog-NEAR <96595974+Ekleog-NEAR@users.noreply.github.com> Date: Wed, 29 Mar 2023 17:14:54 +0200 Subject: [PATCH] treewide: use workspace dependencies (#8822) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Promised follow-up of #8792. I migrated one crate per commit at the beginning, and when most crates did not lead to changes in the root-level Cargo.toml started migrating a few at once. Would recommend commit-by-commit review as I checked that cargo resolution didn’t change after each commit. Given the bitrot potential I’m marking as automerge right now. --- Cargo.toml | 94 ++++++++++++++++++- chain/chain-primitives/Cargo.toml | 4 +- chain/chain/Cargo.toml | 22 ++--- chain/chunks-primitives/Cargo.toml | 4 +- chain/chunks/Cargo.toml | 20 ++-- chain/client-primitives/Cargo.toml | 10 +- chain/client/Cargo.toml | 38 ++++---- chain/epoch-manager/Cargo.toml | 12 +-- chain/indexer-primitives/Cargo.toml | 2 +- chain/indexer/Cargo.toml | 20 ++-- .../jsonrpc-adversarial-primitives/Cargo.toml | 4 +- chain/jsonrpc-primitives/Cargo.toml | 10 +- chain/jsonrpc/Cargo.toml | 20 ++-- chain/jsonrpc/client/Cargo.toml | 4 +- chain/jsonrpc/fuzz/Cargo.toml | 8 +- chain/jsonrpc/jsonrpc-tests/Cargo.toml | 20 ++-- chain/network/Cargo.toml | 18 ++-- chain/pool/Cargo.toml | 6 +- chain/rosetta-rpc/Cargo.toml | 20 ++-- chain/telemetry/Cargo.toml | 8 +- core/async/Cargo.toml | 6 +- core/chain-configs/Cargo.toml | 8 +- core/crypto/Cargo.toml | 8 +- core/dyn-configs/Cargo.toml | 6 +- core/o11y/Cargo.toml | 4 +- core/primitives-core/Cargo.toml | 2 +- core/primitives/Cargo.toml | 10 +- core/store/Cargo.toml | 6 +- genesis-tools/genesis-csv-to-json/Cargo.toml | 10 +- genesis-tools/genesis-populate/Cargo.toml | 14 +-- genesis-tools/keypair-generator/Cargo.toml | 4 +- integration-tests/Cargo.toml | 50 +++++----- nearcore/Cargo.toml | 52 +++++----- neard/Cargo.toml | 38 ++++---- runtime/near-test-contracts/Cargo.toml | 12 +-- runtime/near-vm-errors/Cargo.toml | 4 +- runtime/near-vm-logic/Cargo.toml | 12 +-- runtime/near-vm-runner/Cargo.toml | 36 +++---- runtime/near-vm-runner/fuzz/Cargo.toml | 10 +- runtime/near-vm/lib/api/Cargo.toml | 27 +++--- .../lib/compiler-singlepass/Cargo.toml | 28 +++--- runtime/near-vm/lib/compiler/Cargo.toml | 16 ++-- .../near-vm/lib/engine-universal/Cargo.toml | 21 ++--- runtime/near-vm/lib/engine/Cargo.toml | 19 ++-- runtime/near-vm/lib/types/Cargo.toml | 8 +- runtime/near-vm/lib/vm/Cargo.toml | 26 ++--- .../tests/lib/compiler-test-derive/Cargo.toml | 10 +- .../tests/lib/test-generator/Cargo.toml | 4 +- runtime/near-vm/tests/lib/wast/Cargo.toml | 8 +- runtime/runtime-params-estimator/Cargo.toml | 22 ++--- runtime/runtime/Cargo.toml | 24 ++--- test-utils/actix-test-utils/Cargo.toml | 2 +- test-utils/logger/Cargo.toml | 2 +- test-utils/runtime-tester/Cargo.toml | 24 ++--- test-utils/runtime-tester/fuzz/Cargo.toml | 4 +- test-utils/store-validator/Cargo.toml | 16 ++-- test-utils/testlib/Cargo.toml | 12 +-- tools/amend-genesis/Cargo.toml | 22 ++--- tools/chainsync-loadtest/Cargo.toml | 16 ++-- tools/cold-store/Cargo.toml | 10 +- tools/flat-storage/Cargo.toml | 14 +-- tools/indexer/example/Cargo.toml | 4 +- tools/mirror/Cargo.toml | 30 +++--- tools/mock-node/Cargo.toml | 32 +++---- tools/ping/Cargo.toml | 8 +- tools/restaked/Cargo.toml | 12 +-- tools/rpctypegen/macro/Cargo.toml | 2 +- tools/speedy_sync/Cargo.toml | 22 ++--- tools/state-parts/Cargo.toml | 10 +- tools/state-viewer/Cargo.toml | 28 +++--- .../storage-usage-delta-calculator/Cargo.toml | 8 +- utils/mainnet-res/Cargo.toml | 6 +- 72 files changed, 605 insertions(+), 528 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d6db887649a..27ca776c67d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -92,6 +92,7 @@ async-recursion = "0.3.2" async-trait = "0.1.58" atty = "0.2" awc = { version = "3", features = ["openssl"] } +backtrace = "0.3" base64 = "0.13" bencher = "0.1.5" bitflags = "1.2" @@ -105,7 +106,8 @@ bytes = "1" bytesize = { version = "1.1", features = ["serde"] } c2-chacha = "0.3" cargo_metadata = "0.14.1" -cfg-if = "1" +cc = "1.0" +cfg-if = "1.0" chrono = { version = "0.4.19", features = ["serde"] } clap = { version = "3.1.6", features = ["derive", "env"] } conqueue = "0.4.0" @@ -115,38 +117,101 @@ crossbeam = "0.8" crossbeam-channel = "0.5" csv = "1.1.1" curve25519-dalek = "3" +delay-detector = { path = "tools/delay-detector" } derive-enum-from-into = "0.1.1" derive_more = "0.99.9" dirs = "4" +dynasm = "1.0" +dynasmrt = "1.0" easy-ext = "0.2" ed25519-dalek = "1" elastic-array = "0.11" enum-map = "2.1.0" +enumset = "1.0" expect-test = "1.3.0" +finite-wasm = "0.3.0" flate2 = "1.0.22" fs2 = "0.4" futures = "0.3.5" futures-util = "0.3" +genesis-populate = { path = "genesis-tools/genesis-populate"} +hashbrown = "0.11" hex = { version = "0.4.2", features = ["serde"] } +hex-literal = "0.2" hkdf = "0.12.3" hyper = { version = "0.14", features = ["full"] } hyper-tls = "0.5.0" im = "15" +indexmap = "1.6" indicatif = { version = "0.15.0", features = ["with_rayon"] } insta = { version = "1.26.0", features = ["json", "yaml"] } +integration-tests = { path = "integration-tests" } itertools = "0.10.0" itoa = "1.0" json_comments = "0.2.1" +lazy_static = "1.4" +leb128 = "0.2" libc = "0.2.81" libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] } log = "0.4" loupe = "0.1" lru = "0.7.2" +memmap2 = "0.5" memoffset = "0.6" +more-asserts = "0.2" +near-account-id = { path = "core/account-id", features = [ "internal_unstable" ] } +near-actix-test-utils = { path = "test-utils/actix-test-utils" } +near-amend-genesis = { path = "tools/amend-genesis" } +near-async = { path = "core/async" } +near-cache = { path = "utils/near-cache" } +near-chain = { path = "chain/chain" } +near-chain-configs = { path = "core/chain-configs" } +near-chain-primitives = { path = "chain/chain-primitives" } +near-chunks = { path = "chain/chunks" } +near-chunks-primitives = { path = "chain/chunks-primitives" } +near-client = { path = "chain/client" } +near-client-primitives = {path = "chain/client-primitives"} +near-cold-store-tool = { path = "tools/cold-store", package = "cold-store-tool" } +near-config-utils = { path = "utils/config" } +near-crypto = { path = "core/crypto" } +near-dyn-configs = { path = "core/dyn-configs" } +near-epoch-manager = { path = "chain/epoch-manager" } +near-flat-storage = { path = "tools/flat-storage" } +near-indexer = { path = "chain/indexer" } +near-indexer-primitives = { path = "chain/indexer-primitives" } +near-jsonrpc = { path = "chain/jsonrpc" } +near-jsonrpc-adversarial-primitives = { path = "chain/jsonrpc-adversarial-primitives" } +near-jsonrpc-client = { path = "chain/jsonrpc/client" } +near-jsonrpc-primitives = { path = "chain/jsonrpc-primitives", features = ["full"] } +near-jsonrpc-tests = { path = "chain/jsonrpc/jsonrpc-tests" } +near-mainnet-res = { path = "utils/mainnet-res" } +near-mirror = { path = "tools/mirror" } +near-network = { path = "chain/network" } +near-o11y = { path = "core/o11y" } +near-performance-metrics = { path = "utils/near-performance-metrics" } +near-performance-metrics-macros = { path = "utils/near-performance-metrics-macros" } +near-ping = { path = "tools/ping" } +near-pool = { path = "chain/pool" } +near-primitives = { path = "core/primitives" } +near-primitives-core = { path = "core/primitives-core" } +near-rosetta-rpc = { path = "chain/rosetta-rpc" } +near-rpc-error-core = { path = "tools/rpctypegen/core" } +near-rpc-error-macro = { path = "tools/rpctypegen/macro" } +near-stable-hasher = { path = "utils/near-stable-hasher" } +near-state-parts = { path = "tools/state-parts" } +near-state-viewer = { path = "tools/state-viewer", package = "state-viewer" } +near-store = { path = "core/store" } +near-telemetry = { path = "chain/telemetry" } +near-test-contracts = { path = "runtime/near-test-contracts" } +near-vm-errors = { path = "runtime/near-vm-errors" } +near-vm-logic = {path = "runtime/near-vm-logic" } +near-vm-runner = { path = "runtime/near-vm-runner"} +nearcore = { path = "nearcore" } nix = "0.24" +node-runtime = { path = "runtime/runtime" } num-bigint = "0.3" num-rational = { version = "0.3.1", features = ["serde"] } -num-traits = "0.2.12" +num-traits = "0.2.15" num_cpus = "1.11" once_cell = "1.13.1" openssl = { version = "0.10", features = ["vendored"] } @@ -159,11 +224,14 @@ parity-wasm = { version = "0.42", default-features = false } parity-wasm_41 = { package = "parity-wasm", version = "0.41" } parking_lot = "0.12.1" pin-project = "1.0" +prefix-sum-vec = "0.1.2" pretty_assertions = "1.2" primitive-types = { version = "0.10", default-features = false } +proc-macro2 = "1" prometheus = "0.13.1" protobuf = "3.0.1" protobuf-codegen = "3.0.1" +pwasm-utils_12 = { package = "pwasm-utils", version = "0.12" } quote = "1.0" rand = "0.8.5" rand_chacha = "0.3.1" @@ -174,11 +242,15 @@ rayon = "1.5" redis = "0.21.5" reed-solomon-erasure = "4" regex = "1.7.1" +region = "3.0" reqwest = { version = "0.11.0", features = ["blocking"] } ripemd = "0.1.1" +rkyv = "0.7.31" rlimit = "0.7" rocksdb = { version = "0.19.0", default-features = false, features = ["snappy", "lz4", "zstd", "zlib", "jemalloc"] } +runtime-tester = { path = "test-utils/runtime-tester" } rust-s3 = { version = "0.32.3", features = ["blocking"] } +rustc-demangle = "0.1" rusqlite = {version = "0.27.0", features = ["bundled", "chrono", "functions"] } secp256k1 = { version = "0.24", features = ["recovery", "rand-std"] } semver = "1.0.4" @@ -190,6 +262,7 @@ serde_yaml = "0.9" sha2 = "0.10" sha3 = "0.10" shell-escape = "0.1.5" +smallvec = "1.6" smart-default = "0.6" smartstring = "1.0.1" strum = { version = "0.24", features = ["derive"] } @@ -198,7 +271,9 @@ subtle = "2.2" syn = { version = "1.0.54", features = ["extra-traits", "full"] } sysinfo = "0.24.5" tar = "0.4.38" +target-lexicon = { version = "0.12.2", default-features = false } tempfile = "3.3" +testlib = { path = "test-utils/testlib" } thiserror = "1.0.30" tikv-jemallocator = "0.5.0" time = "0.3.9" @@ -206,21 +281,32 @@ tokio = { version = "~1.19", features = ["fs", "macros", "net", "rt-multi-thread tokio-stream = { version = "0.1.2", features = ["net"] } tokio-util = { version = "0.7.1", features = ["codec", "io"] } toml = "0.5.8" +tqdm = "0.4.4" tracing = { version = "0.1.36", features = ["std"] } tracing-appender = "0.2.2" tracing-opentelemetry = "0.17.0" tracing-span-tree = "0.1" tracing-subscriber = { version = "0.3.15", features = ["env-filter", "fmt", "registry", "std"] } +trybuild = "1.0.11" turn = "0.6" validator = "0.12" -rkyv = { version = "0.7", features = ["strict"] } wasm-encoder = "0.11.0" wasm-smith = "0.10" -wasmparser = "0.78" +wasmer-compiler = { package = "wasmer-compiler-near", version = "=2.4.0" } +wasmer-compiler-singlepass = { package = "wasmer-compiler-singlepass-near", version = "=2.4.0" } +wasmer-engine = { package = "wasmer-engine-near", version = "=2.4.0" } +wasmer-engine-universal = { package = "wasmer-engine-universal-near", version = "=2.4.0", features = ["compiler"] } +wasmer-runtime = { version = "0.18.0", package = "wasmer-runtime-near", features = ["default-backend-singlepass"], default-features = false } +wasmer-runtime-core = { version = "0.18.2", package = "wasmer-runtime-core-near" } +wasmer-types = { package = "wasmer-types-near", version = "=2.4.0" } +wasmer-vm = { package = "wasmer-vm-near", version = "=2.4.0" } +wasmparser = "0.78" # TODO: unify at least the versions of wasmparser we have in our codebase wasmprinter = "0.2" wasmtime = { version = "4.0.0", default-features = false, features = ["cranelift"] } +wast = "40.0" wat = "1.0.40" webrtc-util = "0.7" +winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi", "winnt", "impl-default"] } xshell = "0.2.1" xz2 = "0.1.6" diff --git a/chain/chain-primitives/Cargo.toml b/chain/chain-primitives/Cargo.toml index 072190e598b..7e4068d96f7 100644 --- a/chain/chain-primitives/Cargo.toml +++ b/chain/chain-primitives/Cargo.toml @@ -17,5 +17,5 @@ chrono.workspace = true thiserror.workspace = true tracing.workspace = true -near-primitives = { path = "../../core/primitives" } -near-crypto = { path = "../../core/crypto" } +near-primitives.workspace = true +near-crypto.workspace = true diff --git a/chain/chain/Cargo.toml b/chain/chain/Cargo.toml index 05c3316aa52..96cb2af456e 100644 --- a/chain/chain/Cargo.toml +++ b/chain/chain/Cargo.toml @@ -25,17 +25,17 @@ strum.workspace = true thiserror.workspace = true tracing.workspace = true -delay-detector = { path = "../../tools/delay-detector"} -near-chain-configs = { path = "../../core/chain-configs" } -near-chain-primitives = { path = "../chain-primitives" } -near-crypto = { path = "../../core/crypto" } -near-o11y = { path = "../../core/o11y" } -near-pool = { path = "../pool" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-cache = { path = "../../utils/near-cache" } -near-client-primitives = { path = "../client-primitives"} -near-epoch-manager = { path = "../epoch-manager" } +delay-detector.workspace = true +near-chain-configs.workspace = true +near-chain-primitives.workspace = true +near-crypto.workspace = true +near-o11y.workspace = true +near-pool.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-cache.workspace = true +near-client-primitives.workspace = true +near-epoch-manager.workspace = true [dev-dependencies] insta.workspace = true diff --git a/chain/chunks-primitives/Cargo.toml b/chain/chunks-primitives/Cargo.toml index 01446ff2475..2aaf3012159 100644 --- a/chain/chunks-primitives/Cargo.toml +++ b/chain/chunks-primitives/Cargo.toml @@ -11,5 +11,5 @@ repository = "https://github.com/near/nearcore" description = "This crate hosts NEAR chunks-related error types" [dependencies] -near-chain-primitives = { path = "../chain-primitives" } -near-primitives = { path = "../../core/primitives" } +near-chain-primitives.workspace = true +near-primitives.workspace = true diff --git a/chain/chunks/Cargo.toml b/chain/chunks/Cargo.toml index 609b124439d..0194bd80644 100644 --- a/chain/chunks/Cargo.toml +++ b/chain/chunks/Cargo.toml @@ -19,16 +19,16 @@ reed-solomon-erasure.workspace = true time.workspace = true tracing.workspace = true -near-async = { path = "../../core/async" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-chunks-primitives = { path = "../chunks-primitives" } -near-store = { path = "../../core/store" } -near-network = { path = "../network" } -near-o11y = { path = "../../core/o11y" } -near-chain = { path = "../chain" } -near-pool = { path = "../pool" } -near-performance-metrics = { path = "../../utils/near-performance-metrics" } +near-async.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-chunks-primitives.workspace = true +near-store.workspace = true +near-network.workspace = true +near-o11y.workspace = true +near-chain.workspace = true +near-pool.workspace = true +near-performance-metrics.workspace = true [dev-dependencies] assert_matches.workspace = true diff --git a/chain/client-primitives/Cargo.toml b/chain/client-primitives/Cargo.toml index bf51e1cc6ce..b774606769f 100644 --- a/chain/client-primitives/Cargo.toml +++ b/chain/client-primitives/Cargo.toml @@ -21,12 +21,12 @@ serde_json.workspace = true strum.workspace = true thiserror.workspace = true -near-chain-primitives = { path = "../chain-primitives" } -near-chain-configs = { path = "../../core/chain-configs" } +near-chain-primitives.workspace = true +near-chain-configs.workspace = true -near-chunks-primitives = { path = "../chunks-primitives" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } +near-chunks-primitives.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true [features] sandbox = [] diff --git a/chain/client/Cargo.toml b/chain/client/Cargo.toml index 98ef7650e20..a07766d503e 100644 --- a/chain/client/Cargo.toml +++ b/chain/client/Cargo.toml @@ -27,28 +27,28 @@ thiserror.workspace = true tokio.workspace = true tracing.workspace = true -near-async = { path = "../../core/async" } -near-chain-primitives = { path = "../chain-primitives" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-chain-configs = { path = "../../core/chain-configs" } -near-chain = { path = "../chain" } -near-client-primitives = { path = "../client-primitives" } -near-dyn-configs = { path = "../../core/dyn-configs" } -near-network = { path = "../network" } -near-pool = { path = "../pool" } -near-chunks = { path = "../chunks" } -near-telemetry = { path = "../telemetry" } -near-o11y = { path = "../../core/o11y" } -near-performance-metrics = { path = "../../utils/near-performance-metrics" } -near-performance-metrics-macros = { path = "../../utils/near-performance-metrics-macros" } -near-epoch-manager = { path = "../epoch-manager" } -delay-detector = { path = "../../tools/delay-detector" } +near-async.workspace = true +near-chain-primitives.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-chain-configs.workspace = true +near-chain.workspace = true +near-client-primitives.workspace = true +near-dyn-configs.workspace = true +near-network.workspace = true +near-pool.workspace = true +near-chunks.workspace = true +near-telemetry.workspace = true +near-o11y.workspace = true +near-performance-metrics.workspace = true +near-performance-metrics-macros.workspace = true +near-epoch-manager.workspace = true +delay-detector.workspace = true [dev-dependencies] assert_matches.workspace = true -near-actix-test-utils = { path = "../../test-utils/actix-test-utils" } +near-actix-test-utils.workspace = true [features] # if enabled, we assert in most situations that are impossible unless some byzantine behavior is observed. diff --git a/chain/epoch-manager/Cargo.toml b/chain/epoch-manager/Cargo.toml index 5341096bfab..1b884f45e50 100644 --- a/chain/epoch-manager/Cargo.toml +++ b/chain/epoch-manager/Cargo.toml @@ -17,12 +17,12 @@ serde_json.workspace = true smart-default.workspace = true tracing.workspace = true -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-chain-configs = { path = "../../core/chain-configs" } -near-chain-primitives = { path = "../chain-primitives" } -near-cache = { path = "../../utils/near-cache" } +near-crypto.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-chain-configs.workspace = true +near-chain-primitives.workspace = true +near-cache.workspace = true [features] expensive_tests = [] diff --git a/chain/indexer-primitives/Cargo.toml b/chain/indexer-primitives/Cargo.toml index 98072993584..a8da8db1c52 100644 --- a/chain/indexer-primitives/Cargo.toml +++ b/chain/indexer-primitives/Cargo.toml @@ -16,4 +16,4 @@ description = "This crate hosts structures for the NEAR Indexer Framework types" serde.workspace = true serde_json.workspace = true -near-primitives = { path = "../../core/primitives" } +near-primitives.workspace = true diff --git a/chain/indexer/Cargo.toml b/chain/indexer/Cargo.toml index c685db75954..a6db29616c7 100644 --- a/chain/indexer/Cargo.toml +++ b/chain/indexer/Cargo.toml @@ -17,16 +17,16 @@ serde_json.workspace = true tokio.workspace = true tracing.workspace = true -nearcore = { path = "../../nearcore" } -near-client = { path = "../client" } -near-chain-configs = { path = "../../core/chain-configs" } -near-dyn-configs = { path = "../../core/dyn-configs" } -near-crypto = { path = "../../core/crypto" } -near-indexer-primitives = { path = "../indexer-primitives" } -near-o11y = { path = "../../core/o11y" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -node-runtime = { path = "../../runtime/runtime" } +nearcore.workspace = true +near-client.workspace = true +near-chain-configs.workspace = true +near-dyn-configs.workspace = true +near-crypto.workspace = true +near-indexer-primitives.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true +near-store.workspace = true +node-runtime.workspace = true [features] calimero_zero_storage = ["near-primitives/calimero_zero_storage"] diff --git a/chain/jsonrpc-adversarial-primitives/Cargo.toml b/chain/jsonrpc-adversarial-primitives/Cargo.toml index ca06556ecfb..f3d3e832b58 100644 --- a/chain/jsonrpc-adversarial-primitives/Cargo.toml +++ b/chain/jsonrpc-adversarial-primitives/Cargo.toml @@ -8,8 +8,8 @@ edition.workspace = true [dependencies] serde.workspace = true -near-primitives = { path = "../../core/primitives" } -near-network = { path = "../network" } +near-primitives.workspace = true +near-network.workspace = true [features] test_features = ["near-network/test_features"] diff --git a/chain/jsonrpc-primitives/Cargo.toml b/chain/jsonrpc-primitives/Cargo.toml index 4d5422e22be..edfc4008736 100644 --- a/chain/jsonrpc-primitives/Cargo.toml +++ b/chain/jsonrpc-primitives/Cargo.toml @@ -18,11 +18,11 @@ serde.workspace = true serde_json.workspace = true thiserror.workspace = true -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-chain-configs = { path = "../../core/chain-configs" } -near-rpc-error-macro = { path = "../../tools/rpctypegen/macro" } -near-client-primitives = { path = "../client-primitives", optional = true } +near-crypto.workspace = true +near-primitives.workspace = true +near-chain-configs.workspace = true +near-rpc-error-macro.workspace = true +near-client-primitives = { workspace = true, optional = true } [features] full = ["debug_types"] diff --git a/chain/jsonrpc/Cargo.toml b/chain/jsonrpc/Cargo.toml index c4a392a8f85..fcaee0f1c91 100644 --- a/chain/jsonrpc/Cargo.toml +++ b/chain/jsonrpc/Cargo.toml @@ -19,16 +19,16 @@ tokio.workspace = true tracing.workspace = true tracing-subscriber.workspace = true -near-chain-configs = { path = "../../core/chain-configs" } -near-client-primitives = { path = "../client-primitives" } -near-primitives = { path = "../../core/primitives" } -near-client = { path = "../client" } -near-network = { path = "../network" } -near-o11y = { path = "../../core/o11y" } -near-jsonrpc-client = { path = "client" } -near-jsonrpc-primitives = { path = "../jsonrpc-primitives", features = ["full"] } -near-jsonrpc-adversarial-primitives = { path = "../jsonrpc-adversarial-primitives", optional = true } -near-rpc-error-macro = { path = "../../tools/rpctypegen/macro" } +near-chain-configs.workspace = true +near-client-primitives.workspace = true +near-primitives.workspace = true +near-client.workspace = true +near-network.workspace = true +near-o11y.workspace = true +near-jsonrpc-client.workspace = true +near-jsonrpc-primitives.workspace = true +near-jsonrpc-adversarial-primitives = { workspace = true, optional = true } +near-rpc-error-macro.workspace = true [features] dump_errors_schema = ["near-rpc-error-macro/dump_errors_schema"] diff --git a/chain/jsonrpc/client/Cargo.toml b/chain/jsonrpc/client/Cargo.toml index a9e456e3f2c..add6fa7a7f3 100644 --- a/chain/jsonrpc/client/Cargo.toml +++ b/chain/jsonrpc/client/Cargo.toml @@ -12,5 +12,5 @@ futures.workspace = true serde.workspace = true serde_json.workspace = true -near-jsonrpc-primitives = { path = "../../jsonrpc-primitives" } -near-primitives = { path = "../../../core/primitives" } +near-jsonrpc-primitives.workspace = true +near-primitives.workspace = true diff --git a/chain/jsonrpc/fuzz/Cargo.toml b/chain/jsonrpc/fuzz/Cargo.toml index f9c51c83e02..6522b4d8c93 100644 --- a/chain/jsonrpc/fuzz/Cargo.toml +++ b/chain/jsonrpc/fuzz/Cargo.toml @@ -18,10 +18,10 @@ serde.workspace = true serde_json.workspace = true tokio.workspace = true -near-jsonrpc = { path = ".." } -near-jsonrpc-primitives = { path = "../../jsonrpc-primitives" } -near-jsonrpc-tests = { path = "../jsonrpc-tests" } -near-primitives = { path = "../../../core/primitives" } +near-jsonrpc.workspace = true +near-jsonrpc-primitives.workspace = true +near-jsonrpc-tests.workspace = true +near-primitives.workspace = true [[bin]] name = "fuzz_target_1" diff --git a/chain/jsonrpc/jsonrpc-tests/Cargo.toml b/chain/jsonrpc/jsonrpc-tests/Cargo.toml index 53e6cd9b533..dd9d0bed43a 100644 --- a/chain/jsonrpc/jsonrpc-tests/Cargo.toml +++ b/chain/jsonrpc/jsonrpc-tests/Cargo.toml @@ -14,18 +14,18 @@ borsh.workspace = true serde.workspace = true serde_json.workspace = true -near-chain-configs = { path = "../../../core/chain-configs" } -near-crypto = { path = "../../../core/crypto" } -near-primitives = { path = "../../../core/primitives" } -near-client = { path = "../../client" } -near-store = { path = "../../../core/store" } -near-o11y = { path = "../../../core/o11y" } -near-network = { path = "../../network" } -near-jsonrpc = { path = "../" } -near-jsonrpc-primitives = { path = "../../jsonrpc-primitives" } +near-chain-configs.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-client.workspace = true +near-store.workspace = true +near-o11y.workspace = true +near-network.workspace = true +near-jsonrpc.workspace = true +near-jsonrpc-primitives.workspace = true [dev-dependencies] -near-actix-test-utils = { path = "../../../test-utils/actix-test-utils" } +near-actix-test-utils.workspace = true [features] test_features = ["near-jsonrpc/test_features"] diff --git a/chain/network/Cargo.toml b/chain/network/Cargo.toml index 3a6fe9daef0..c24db883886 100644 --- a/chain/network/Cargo.toml +++ b/chain/network/Cargo.toml @@ -45,15 +45,15 @@ tokio-util.workspace = true tracing.workspace = true time.workspace = true -delay-detector = { path = "../../tools/delay-detector" } -near-async = { path = "../../core/async" } -near-o11y = { path = "../../core/o11y" } -near-crypto = { path = "../../core/crypto" } -near-performance-metrics = { path = "../../utils/near-performance-metrics" } -near-performance-metrics-macros = { path = "../../utils/near-performance-metrics-macros" } -near-primitives = { path = "../../core/primitives" } -near-stable-hasher = { path = "../../utils/near-stable-hasher"} -near-store = { path = "../../core/store" } +delay-detector.workspace = true +near-async.workspace = true +near-o11y.workspace = true +near-crypto.workspace = true +near-performance-metrics.workspace = true +near-performance-metrics-macros.workspace = true +near-primitives.workspace = true +near-stable-hasher.workspace = true +near-store.workspace = true [dev-dependencies] criterion.workspace = true diff --git a/chain/pool/Cargo.toml b/chain/pool/Cargo.toml index 3502e62a985..71b1c1b820a 100644 --- a/chain/pool/Cargo.toml +++ b/chain/pool/Cargo.toml @@ -11,6 +11,6 @@ borsh.workspace = true once_cell.workspace = true rand.workspace = true -near-crypto = { path = "../../core/crypto" } -near-o11y = { path = "../../core/o11y" } -near-primitives = { path = "../../core/primitives" } +near-crypto.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true diff --git a/chain/rosetta-rpc/Cargo.toml b/chain/rosetta-rpc/Cargo.toml index 2270858895f..fa64ea010ff 100644 --- a/chain/rosetta-rpc/Cargo.toml +++ b/chain/rosetta-rpc/Cargo.toml @@ -24,19 +24,19 @@ thiserror.workspace = true tokio.workspace = true validator.workspace = true -near-primitives = { path = "../../core/primitives" } -near-account-id = { path = "../../core/account-id" } -near-crypto = { path = "../../core/crypto" } -near-chain-configs = { path = "../../core/chain-configs" } -near-client = { path = "../client" } -near-client-primitives = { path = "../client-primitives" } -near-network = { path = "../network" } -near-o11y = { path = "../../core/o11y" } +near-primitives.workspace = true +near-account-id.workspace = true +near-crypto.workspace = true +near-chain-configs.workspace = true +near-client.workspace = true +near-client-primitives.workspace = true +near-network.workspace = true +near-o11y.workspace = true [dev-dependencies] -insta = "1" -near-actix-test-utils = { path = "../../test-utils/actix-test-utils" } +insta.workspace = true +near-actix-test-utils.workspace = true [features] nightly = [] diff --git a/chain/telemetry/Cargo.toml b/chain/telemetry/Cargo.toml index 3b81afedf0f..8bbdd01980c 100644 --- a/chain/telemetry/Cargo.toml +++ b/chain/telemetry/Cargo.toml @@ -15,7 +15,7 @@ serde.workspace = true serde_json.workspace = true tracing.workspace = true -near-o11y = { path = "../../core/o11y" } -near-performance-metrics = { path = "../../utils/near-performance-metrics" } -near-performance-metrics-macros = { path = "../../utils/near-performance-metrics-macros" } -near-primitives = { path = "../../core/primitives" } +near-o11y.workspace = true +near-performance-metrics.workspace = true +near-performance-metrics-macros.workspace = true +near-primitives.workspace = true diff --git a/core/async/Cargo.toml b/core/async/Cargo.toml index ee4abfe9995..e7babf5e5bd 100644 --- a/core/async/Cargo.toml +++ b/core/async/Cargo.toml @@ -19,6 +19,6 @@ serde.workspace = true serde_json.workspace = true tokio.workspace = true -near-primitives = { path = "../primitives" } -near-o11y = { path = "../o11y" } -near-performance-metrics = { path = "../../utils/near-performance-metrics" } \ No newline at end of file +near-primitives.workspace = true +near-o11y.workspace = true +near-performance-metrics.workspace = true diff --git a/core/chain-configs/Cargo.toml b/core/chain-configs/Cargo.toml index 31954c486dd..265186999f3 100644 --- a/core/chain-configs/Cargo.toml +++ b/core/chain-configs/Cargo.toml @@ -22,10 +22,10 @@ sha2.workspace = true smart-default.workspace = true tracing.workspace = true -near-crypto = { path = "../crypto" } -near-o11y = { path = "../o11y" } -near-primitives = { path = "../primitives" } -near-config-utils = { path = "../../utils/config" } +near-crypto.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true +near-config-utils.workspace = true [features] default = [] diff --git a/core/crypto/Cargo.toml b/core/crypto/Cargo.toml index c6d4947f631..b3ac6e3716b 100644 --- a/core/crypto/Cargo.toml +++ b/core/crypto/Cargo.toml @@ -19,19 +19,19 @@ curve25519-dalek.workspace = true derive_more.workspace = true ed25519-dalek.workspace = true hex.workspace = true -near-account-id = { path = "../account-id" } +near-account-id.workspace = true once_cell.workspace = true primitive-types.workspace = true -rand = "0.7" +rand = "0.7" # TODO: this is probably wrong? secp256k1.workspace = true serde.workspace = true serde_json.workspace = true stdx.workspace = true subtle.workspace = true thiserror.workspace = true -near-config-utils = { path = "../../utils/config" } +near-config-utils.workspace = true [dev-dependencies] -hex-literal = "0.2" +hex-literal.workspace = true sha2.workspace = true tempfile.workspace = true diff --git a/core/dyn-configs/Cargo.toml b/core/dyn-configs/Cargo.toml index cc0876aa9cc..1e9c314431b 100644 --- a/core/dyn-configs/Cargo.toml +++ b/core/dyn-configs/Cargo.toml @@ -20,6 +20,6 @@ thiserror.workspace = true tokio.workspace = true tracing.workspace = true -near-chain-configs = { path = "../chain-configs" } -near-o11y = { path = "../o11y" } -near-primitives = { path = "../primitives" } +near-chain-configs.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true diff --git a/core/o11y/Cargo.toml b/core/o11y/Cargo.toml index e040ee07e06..d22aa8c9364 100644 --- a/core/o11y/Cargo.toml +++ b/core/o11y/Cargo.toml @@ -11,8 +11,8 @@ repository = "https://github.com/near/nearcore" description = "Observability helpers for the near codebase" [dependencies] -near-crypto = { path = "../../core/crypto" } -near-primitives-core = { path = "../../core/primitives-core" } +near-crypto.workspace = true +near-primitives-core.workspace = true actix.workspace = true atty.workspace = true diff --git a/core/primitives-core/Cargo.toml b/core/primitives-core/Cargo.toml index 861e7203a9b..7971232b141 100644 --- a/core/primitives-core/Cargo.toml +++ b/core/primitives-core/Cargo.toml @@ -26,7 +26,7 @@ sha2.workspace = true strum.workspace = true thiserror.workspace = true -near-account-id = { path = "../account-id", features = ["arbitrary"] } +near-account-id.workspace = true [dev-dependencies] serde_json.workspace = true diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml index 9c8ea0ec2d6..4629da2bc3d 100644 --- a/core/primitives/Cargo.toml +++ b/core/primitives/Cargo.toml @@ -38,11 +38,11 @@ time.workspace = true tokio.workspace = true tracing.workspace = true -near-crypto = { path = "../crypto" } -near-o11y = { path = "../o11y" } -near-primitives-core = { path = "../primitives-core"} -near-rpc-error-macro = { path = "../../tools/rpctypegen/macro" } -near-vm-errors = { path = "../../runtime/near-vm-errors" } +near-crypto.workspace = true +near-o11y.workspace = true +near-primitives-core.workspace = true +near-rpc-error-macro.workspace = true +near-vm-errors.workspace = true [features] sandbox = [] diff --git a/core/store/Cargo.toml b/core/store/Cargo.toml index 8a47004df90..7718f3f0ae6 100644 --- a/core/store/Cargo.toml +++ b/core/store/Cargo.toml @@ -32,9 +32,9 @@ tempfile.workspace = true thiserror.workspace = true tracing.workspace = true -near-crypto = { path = "../crypto" } -near-o11y = { path = "../o11y" } -near-primitives = { path = "../primitives" } +near-crypto.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true [dev-dependencies] assert_matches.workspace = true diff --git a/genesis-tools/genesis-csv-to-json/Cargo.toml b/genesis-tools/genesis-csv-to-json/Cargo.toml index c48b77d4234..39898ae4ab1 100644 --- a/genesis-tools/genesis-csv-to-json/Cargo.toml +++ b/genesis-tools/genesis-csv-to-json/Cargo.toml @@ -11,11 +11,11 @@ clap.workspace = true csv.workspace = true serde.workspace = true -nearcore = { path = "../../nearcore" } -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-network = { path = "../../chain/network" } +nearcore.workspace = true +near-chain-configs.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-network.workspace = true [dev-dependencies] tempfile.workspace = true diff --git a/genesis-tools/genesis-populate/Cargo.toml b/genesis-tools/genesis-populate/Cargo.toml index c25d8076bf5..721a2c70b5e 100644 --- a/genesis-tools/genesis-populate/Cargo.toml +++ b/genesis-tools/genesis-populate/Cargo.toml @@ -11,13 +11,13 @@ clap.workspace = true indicatif.workspace = true tempfile.workspace = true -nearcore = { path = "../../nearcore" } -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-chain = { path = "../../chain/chain" } -near-test-contracts = { path = "../../runtime/near-test-contracts" } +nearcore.workspace = true +near-chain-configs.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-chain.workspace = true +near-test-contracts.workspace = true [features] protocol_feature_flat_state = [ diff --git a/genesis-tools/keypair-generator/Cargo.toml b/genesis-tools/keypair-generator/Cargo.toml index 1dca466a80b..965066e9efb 100644 --- a/genesis-tools/keypair-generator/Cargo.toml +++ b/genesis-tools/keypair-generator/Cargo.toml @@ -8,5 +8,5 @@ edition.workspace = true [dependencies] clap.workspace = true -nearcore = { path = "../../nearcore" } -near-crypto = { path = "../../core/crypto" } +nearcore.workspace = true +near-crypto.workspace = true diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index eab6572b3d5..73fd6eaa054 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -28,31 +28,31 @@ tokio.workspace = true tracing.workspace = true wat.workspace = true -near-actix-test-utils = { path = "../test-utils/actix-test-utils" } -near-async = { path = "../core/async" } -near-chain = { path = "../chain/chain" } -near-chain-configs = { path = "../core/chain-configs" } -near-chunks = { path = "../chain/chunks" } -near-client = { path = "../chain/client" } -near-client-primitives = { path = "../chain/client-primitives" } -near-crypto = { path = "../core/crypto" } -near-epoch-manager = { path = "../chain/epoch-manager"} -near-jsonrpc = { path = "../chain/jsonrpc" } -near-jsonrpc-client = { path = "../chain/jsonrpc/client" } -near-jsonrpc-primitives = { path = "../chain/jsonrpc-primitives" } -near-network = { path = "../chain/network" } -near-primitives = { path = "../core/primitives" } -near-primitives-core = { path = "../core/primitives-core" } -near-store = { path = "../core/store" } -near-o11y = { path = "../core/o11y" } -near-telemetry = { path = "../chain/telemetry" } -near-test-contracts = { path = "../runtime/near-test-contracts" } -near-performance-metrics = { path = "../utils/near-performance-metrics" } -near-vm-errors = { path = "../runtime/near-vm-errors" } -near-vm-runner = { path = "../runtime/near-vm-runner" } -nearcore = { path = "../nearcore" } -node-runtime = { path = "../runtime/runtime" } -testlib = { path = "../test-utils/testlib" } +near-actix-test-utils.workspace = true +near-async.workspace = true +near-chain.workspace = true +near-chain-configs.workspace = true +near-chunks.workspace = true +near-client.workspace = true +near-client-primitives.workspace = true +near-crypto.workspace = true +near-epoch-manager.workspace = true +near-jsonrpc.workspace = true +near-jsonrpc-client.workspace = true +near-jsonrpc-primitives.workspace = true +near-network.workspace = true +near-primitives.workspace = true +near-primitives-core.workspace = true +near-store.workspace = true +near-o11y.workspace = true +near-telemetry.workspace = true +near-test-contracts.workspace = true +near-performance-metrics.workspace = true +near-vm-errors.workspace = true +near-vm-runner.workspace = true +nearcore.workspace = true +node-runtime.workspace = true +testlib.workspace = true [dev-dependencies] assert_matches.workspace = true diff --git a/nearcore/Cargo.toml b/nearcore/Cargo.toml index f4d09855d0c..b2be4a671b7 100644 --- a/nearcore/Cargo.toml +++ b/nearcore/Cargo.toml @@ -37,38 +37,38 @@ tokio.workspace = true tracing.workspace = true xz2.workspace = true -near-async = { path = "../core/async" } -near-chain = { path = "../chain/chain" } -near-chain-configs = { path = "../core/chain-configs" } -near-chunks = { path = "../chain/chunks" } -near-client = { path = "../chain/client" } -near-client-primitives = {path = "../chain/client-primitives"} -near-crypto = { path = "../core/crypto" } -near-dyn-configs = { path = "../core/dyn-configs" } -near-epoch-manager = { path = "../chain/epoch-manager" } -near-jsonrpc = { path = "../chain/jsonrpc", optional = true } -near-mainnet-res = { path = "../utils/mainnet-res" } -near-network = { path = "../chain/network" } -near-o11y = { path = "../core/o11y" } -near-performance-metrics = { path = "../utils/near-performance-metrics" } -near-pool = { path = "../chain/pool" } -near-primitives = { path = "../core/primitives" } -near-rosetta-rpc = { path = "../chain/rosetta-rpc", optional = true } -near-store = { path = "../core/store" } -near-telemetry = { path = "../chain/telemetry" } -near-vm-runner = { path = "../runtime/near-vm-runner"} -node-runtime = { path = "../runtime/runtime" } -near-config-utils = { path = "../utils/config" } +near-async.workspace = true +near-chain.workspace = true +near-chain-configs.workspace = true +near-chunks.workspace = true +near-client.workspace = true +near-client-primitives.workspace = true +near-crypto.workspace = true +near-dyn-configs.workspace = true +near-epoch-manager.workspace = true +near-jsonrpc = { workspace = true, optional = true } +near-mainnet-res.workspace = true +near-network.workspace = true +near-o11y.workspace = true +near-performance-metrics.workspace = true +near-pool.workspace = true +near-primitives.workspace = true +near-rosetta-rpc = { workspace = true, optional = true } +near-store.workspace = true +near-telemetry.workspace = true +near-vm-runner.workspace = true +node-runtime.workspace = true +near-config-utils.workspace = true -delay-detector = { path = "../tools/delay-detector" } +delay-detector.workspace = true [dev-dependencies] bencher.workspace = true primitive-types.workspace = true -near-actix-test-utils = { path = "../test-utils/actix-test-utils" } -near-jsonrpc-primitives = { path = "../chain/jsonrpc-primitives" } -testlib = { path = "../test-utils/testlib" } +near-actix-test-utils.workspace = true +near-jsonrpc-primitives.workspace = true +testlib.workspace = true [[bench]] name = "store" diff --git a/neard/Cargo.toml b/neard/Cargo.toml index fcfb6137969..0040ada6305 100644 --- a/neard/Cargo.toml +++ b/neard/Cargo.toml @@ -29,25 +29,25 @@ tikv-jemallocator.workspace = true tokio.workspace = true tracing.workspace = true -nearcore = { path = "../nearcore" } -near-amend-genesis = { path = "../tools/amend-genesis" } -near-chain-configs = { path = "../core/chain-configs" } -near-client = { path = "../chain/client" } -near-cold-store-tool = { path = "../tools/cold-store", package = "cold-store-tool" } -near-config-utils = { path = "../utils/config" } -near-crypto = { path = "../core/crypto" } -near-dyn-configs = { path = "../core/dyn-configs" } -near-flat-storage = { path = "../tools/flat-storage" } -near-jsonrpc-primitives = { path = "../chain/jsonrpc-primitives" } -near-mirror = { path = "../tools/mirror" } -near-network = { path = "../chain/network" } -near-o11y = { path = "../core/o11y" } -near-performance-metrics = { path = "../utils/near-performance-metrics" } -near-ping = { path = "../tools/ping" } -near-primitives = { path = "../core/primitives" } -near-state-parts = { path = "../tools/state-parts" } -near-state-viewer = { path = "../tools/state-viewer", package = "state-viewer" } -near-store = { path = "../core/store" } +nearcore.workspace = true +near-amend-genesis.workspace = true +near-chain-configs.workspace = true +near-client.workspace = true +near-cold-store-tool.workspace = true +near-config-utils.workspace = true +near-crypto.workspace = true +near-dyn-configs.workspace = true +near-flat-storage.workspace = true +near-jsonrpc-primitives.workspace = true +near-mirror.workspace = true +near-network.workspace = true +near-o11y.workspace = true +near-performance-metrics.workspace = true +near-ping.workspace = true +near-primitives.workspace = true +near-state-parts.workspace = true +near-state-viewer.workspace = true +near-store.workspace = true [build-dependencies] anyhow.workspace = true diff --git a/runtime/near-test-contracts/Cargo.toml b/runtime/near-test-contracts/Cargo.toml index 203df213533..276e3378d6c 100644 --- a/runtime/near-test-contracts/Cargo.toml +++ b/runtime/near-test-contracts/Cargo.toml @@ -7,12 +7,12 @@ edition = "2021" license = "Apache-2.0" [dependencies] -once_cell = "1.5.0" -wat = "1.0.40" -wasm-encoder = "0.11.0" -wasm-smith = "0.10.0" -rand = { version = "0.8.5", features = ["small_rng"] } -arbitrary = "1.2.3" +once_cell.workspace = true +wat.workspace = true +wasm-encoder.workspace = true +wasm-smith.workspace = true +rand = { workspace = true, features = ["small_rng"] } +arbitrary.workspace = true [features] nightly = [] diff --git a/runtime/near-vm-errors/Cargo.toml b/runtime/near-vm-errors/Cargo.toml index 727a58f95dc..fcdecd9e31d 100644 --- a/runtime/near-vm-errors/Cargo.toml +++ b/runtime/near-vm-errors/Cargo.toml @@ -20,8 +20,8 @@ serde.workspace = true strum.workspace = true thiserror.workspace = true -near-account-id = { path = "../../core/account-id" } -near-rpc-error-macro = { path = "../../tools/rpctypegen/macro" } +near-account-id.workspace = true +near-rpc-error-macro.workspace = true [features] dump_errors_schema = ["near-rpc-error-macro/dump_errors_schema"] diff --git a/runtime/near-vm-logic/Cargo.toml b/runtime/near-vm-logic/Cargo.toml index 31807cfe01f..0003dd41fc0 100644 --- a/runtime/near-vm-logic/Cargo.toml +++ b/runtime/near-vm-logic/Cargo.toml @@ -25,12 +25,12 @@ sha3.workspace = true stdx.workspace = true tracing = { workspace = true, optional = true } -near-crypto = { path = "../../core/crypto" } -near-account-id = { path = "../../core/account-id", features = [ "internal_unstable" ] } -near-o11y = { path = "../../core/o11y" } -near-primitives = { path = "../../core/primitives" } -near-primitives-core = { path = "../../core/primitives-core" } -near-vm-errors = { path = "../near-vm-errors" } +near-crypto.workspace = true +near-account-id.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true +near-primitives-core.workspace = true +near-vm-errors.workspace = true [dev-dependencies] hex.workspace = true diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml index 55183844c8c..9cdc861c9f2 100644 --- a/runtime/near-vm-runner/Cargo.toml +++ b/runtime/near-vm-runner/Cargo.toml @@ -24,32 +24,26 @@ tracing.workspace = true wasmparser.workspace = true wasmtime = { workspace = true, optional = true } -near-cache = { path = "../../utils/near-cache" } -near-vm-logic = { path = "../near-vm-logic", default-features = false } -near-vm-errors = { path = "../near-vm-errors" } -near-primitives = { path = "../../core/primitives" } -near-stable-hasher = { path = "../../utils/near-stable-hasher" } +near-cache.workspace = true +near-vm-logic.workspace = true +near-vm-errors.workspace = true +near-primitives.workspace = true +near-stable-hasher.workspace = true # Old versions of pwasm-utils we need to preserve backwards compatibility under # old protocol versions. -pwasm-utils_12 = { package = "pwasm-utils", version = "0.12" } +pwasm-utils_12.workspace = true parity-wasm_41.workspace = true [target.'cfg(target_arch = "x86_64")'.dependencies] -wasmer-runtime = { version = "0.18.0", features = ["default-backend-singlepass"], default-features = false, package = "wasmer-runtime-near", optional = true } -wasmer-runtime-core = { version = "0.18.2", package = "wasmer-runtime-core-near", optional = true} - -# Use the following for development versions of Wasmer. -# wasmer-types = { package = "wasmer-types-near", git = "https://github.com/near/wasmer", branch = "near-main", optional = true } -# wasmer-compiler-singlepass = { package = "wasmer-compiler-singlepass-near", git = "https://github.com/near/wasmer", branch = "near-main", optional = true } -# wasmer-engine-universal = { package = "wasmer-engine-universal-near", git = "https://github.com/near/wasmer", branch = "near-main", optional = true } -# wasmer-vm = { package = "wasmer-vm-near", git = "https://github.com/near/wasmer", branch = "near-main" } -wasmer-compiler = { package = "wasmer-compiler-near", version = "=2.4.0", optional = true } -wasmer-compiler-singlepass = { package = "wasmer-compiler-singlepass-near", version = "=2.4.0", optional = true } -wasmer-engine = { package = "wasmer-engine-near", version = "=2.4.0", optional = true } -wasmer-engine-universal = { package = "wasmer-engine-universal-near", version = "=2.4.0", optional = true, features = ["compiler"] } -wasmer-types = { package = "wasmer-types-near", version = "=2.4.0", optional = true } -wasmer-vm = { package = "wasmer-vm-near", version = "=2.4.0", optional = true } +wasmer-runtime = { workspace = true, optional = true } +wasmer-runtime-core = { workspace = true, optional = true} +wasmer-compiler = { workspace = true, optional = true } +wasmer-compiler-singlepass = { workspace = true, optional = true } +wasmer-engine = { workspace = true, optional = true } +wasmer-engine-universal = { workspace = true, optional = true } +wasmer-types = { workspace = true, optional = true } +wasmer-vm = { workspace = true, optional = true } [dev-dependencies] arbitrary.workspace = true @@ -62,7 +56,7 @@ wasm-smith.workspace = true wasmprinter.workspace = true wat.workspace = true -near-test-contracts = { path = "../near-test-contracts" } +near-test-contracts.workspace = true [features] # all vms enabled for now diff --git a/runtime/near-vm-runner/fuzz/Cargo.toml b/runtime/near-vm-runner/fuzz/Cargo.toml index 7af39506610..95fdd9f2e04 100644 --- a/runtime/near-vm-runner/fuzz/Cargo.toml +++ b/runtime/near-vm-runner/fuzz/Cargo.toml @@ -14,11 +14,11 @@ libfuzzer-sys.workspace = true wasm-smith.workspace = true wasmprinter.workspace = true -near-primitives = { path = "../../../core/primitives" } -near-test-contracts = { path = "../../near-test-contracts" } -near-vm-errors = { path = "../../near-vm-errors" } -near-vm-logic = { path = "../../near-vm-logic", default-features = false } -near-vm-runner = { path = ".." } +near-primitives.workspace = true +near-test-contracts.workspace = true +near-vm-errors.workspace = true +near-vm-logic.workspace = true +near-vm-runner.workspace = true [[bin]] name = "runner" diff --git a/runtime/near-vm/lib/api/Cargo.toml b/runtime/near-vm/lib/api/Cargo.toml index 7db93f4d0a9..db4a482efb5 100644 --- a/runtime/near-vm/lib/api/Cargo.toml +++ b/runtime/near-vm/lib/api/Cargo.toml @@ -17,36 +17,37 @@ name = "wasmer" # Shared dependencies. [dependencies] # - Mandatory shared dependencies. -cfg-if = "1.0" -finite-wasm = "0.3.0" -indexmap = { version = "1.6" } -more-asserts = "0.2" -prefix-sum-vec = "0.1.2" -thiserror = "1.0" -tracing = "0.1" +cfg-if.workspace = true +finite-wasm.workspace = true +indexmap.workspace = true +more-asserts.workspace = true +prefix-sum-vec.workspace = true +thiserror.workspace = true +tracing.workspace = true # - Optional shared dependencies. -wat = { version = "1.0", optional = true } +wat = { workspace = true, optional = true } # Dependencies and Development Dependencies for `sys`. [target.'cfg(not(target_arch = "wasm32"))'.dependencies] # - Mandatory dependencies for `sys`. +# TODO: properly finish crate renaming and hoist dep to workspace (#8834) wasmer-vm = { path = "../vm", package = "near-vm-vm" } wasmer-compiler = { path = "../compiler", package = "near-vm-compiler" } wasmer-engine = { path = "../engine", package = "near-vm-engine" } wasmer-types = { path = "../types", package = "near-vm-types" } -target-lexicon = { version = "0.12.2", default-features = false } +target-lexicon.workspace = true # - Optional dependencies for `sys`. wasmer-compiler-singlepass = { path = "../compiler-singlepass", package = "near-vm-compiler-singlepass", optional = true} wasmer-engine-universal = { path = "../engine-universal", package = "near-vm-engine-universal", optional = true } # - Mandatory dependencies for `sys` on Windows. [target.'cfg(all(not(target_arch = "wasm32"), target_os = "windows"))'.dependencies] -winapi = "0.3" +winapi.workspace = true # - Development Dependencies for `sys`. [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -wat = "1.0" -tempfile = "3.1" -anyhow = "1.0" +anyhow.workspace = true +tempfile.workspace = true +wat.workspace = true [badges] maintenance = { status = "actively-developed" } diff --git a/runtime/near-vm/lib/compiler-singlepass/Cargo.toml b/runtime/near-vm/lib/compiler-singlepass/Cargo.toml index ddbd8a1e6f8..9413b4be1e6 100644 --- a/runtime/near-vm/lib/compiler-singlepass/Cargo.toml +++ b/runtime/near-vm/lib/compiler-singlepass/Cargo.toml @@ -16,25 +16,25 @@ publish = false name = "wasmer_compiler_singlepass" [dependencies] -finite-wasm = "0.3.0" +finite-wasm.workspace = true wasmer-compiler = { path = "../compiler", package = "near-vm-compiler", features = ["translator"], default-features = false } wasmer-vm = { path = "../vm", package = "near-vm-vm" } wasmer-types = { path = "../types", package = "near-vm-types", default-features = false, features = ["std"] } -byteorder = "1.3" -dynasm = "1.0" -dynasmrt = "1.0" -enumset = "1.0" -hashbrown = { version = "0.11", optional = true } -lazy_static = "1.4" -memoffset = "0.6" -more-asserts = "0.2" -rayon = { version = "1.5", optional = true } -smallvec = "1.6" -strum = { version = "0.24", features = ["derive"] } -tracing = "0.1" +byteorder.workspace = true +dynasm.workspace = true +dynasmrt.workspace = true +enumset.workspace = true +hashbrown = { workspace = true, optional = true } +lazy_static.workspace = true +memoffset.workspace = true +more-asserts.workspace = true +rayon = { workspace = true, optional = true } +smallvec.workspace = true +strum.workspace = true +tracing.workspace = true [dev-dependencies] -target-lexicon = { version = "0.12.2", default-features = false } +target-lexicon.workspace = true [badges] maintenance = { status = "actively-developed" } diff --git a/runtime/near-vm/lib/compiler/Cargo.toml b/runtime/near-vm/lib/compiler/Cargo.toml index 3992c263f92..19546502185 100644 --- a/runtime/near-vm/lib/compiler/Cargo.toml +++ b/runtime/near-vm/lib/compiler/Cargo.toml @@ -15,17 +15,17 @@ publish = false name = "wasmer_compiler" [dependencies] -finite-wasm = "0.3.0" +finite-wasm.workspace = true wasmer-vm = { path = "../vm", package = "near-vm-vm" } wasmer-types = { path = "../types", package = "near-vm-types", default-features = false } wasmparser = { version = "0.99.0", optional = true, default-features = false } -target-lexicon = { version = "0.12.2", default-features = false } -enumset = "1.0" -hashbrown = { version = "0.11", optional = true } -thiserror = "1.0" -smallvec = "1.6" -rkyv = { version = "0.7.20" } -tracing = "0.1" +target-lexicon.workspace = true +enumset.workspace = true +hashbrown = { workspace = true, optional = true } +thiserror.workspace = true +smallvec.workspace = true +rkyv.workspace = true +tracing.workspace = true [features] default = ["std" ] diff --git a/runtime/near-vm/lib/engine-universal/Cargo.toml b/runtime/near-vm/lib/engine-universal/Cargo.toml index 6d1d5cd1a6c..a922a66189a 100644 --- a/runtime/near-vm/lib/engine-universal/Cargo.toml +++ b/runtime/near-vm/lib/engine-universal/Cargo.toml @@ -15,25 +15,24 @@ publish = false name = "wasmer_engine_universal" [dependencies] -finite-wasm = "0.3.0" +finite-wasm.workspace = true wasmer-compiler = { path = "../compiler", package = "near-vm-compiler", features = ["translator"] } wasmer-engine = { path = "../engine", package = "near-vm-engine" } wasmer-types = { path = "../types", package = "near-vm-types" } wasmer-vm = { path = "../vm", package = "near-vm-vm" } -cfg-if = "1.0" -enumset = "1.0" -# flexbuffers = { path = "../../../flatbuffers/rust/flexbuffers", version = "0.1.0" } -leb128 = "0.2" -prefix-sum-vec = "0.1.1" -region = "3.0" -rkyv = "0.7.31" -thiserror = "1" -tracing = "0.1" +cfg-if.workspace = true +enumset.workspace = true +leb128.workspace = true +prefix-sum-vec.workspace = true +region.workspace = true +rkyv.workspace = true +thiserror.workspace = true +tracing.workspace = true wasmparser = "0.99.0" [target.'cfg(target_os = "windows")'.dependencies] -winapi = { version = "0.3", features = ["winnt", "impl-default"] } +winapi.workspace = true [features] # Enable the `compiler` feature if you want the engine to compile diff --git a/runtime/near-vm/lib/engine/Cargo.toml b/runtime/near-vm/lib/engine/Cargo.toml index d751a5d1d65..a3292073151 100644 --- a/runtime/near-vm/lib/engine/Cargo.toml +++ b/runtime/near-vm/lib/engine/Cargo.toml @@ -15,19 +15,18 @@ publish = false name = "wasmer_engine" [dependencies] -finite-wasm = "0.3.0" +finite-wasm.workspace = true wasmer-types = { path = "../types", package = "near-vm-types" } wasmer-compiler = { path = "../compiler", package = "near-vm-compiler" } wasmer-vm = { path = "../vm", package = "near-vm-vm" } -target-lexicon = { version = "0.12.2", default-features = false } -# flexbuffers = { path = "../../../flatbuffers/rust/flexbuffers", version = "0.1.0" } -backtrace = "0.3" -rustc-demangle = "0.1" -memmap2 = "0.5" -more-asserts = "0.2" -thiserror = "1.0" -lazy_static = "1.4" -enumset = "1.0" +target-lexicon.workspace = true +backtrace.workspace = true +rustc-demangle.workspace = true +memmap2.workspace = true +more-asserts.workspace = true +thiserror.workspace = true +lazy_static.workspace = true +enumset.workspace = true [badges] maintenance = { status = "actively-developed" } diff --git a/runtime/near-vm/lib/types/Cargo.toml b/runtime/near-vm/lib/types/Cargo.toml index c4f2aab04a1..e2ecdfbad95 100644 --- a/runtime/near-vm/lib/types/Cargo.toml +++ b/runtime/near-vm/lib/types/Cargo.toml @@ -15,10 +15,10 @@ publish = false name = "wasmer_types" [dependencies] -thiserror = "1.0" -indexmap = { version = "1.6" } -num-traits = "0.2.15" -rkyv = { version = "0.7.20" } +thiserror.workspace = true +indexmap.workspace = true +num-traits.workspace = true +rkyv.workspace = true [dev-dependencies] bolero.workspace = true diff --git a/runtime/near-vm/lib/vm/Cargo.toml b/runtime/near-vm/lib/vm/Cargo.toml index 9ca94d87867..3d678360685 100644 --- a/runtime/near-vm/lib/vm/Cargo.toml +++ b/runtime/near-vm/lib/vm/Cargo.toml @@ -15,25 +15,25 @@ publish = false name = "wasmer_vm" [dependencies] -backtrace = "0.3" -cfg-if = "1.0" -finite-wasm = "0.3.0" -indexmap = { version = "1.6" } -libc = { version = "^0.2", default-features = false } -memoffset = "0.6" -more-asserts = "0.2" -region = "3.0" -rkyv = { version = "0.7.20" } -thiserror = "1.0" -tracing = "0.1" +backtrace.workspace = true +cfg-if.workspace = true +finite-wasm.workspace = true +indexmap.workspace = true +libc.workspace = true +memoffset.workspace = true +more-asserts.workspace = true +region.workspace = true +rkyv.workspace = true +thiserror.workspace = true +tracing.workspace = true wasmer-types = { path = "../types", package = "near-vm-types" } wasmparser = "0.99.0" [target.'cfg(target_os = "windows")'.dependencies] -winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi"] } +winapi.workspace = true [build-dependencies] -cc = "1.0" +cc.workspace = true [badges] maintenance = { status = "actively-developed" } diff --git a/runtime/near-vm/tests/lib/compiler-test-derive/Cargo.toml b/runtime/near-vm/tests/lib/compiler-test-derive/Cargo.toml index b54d865d6d9..1683f3138da 100644 --- a/runtime/near-vm/tests/lib/compiler-test-derive/Cargo.toml +++ b/runtime/near-vm/tests/lib/compiler-test-derive/Cargo.toml @@ -13,12 +13,12 @@ categories = ["rust-patterns"] publish = false [dependencies] -proc-macro2 = "1.*" -quote = "1.*" -syn = { version = "1.*", features = ["full"] } +proc-macro2.workspace = true +quote.workspace = true +syn.workspace = true [features] [dev-dependencies] -pretty_assertions = "1.0" -trybuild = "1.0.11" +pretty_assertions.workspace = true +trybuild.workspace = true diff --git a/runtime/near-vm/tests/lib/test-generator/Cargo.toml b/runtime/near-vm/tests/lib/test-generator/Cargo.toml index 4fbf641fd9f..1df7885e25e 100644 --- a/runtime/near-vm/tests/lib/test-generator/Cargo.toml +++ b/runtime/near-vm/tests/lib/test-generator/Cargo.toml @@ -7,8 +7,8 @@ publish = false license = "Apache-2.0 WITH LLVM-exception" [dependencies] -anyhow = "1.0" -target-lexicon = "0.12" +anyhow.workspace = true +target-lexicon.workspace = true [features] test-dylib = [] diff --git a/runtime/near-vm/tests/lib/wast/Cargo.toml b/runtime/near-vm/tests/lib/wast/Cargo.toml index 80f32a34d57..2c6eae951d4 100644 --- a/runtime/near-vm/tests/lib/wast/Cargo.toml +++ b/runtime/near-vm/tests/lib/wast/Cargo.toml @@ -12,11 +12,11 @@ edition = "2021" publish = false [dependencies] -anyhow = "1.0" +anyhow.workspace = true wasmer = { path = "../../../lib/api", package = "near-vm", default-features = false } -wast = "40.0" -tempfile = "3" -thiserror = "1.0" +wast.workspace = true +tempfile.workspace = true +thiserror.workspace = true [features] default = ["wat"] diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml index 5a02a916ff4..56a0e7d37bf 100644 --- a/runtime/runtime-params-estimator/Cargo.toml +++ b/runtime/runtime-params-estimator/Cargo.toml @@ -33,17 +33,17 @@ tracing-subscriber.workspace = true tracing.workspace = true wat.workspace = true -genesis-populate = { path = "../../genesis-tools/genesis-populate"} -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-o11y = { path = "../../core/o11y" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-test-contracts = { path = "../near-test-contracts" } -near-vm-logic = {path = "../../runtime/near-vm-logic" } -near-vm-runner = {path = "../../runtime/near-vm-runner" } -nearcore = { path = "../../nearcore" } -node-runtime = { path = "../../runtime/runtime" } +genesis-populate.workspace = true +near-chain-configs.workspace = true +near-crypto.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-test-contracts.workspace = true +near-vm-logic.workspace = true +near-vm-runner.workspace = true +nearcore.workspace = true +node-runtime.workspace = true [dev-dependencies] insta.workspace = true diff --git a/runtime/runtime/Cargo.toml b/runtime/runtime/Cargo.toml index 39a55e42fa5..6306e2933e2 100644 --- a/runtime/runtime/Cargo.toml +++ b/runtime/runtime/Cargo.toml @@ -21,14 +21,14 @@ sha2.workspace = true thiserror.workspace = true tracing.workspace = true -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-o11y = { path = "../../core/o11y" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-vm-errors = { path = "../../runtime/near-vm-errors" } -near-vm-logic = { path = "../../runtime/near-vm-logic" } -near-vm-runner = { path = "../../runtime/near-vm-runner" } +near-chain-configs.workspace = true +near-crypto.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-vm-errors.workspace = true +near-vm-logic.workspace = true +near-vm-runner.workspace = true [features] default = [] @@ -52,7 +52,7 @@ rayon.workspace = true serde_json.workspace = true tempfile.workspace = true -near-chain-configs = { path = "../../core/chain-configs" } -near-store = { path = "../../core/store", features = ["test_features"] } -near-test-contracts = { path = "../../runtime/near-test-contracts" } -testlib = { path = "../../test-utils/testlib" } +near-chain-configs.workspace = true +near-store = { workspace = true, features = ["test_features"] } +near-test-contracts.workspace = true +testlib.workspace = true diff --git a/test-utils/actix-test-utils/Cargo.toml b/test-utils/actix-test-utils/Cargo.toml index 026aaf1de03..d956ab7ac50 100644 --- a/test-utils/actix-test-utils/Cargo.toml +++ b/test-utils/actix-test-utils/Cargo.toml @@ -10,4 +10,4 @@ actix-rt.workspace = true futures.workspace = true once_cell.workspace = true -near-store = { path = "../../core/store" } +near-store.workspace = true diff --git a/test-utils/logger/Cargo.toml b/test-utils/logger/Cargo.toml index 5e442db42f4..dd0493f1700 100644 --- a/test-utils/logger/Cargo.toml +++ b/test-utils/logger/Cargo.toml @@ -7,4 +7,4 @@ edition.workspace = true [dependencies] tracing.workspace = true -near-o11y = { path = "../../core/o11y" } +near-o11y.workspace = true diff --git a/test-utils/runtime-tester/Cargo.toml b/test-utils/runtime-tester/Cargo.toml index 3dbc9839df5..3c2e9352f92 100644 --- a/test-utils/runtime-tester/Cargo.toml +++ b/test-utils/runtime-tester/Cargo.toml @@ -13,17 +13,17 @@ serde_json.workspace = true tempfile.workspace = true tracing.workspace = true -near-chain = { path = "../../chain/chain" } -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-client = { path = "../../chain/client" } -near-client-primitives = { path = "../../chain/client-primitives" } -near-epoch-manager = { path = "../../chain/epoch-manager" } -nearcore = { path = "../../nearcore" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-o11y = { path = "../../core/o11y" } -near-test-contracts = { path = "../../runtime/near-test-contracts" } +near-chain.workspace = true +near-chain-configs.workspace = true +near-crypto.workspace = true +near-client.workspace = true +near-client-primitives.workspace = true +near-epoch-manager.workspace = true +nearcore.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-o11y.workspace = true +near-test-contracts.workspace = true [dev-dependencies] -testlib = { path = "../testlib" } +testlib.workspace = true diff --git a/test-utils/runtime-tester/fuzz/Cargo.toml b/test-utils/runtime-tester/fuzz/Cargo.toml index ac77e45bf25..907be5068c7 100644 --- a/test-utils/runtime-tester/fuzz/Cargo.toml +++ b/test-utils/runtime-tester/fuzz/Cargo.toml @@ -11,9 +11,7 @@ cargo-fuzz = true [dependencies] libfuzzer-sys.workspace = true serde_json.workspace = true - -[dependencies.runtime-tester] -path = ".." +runtime-tester.workspace = true [[bin]] name = "runtime_fuzzer" diff --git a/test-utils/store-validator/Cargo.toml b/test-utils/store-validator/Cargo.toml index 901e43794f3..c221b6c34a4 100644 --- a/test-utils/store-validator/Cargo.toml +++ b/test-utils/store-validator/Cargo.toml @@ -9,14 +9,14 @@ edition.workspace = true ansi_term.workspace = true clap.workspace = true -near-chain-configs = { path = "../../core/chain-configs" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -near-o11y = { path = "../../core/o11y" } -near-chain = { path = "../../chain/chain" } -nearcore = { path = "../../nearcore" } +near-chain-configs.workspace = true +near-primitives.workspace = true +near-store.workspace = true +near-o11y.workspace = true +near-chain.workspace = true +nearcore.workspace = true [dev-dependencies] -testlib = { path = "../../test-utils/testlib" } +testlib.workspace = true serde_json.workspace = true -near-client = { path = "../../chain/client" } +near-client.workspace = true diff --git a/test-utils/testlib/Cargo.toml b/test-utils/testlib/Cargo.toml index d9208dbe410..9f2a4629f43 100644 --- a/test-utils/testlib/Cargo.toml +++ b/test-utils/testlib/Cargo.toml @@ -8,12 +8,12 @@ edition.workspace = true [dependencies] once_cell.workspace = true -near-chain-configs = { path = "../../core/chain-configs" } -near-chain = { path = "../../chain/chain" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-test-contracts = { path = "../../runtime/near-test-contracts" } -node-runtime = { path = "../../runtime/runtime" } +near-chain-configs.workspace = true +near-chain.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-test-contracts.workspace = true +node-runtime.workspace = true [features] default = [] diff --git a/tools/amend-genesis/Cargo.toml b/tools/amend-genesis/Cargo.toml index 539b9d7926f..5b76dc9a1f3 100644 --- a/tools/amend-genesis/Cargo.toml +++ b/tools/amend-genesis/Cargo.toml @@ -15,14 +15,14 @@ serde_json.workspace = true tempfile.workspace = true tracing.workspace = true -near-chain = { path = "../../chain/chain" } -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-epoch-manager = { path = "../../chain/epoch-manager" } -near-network = { path = "../../chain/network" } -near-primitives = { path = "../../core/primitives" } -near-primitives-core = { path = "../../core/primitives-core" } -near-store = { path = "../../core/store" } -near-test-contracts = { path = "../../runtime/near-test-contracts" } -nearcore = { path = "../../nearcore" } -node-runtime = { path = "../../runtime/runtime" } +near-chain.workspace = true +near-chain-configs.workspace = true +near-crypto.workspace = true +near-epoch-manager.workspace = true +near-network.workspace = true +near-primitives.workspace = true +near-primitives-core.workspace = true +near-store.workspace = true +near-test-contracts.workspace = true +nearcore.workspace = true +node-runtime.workspace = true diff --git a/tools/chainsync-loadtest/Cargo.toml b/tools/chainsync-loadtest/Cargo.toml index c6840d89e46..adadbe45a1e 100644 --- a/tools/chainsync-loadtest/Cargo.toml +++ b/tools/chainsync-loadtest/Cargo.toml @@ -23,11 +23,11 @@ parking_lot.workspace = true rand.workspace = true tokio.workspace = true -near-async = { path = "../../core/async" } -near-chain-configs = { path = "../../core/chain-configs" } -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -nearcore = { path = "../../nearcore" } -near-network = { path = "../../chain/network" } -near-o11y = { path = "../../core/o11y" } +near-async.workspace = true +near-chain-configs.workspace = true +near-crypto.workspace = true +near-primitives.workspace = true +near-store.workspace = true +nearcore.workspace = true +near-network.workspace = true +near-o11y.workspace = true diff --git a/tools/cold-store/Cargo.toml b/tools/cold-store/Cargo.toml index 40a6e0ce392..0da2fa2dad7 100644 --- a/tools/cold-store/Cargo.toml +++ b/tools/cold-store/Cargo.toml @@ -12,8 +12,8 @@ rand.workspace = true strum.workspace = true tracing.workspace = true -nearcore = { path = "../../nearcore"} -near-chain-configs = { path = "../../core/chain-configs"} -near-epoch-manager = { path = "../../chain/epoch-manager" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store"} +nearcore.workspace = true +near-chain-configs.workspace = true +near-epoch-manager.workspace = true +near-primitives.workspace = true +near-store.workspace = true diff --git a/tools/flat-storage/Cargo.toml b/tools/flat-storage/Cargo.toml index 29c1d66e07b..32bf6084c61 100644 --- a/tools/flat-storage/Cargo.toml +++ b/tools/flat-storage/Cargo.toml @@ -11,15 +11,15 @@ borsh.workspace = true clap.workspace = true rayon.workspace = true -tqdm = "0.4.4" +tqdm.workspace = true -near-chain = { path = "../../chain/chain" } -near-chain-configs = { path = "../../core/chain-configs" } +near-chain.workspace = true +near-chain-configs.workspace = true -near-epoch-manager = { path = "../../chain/epoch-manager" } -near-primitives = { path = "../../core/primitives" } -near-store = { path = "../../core/store" } -nearcore = { path = "../../nearcore" } +near-epoch-manager.workspace = true +near-primitives.workspace = true +near-store.workspace = true +nearcore.workspace = true [features] protocol_feature_flat_state = [ diff --git a/tools/indexer/example/Cargo.toml b/tools/indexer/example/Cargo.toml index 871e4ce708b..869247199f4 100644 --- a/tools/indexer/example/Cargo.toml +++ b/tools/indexer/example/Cargo.toml @@ -14,5 +14,5 @@ serde_json.workspace = true tokio.workspace = true tracing.workspace = true -near-indexer = { path = "../../../chain/indexer" } -near-o11y = { path = "../../../core/o11y" } +near-indexer.workspace = true +near-o11y.workspace = true diff --git a/tools/mirror/Cargo.toml b/tools/mirror/Cargo.toml index 2fa9da3aa24..fdbfddf1f38 100644 --- a/tools/mirror/Cargo.toml +++ b/tools/mirror/Cargo.toml @@ -28,18 +28,18 @@ thiserror.workspace = true tokio.workspace = true tracing.workspace = true -nearcore = { path = "../../nearcore" } -near-chain-configs = { path = "../../core/chain-configs" } -near-chain = { path = "../../chain/chain" } -near-chain-primitives = { path = "../../chain/chain-primitives" } -near-client = { path = "../../chain/client" } -near-client-primitives = { path = "../../chain/client-primitives" } -near-epoch-manager = { path = "../../chain/epoch-manager" } -near-indexer-primitives = { path = "../../chain/indexer-primitives" } -near-indexer = { path = "../../chain/indexer" } -near-network = { path = "../../chain/network" } -near-primitives = { path = "../../core/primitives" } -near-primitives-core = { path = "../../core/primitives-core" } -near-o11y = { path = "../../core/o11y" } -near-store = { path = "../../core/store" } -near-crypto = { path = "../../core/crypto" } +nearcore.workspace = true +near-chain-configs.workspace = true +near-chain.workspace = true +near-chain-primitives.workspace = true +near-client.workspace = true +near-client-primitives.workspace = true +near-epoch-manager.workspace = true +near-indexer-primitives.workspace = true +near-indexer.workspace = true +near-network.workspace = true +near-primitives.workspace = true +near-primitives-core.workspace = true +near-o11y.workspace = true +near-store.workspace = true +near-crypto.workspace = true diff --git a/tools/mock-node/Cargo.toml b/tools/mock-node/Cargo.toml index e088be38094..8da728dee03 100644 --- a/tools/mock-node/Cargo.toml +++ b/tools/mock-node/Cargo.toml @@ -19,22 +19,22 @@ tempfile.workspace = true tokio.workspace = true tracing.workspace = true -near-actix-test-utils = { path = "../../test-utils/actix-test-utils" } -near-async = { path = "../../core/async" } -near-chain = { path = "../../chain/chain" } -near-chain-configs = { path = "../../core/chain-configs" } -near-client = { path = "../../chain/client" } -near-crypto = { path = "../../core/crypto" } -near-chunks = { path = "../../chain/chunks" } -near-epoch-manager = { path = "../../chain/epoch-manager"} -near-jsonrpc = { path = "../../chain/jsonrpc" } -near-network = { path = "../../chain/network" } -near-store = { path = "../../core/store" } -near-o11y = { path = "../../core/o11y" } -near-telemetry = { path = "../../chain/telemetry" } -near-performance-metrics = { path = "../../utils/near-performance-metrics" } -near-primitives = { path = "../../core/primitives" } -nearcore = { path = "../../nearcore" } +near-actix-test-utils.workspace = true +near-async.workspace = true +near-chain.workspace = true +near-chain-configs.workspace = true +near-client.workspace = true +near-crypto.workspace = true +near-chunks.workspace = true +near-epoch-manager.workspace = true +near-jsonrpc.workspace = true +near-network.workspace = true +near-store.workspace = true +near-o11y.workspace = true +near-telemetry.workspace = true +near-performance-metrics.workspace = true +near-primitives.workspace = true +nearcore.workspace = true [[bin]] name = "mock-node" diff --git a/tools/ping/Cargo.toml b/tools/ping/Cargo.toml index a49063c744a..b7fbbb4a75b 100644 --- a/tools/ping/Cargo.toml +++ b/tools/ping/Cargo.toml @@ -15,7 +15,7 @@ prometheus.workspace = true tokio.workspace = true tracing.workspace = true -near-jsonrpc = { path = "../../chain/jsonrpc" } -near-network = { path = "../../chain/network" } -near-o11y = { path = "../../core/o11y" } -near-primitives = { path = "../../core/primitives" } +near-jsonrpc.workspace = true +near-network.workspace = true +near-o11y.workspace = true +near-primitives.workspace = true diff --git a/tools/restaked/Cargo.toml b/tools/restaked/Cargo.toml index b0108e2884b..8dee4388c15 100644 --- a/tools/restaked/Cargo.toml +++ b/tools/restaked/Cargo.toml @@ -9,13 +9,13 @@ edition.workspace = true clap.workspace = true tokio.workspace = true -near-crypto = { path = "../../core/crypto" } -near-primitives = { path = "../../core/primitives" } -near-jsonrpc-client = { path = "../../chain/jsonrpc/client" } -nearcore = { path = "../../nearcore" } -near-o11y = { path = "../../core/o11y" } +near-crypto.workspace = true +near-primitives.workspace = true +near-jsonrpc-client.workspace = true +nearcore.workspace = true +near-o11y.workspace = true -integration-tests = { path = "../../integration-tests" } +integration-tests.workspace = true [features] test_features = ["integration-tests/test_features"] diff --git a/tools/rpctypegen/macro/Cargo.toml b/tools/rpctypegen/macro/Cargo.toml index 8cc2649355c..82e56e55af8 100644 --- a/tools/rpctypegen/macro/Cargo.toml +++ b/tools/rpctypegen/macro/Cargo.toml @@ -21,7 +21,7 @@ serde_json = { workspace = true, optional = true, features = ["preserve_order"] syn.workspace = true fs2.workspace = true -near-rpc-error-core = { path = "../core" } +near-rpc-error-core.workspace = true [features] test = [] diff --git a/tools/speedy_sync/Cargo.toml b/tools/speedy_sync/Cargo.toml index e82b200aa50..f9055660f83 100644 --- a/tools/speedy_sync/Cargo.toml +++ b/tools/speedy_sync/Cargo.toml @@ -9,15 +9,15 @@ edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -near-store = { path = "../../core/store" } -near-chain-primitives = { path = "../../chain/chain-primitives" } -near-primitives = { path = "../../core/primitives" } -nearcore = { path = "../../nearcore" } -near-chain-configs = { path = "../../core/chain-configs" } -near-chain = { path = "../../chain/chain"} -near-epoch-manager = {path = "../../chain/epoch-manager" } +near-store.workspace = true +near-chain-primitives.workspace = true +near-primitives.workspace = true +nearcore.workspace = true +near-chain-configs.workspace = true +near-chain.workspace = true +near-epoch-manager.workspace = true -borsh = "0.10.2" -serde = { version = "1.0.137", features = ["derive"] } -serde_json = "1.0.81" -clap = { version = "3.1.6", features = ["derive"] } +borsh.workspace = true +serde.workspace = true +serde_json.workspace = true +clap.workspace = true diff --git a/tools/state-parts/Cargo.toml b/tools/state-parts/Cargo.toml index 9eb57ba588d..772408484f6 100644 --- a/tools/state-parts/Cargo.toml +++ b/tools/state-parts/Cargo.toml @@ -13,8 +13,8 @@ once_cell.workspace = true tokio.workspace = true tracing.workspace = true -near-jsonrpc = { path = "../../chain/jsonrpc" } -near-network = { path = "../../chain/network" } -near-o11y = { path = "../../core/o11y" } -near-ping = { path = "../ping" } -near-primitives = { path = "../../core/primitives" } +near-jsonrpc.workspace = true +near-network.workspace = true +near-o11y.workspace = true +near-ping.workspace = true +near-primitives.workspace = true diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml index a0ca108a5da..d294750861a 100644 --- a/tools/state-viewer/Cargo.toml +++ b/tools/state-viewer/Cargo.toml @@ -23,22 +23,22 @@ tempfile.workspace = true thiserror.workspace = true tracing.workspace = true -near-chain = { path = "../../chain/chain" } -near-chain-configs = { path = "../../core/chain-configs" } -near-client = { path = "../../chain/client" } -near-crypto = { path = "../../core/crypto" } -near-epoch-manager = { path = "../../chain/epoch-manager" } -near-network = { path = "../../chain/network" } -near-primitives = { path = "../../core/primitives" } -near-primitives-core = { path = "../../core/primitives-core" } -near-store = { path = "../../core/store" } -near-test-contracts = { path = "../../runtime/near-test-contracts" } -nearcore = { path = "../../nearcore" } -node-runtime = { path = "../../runtime/runtime" } +near-chain.workspace = true +near-chain-configs.workspace = true +near-client.workspace = true +near-crypto.workspace = true +near-epoch-manager.workspace = true +near-network.workspace = true +near-primitives.workspace = true +near-primitives-core.workspace = true +near-store.workspace = true +near-test-contracts.workspace = true +nearcore.workspace = true +node-runtime.workspace = true [dev-dependencies] -near-client = { path = "../../chain/client" } -testlib = { path = "../../test-utils/testlib" } +near-client.workspace = true +testlib.workspace = true insta.workspace = true [features] diff --git a/tools/storage-usage-delta-calculator/Cargo.toml b/tools/storage-usage-delta-calculator/Cargo.toml index 46c69aa88b1..bc8cbc133b8 100644 --- a/tools/storage-usage-delta-calculator/Cargo.toml +++ b/tools/storage-usage-delta-calculator/Cargo.toml @@ -13,7 +13,7 @@ serde_json.workspace = true tokio.workspace = true tracing.workspace = true -near-chain-configs = { path = "../../core/chain-configs" } -near-primitives = { path = "../../core/primitives" } -node-runtime = { path = "../../runtime/runtime" } -near-o11y = { path = "../../core/o11y" } +near-chain-configs.workspace = true +near-primitives.workspace = true +node-runtime.workspace = true +near-o11y.workspace = true diff --git a/utils/mainnet-res/Cargo.toml b/utils/mainnet-res/Cargo.toml index bbd18617415..b7760add842 100644 --- a/utils/mainnet-res/Cargo.toml +++ b/utils/mainnet-res/Cargo.toml @@ -10,6 +10,6 @@ publish = false [dependencies] serde_json.workspace = true -near-account-id = { path = "../../core/account-id" } -near-chain-configs = { path = "../../core/chain-configs" } -near-primitives = { path = "../../core/primitives" } +near-account-id.workspace = true +near-chain-configs.workspace = true +near-primitives.workspace = true