From 1629a7e08130b848aa5d183517bb080c8b3c5b64 Mon Sep 17 00:00:00 2001 From: Miraculous Owonubi Date: Mon, 15 May 2023 09:24:56 +0100 Subject: [PATCH 1/2] fix publish pipeline --- Cargo.lock | 16 +++----- Cargo.toml | 41 +++++++++---------- chain/chain-primitives/Cargo.toml | 11 +++-- chain/chain/Cargo.toml | 4 +- chain/chunks-primitives/Cargo.toml | 11 +++-- chain/chunks/Cargo.toml | 7 +++- chain/client-primitives/Cargo.toml | 13 +++--- chain/client/Cargo.toml | 7 +++- chain/epoch-manager/Cargo.toml | 8 ++-- chain/indexer-primitives/Cargo.toml | 11 +++-- chain/indexer/Cargo.toml | 7 +++- .../jsonrpc-adversarial-primitives/Cargo.toml | 7 +++- chain/jsonrpc-primitives/Cargo.toml | 13 +++--- chain/jsonrpc/Cargo.toml | 7 +++- chain/jsonrpc/client/Cargo.toml | 7 +++- chain/jsonrpc/fuzz/Cargo.toml | 7 +++- chain/jsonrpc/jsonrpc-tests/Cargo.toml | 7 +++- chain/network/Cargo.toml | 5 ++- chain/pool/Cargo.toml | 8 ++-- chain/rosetta-rpc/Cargo.toml | 9 ++-- chain/telemetry/Cargo.toml | 7 +++- core/account-id/Cargo.toml | 14 +++---- core/account-id/fuzz/Cargo.toml | 8 ++-- core/async/Cargo.toml | 10 ++--- core/chain-configs/Cargo.toml | 11 +++-- core/crypto/Cargo.toml | 11 +++-- core/dyn-configs/Cargo.toml | 11 +++-- core/o11y/Cargo.toml | 11 +++-- core/primitives-core/Cargo.toml | 15 +++---- core/primitives/Cargo.toml | 15 +++---- core/store/Cargo.toml | 8 ++-- deny.toml | 7 +--- genesis-tools/genesis-csv-to-json/Cargo.toml | 7 +++- genesis-tools/genesis-populate/Cargo.toml | 7 +++- genesis-tools/keypair-generator/Cargo.toml | 7 +++- integration-tests/Cargo.toml | 7 +++- nearcore/Cargo.toml | 7 +++- neard/Cargo.toml | 8 ++-- runtime/near-test-contracts/Cargo.toml | 16 +++----- runtime/near-vm-errors/Cargo.toml | 16 +++----- runtime/near-vm-logic/Cargo.toml | 16 +++----- runtime/near-vm-runner/Cargo.toml | 18 ++++---- runtime/near-vm-runner/fuzz/Cargo.toml | 7 +++- runtime/near-vm/api/Cargo.toml | 4 +- .../near-vm/compiler-singlepass/Cargo.toml | 4 +- .../near-vm/compiler-test-derive/Cargo.toml | 2 +- runtime/near-vm/compiler/Cargo.toml | 4 +- runtime/near-vm/engine-universal/Cargo.toml | 4 +- runtime/near-vm/engine/Cargo.toml | 4 +- runtime/near-vm/test-generator/Cargo.toml | 2 +- runtime/near-vm/types/Cargo.toml | 4 +- runtime/near-vm/vm/Cargo.toml | 4 +- runtime/near-vm/wast/Cargo.toml | 4 +- runtime/runtime-params-estimator/Cargo.toml | 7 +++- .../estimator-warehouse/Cargo.toml | 9 ++-- runtime/runtime/Cargo.toml | 8 ++-- test-utils/actix-test-utils/Cargo.toml | 7 +++- test-utils/logger/Cargo.toml | 7 +++- test-utils/runtime-tester/Cargo.toml | 7 +++- test-utils/runtime-tester/fuzz/Cargo.toml | 7 +++- test-utils/store-validator/Cargo.toml | 7 +++- test-utils/testlib/Cargo.toml | 7 +++- tools/amend-genesis/Cargo.toml | 7 +++- tools/chainsync-loadtest/Cargo.toml | 8 ++-- tools/cold-store/Cargo.toml | 7 +++- tools/delay-detector/Cargo.toml | 7 +++- tools/flat-storage/Cargo.toml | 7 +++- tools/indexer/example/Cargo.toml | 7 +++- tools/mirror/Cargo.toml | 7 +++- tools/mock-node/Cargo.toml | 7 +++- tools/ping/Cargo.toml | 7 +++- tools/restaked/Cargo.toml | 7 +++- tools/rpctypegen/core/Cargo.toml | 15 +++---- tools/rpctypegen/macro/Cargo.toml | 15 +++---- tools/speedy_sync/Cargo.toml | 10 ++--- tools/state-parts/Cargo.toml | 7 +++- tools/state-viewer/Cargo.toml | 7 +++- .../storage-usage-delta-calculator/Cargo.toml | 9 ++-- tools/themis/Cargo.toml | 8 ++-- tools/undo-block/Cargo.toml | 7 +++- utils/config/Cargo.toml | 11 +++-- utils/fmt/Cargo.toml | 11 +++-- utils/mainnet-res/Cargo.toml | 7 ++-- utils/near-cache/Cargo.toml | 10 ++--- .../Cargo.toml | 5 ++- utils/near-performance-metrics/Cargo.toml | 5 ++- utils/near-stable-hasher/Cargo.toml | 14 +++---- utils/stdx/Cargo.toml | 12 +++--- 88 files changed, 423 insertions(+), 353 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 593fc81a809..f90d26dea98 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2615,7 +2615,7 @@ dependencies = [ "near-performance-metrics", "near-primitives", "near-primitives-core", - "near-stdx 0.16.0", + "near-stdx", "near-store", "near-telemetry", "near-test-contracts", @@ -3409,7 +3409,7 @@ dependencies = [ "hex-literal", "near-account-id", "near-config-utils", - "near-stdx 0.16.0", + "near-stdx", "once_cell", "primitive-types", "rand 0.7.3", @@ -3837,7 +3837,7 @@ dependencies = [ "near-fmt", "near-primitives-core", "near-rpc-error-macro", - "near-stdx 0.16.0", + "near-stdx", "near-vm-errors", "num-rational", "once_cell", @@ -3954,12 +3954,6 @@ dependencies = [ name = "near-stdx" version = "0.0.0" -[[package]] -name = "near-stdx" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c05ded9a90c087aaebfafdf01f2801f5d31817f9a3514ce09aed270001d650e" - [[package]] name = "near-store" version = "0.0.0" @@ -3984,7 +3978,7 @@ dependencies = [ "near-fmt", "near-o11y", "near-primitives", - "near-stdx 0.16.0", + "near-stdx", "num_cpus", "once_cell", "rand 0.8.5", @@ -4190,7 +4184,7 @@ dependencies = [ "near-o11y", "near-primitives", "near-primitives-core", - "near-stdx 0.16.0", + "near-stdx", "near-vm-errors", "ripemd", "serde", diff --git a/Cargo.toml b/Cargo.toml index 6af6cb7c971..f0354ea2d94 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,16 @@ +[workspace.package] +version = "0.0.0" # managed by cargo-workspaces, see below +authors = ["Near Inc "] +edition = "2021" +rust-version = "1.69.0" +repository = "https://github.com/near/nearcore" +license = "MIT OR Apache-2.0" + +[workspace.metadata.workspaces] +# shared version of all public crates in the workspace +version = "0.16.1" +exclude = ["neard"] + [workspace] members = [ "chain/chain", @@ -75,10 +88,6 @@ members = [ "utils/stdx", ] -[workspace.metadata.workspaces] -version = "0.16.1" -exclude = [ "neard" ] - [workspace.dependencies] actix = "0.13.0" actix-cors = "0.6.1" @@ -135,7 +144,7 @@ flate2 = "1.0.22" fs2 = "0.4" futures = "0.3.5" futures-util = "0.3" -genesis-populate = { path = "genesis-tools/genesis-populate"} +genesis-populate = { path = "genesis-tools/genesis-populate" } hashbrown = "0.11" hex = { version = "0.4.2", features = ["serde"] } hex-literal = "0.2" @@ -160,7 +169,7 @@ 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-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" } @@ -171,7 +180,7 @@ 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-client-primitives = { path = "chain/client-primitives" } near-cold-store-tool = { path = "tools/cold-store", package = "cold-store-tool" } near-config-utils = { path = "utils/config" } nearcore = { path = "nearcore" } @@ -208,14 +217,14 @@ near-telemetry = { path = "chain/telemetry" } near-test-contracts = { path = "runtime/near-test-contracts" } near-undo-block = { path = "tools/undo-block" } near-vm = { path = "runtime/near-vm/api" } -near-vm-compiler = { path = "runtime/near-vm/compiler"} +near-vm-compiler = { path = "runtime/near-vm/compiler" } near-vm-compiler-singlepass = { path = "runtime/near-vm/compiler-singlepass" } near-vm-compiler-test-derive = { path = "runtime/near-vm/compiler-test-derive" } near-vm-engine = { path = "runtime/near-vm/engine" } near-vm-engine-universal = { path = "runtime/near-vm/engine-universal" } 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-vm-runner = { path = "runtime/near-vm-runner" } near-vm-test-generator = { path = "runtime/near-vm/test-generator" } near-vm-types = { path = "runtime/near-vm/types" } near-vm-vm = { path = "runtime/near-vm/vm" } @@ -262,7 +271,7 @@ 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" } -rusqlite = {version = "0.27.0", features = ["bundled", "chrono", "functions"] } +rusqlite = { version = "0.27.0", features = ["bundled", "chrono", "functions"] } rustc-demangle = "0.1" rust-s3 = { version = "0.32.3", features = ["blocking"] } secp256k1 = { version = "0.27.0", features = ["recovery", "rand-std"] } @@ -325,12 +334,7 @@ winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi" xshell = "0.2.1" xz2 = "0.1.6" -# Polyfill crate introduced in https://github.com/near/nearcore/pull/8087 -# Because public crates depend on it, we have to also publish this. -# When changing the workspace version, set this back to a local dependency and -# then update again to the higher published version once we release crates again. -# TODO(#8604): Fix this process. -stdx = { package = "near-stdx", version = "0.16.0" } +stdx = { package = "near-stdx", path = "utils/stdx" } [patch.crates-io] @@ -363,8 +367,3 @@ opt-level = 3 opt-level = 3 [profile.dev.package.sha2] opt-level = 3 - -[workspace.package] -edition = "2021" -authors = ["Near Inc "] -rust-version = "1.69.0" diff --git a/chain/chain-primitives/Cargo.toml b/chain/chain-primitives/Cargo.toml index 7e4068d96f7..659bf09b52e 100644 --- a/chain/chain-primitives/Cargo.toml +++ b/chain/chain-primitives/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-chain-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate hosts NEAR chain-related error types" +repository.workspace = true +license.workspace = true +publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/chain/chain/Cargo.toml b/chain/chain/Cargo.toml index 2f06bcb6154..144b0ecfb9e 100644 --- a/chain/chain/Cargo.toml +++ b/chain/chain/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "near-chain" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/chain/chunks-primitives/Cargo.toml b/chain/chunks-primitives/Cargo.toml index 2aaf3012159..4ece0a9a6f0 100644 --- a/chain/chunks-primitives/Cargo.toml +++ b/chain/chunks-primitives/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-chunks-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate hosts NEAR chunks-related error types" +repository.workspace = true +license.workspace = true +publish = true [dependencies] near-chain-primitives.workspace = true diff --git a/chain/chunks/Cargo.toml b/chain/chunks/Cargo.toml index 8047a0905d3..d88e392f3e3 100644 --- a/chain/chunks/Cargo.toml +++ b/chain/chunks/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-chunks" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/chain/client-primitives/Cargo.toml b/chain/client-primitives/Cargo.toml index b774606769f..4d7bb505b48 100644 --- a/chain/client-primitives/Cargo.toml +++ b/chain/client-primitives/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "near-client-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate hosts NEAR client-related error types" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +repository.workspace = true +license.workspace = true +publish = true [dependencies] actix.workspace = true diff --git a/chain/client/Cargo.toml b/chain/client/Cargo.toml index da2ee825b9a..f288aacd90a 100644 --- a/chain/client/Cargo.toml +++ b/chain/client/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-client" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-rt.workspace = true diff --git a/chain/epoch-manager/Cargo.toml b/chain/epoch-manager/Cargo.toml index 1b884f45e50..23cc87017ae 100644 --- a/chain/epoch-manager/Cargo.toml +++ b/chain/epoch-manager/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "near-epoch-manager" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true - +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] borsh.workspace = true diff --git a/chain/indexer-primitives/Cargo.toml b/chain/indexer-primitives/Cargo.toml index a8da8db1c52..a12f7daf8c0 100644 --- a/chain/indexer-primitives/Cargo.toml +++ b/chain/indexer-primitives/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-indexer-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate hosts structures for the NEAR Indexer Framework types" +repository.workspace = true +license.workspace = true +publish = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/chain/indexer/Cargo.toml b/chain/indexer/Cargo.toml index a6db29616c7..70a861462f8 100644 --- a/chain/indexer/Cargo.toml +++ b/chain/indexer/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-indexer" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/chain/jsonrpc-adversarial-primitives/Cargo.toml b/chain/jsonrpc-adversarial-primitives/Cargo.toml index f3d3e832b58..ff9e8904657 100644 --- a/chain/jsonrpc-adversarial-primitives/Cargo.toml +++ b/chain/jsonrpc-adversarial-primitives/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-jsonrpc-adversarial-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] serde.workspace = true diff --git a/chain/jsonrpc-primitives/Cargo.toml b/chain/jsonrpc-primitives/Cargo.toml index edfc4008736..40a2e804ecc 100644 --- a/chain/jsonrpc-primitives/Cargo.toml +++ b/chain/jsonrpc-primitives/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "near-jsonrpc-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate hosts structures for the NEAR JSON RPC Requests, Responses and Error types" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +repository.workspace = true +license.workspace = true +publish = true [dependencies] arbitrary.workspace = true diff --git a/chain/jsonrpc/Cargo.toml b/chain/jsonrpc/Cargo.toml index fcaee0f1c91..6cb90a58fa1 100644 --- a/chain/jsonrpc/Cargo.toml +++ b/chain/jsonrpc/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-jsonrpc" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-cors.workspace = true diff --git a/chain/jsonrpc/client/Cargo.toml b/chain/jsonrpc/client/Cargo.toml index add6fa7a7f3..65a545f2508 100644 --- a/chain/jsonrpc/client/Cargo.toml +++ b/chain/jsonrpc/client/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-jsonrpc-client" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-http.workspace = true diff --git a/chain/jsonrpc/fuzz/Cargo.toml b/chain/jsonrpc/fuzz/Cargo.toml index 6522b4d8c93..15feb6a6b56 100644 --- a/chain/jsonrpc/fuzz/Cargo.toml +++ b/chain/jsonrpc/fuzz/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-jsonrpc-fuzz" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [package.metadata] cargo-fuzz = true diff --git a/chain/jsonrpc/jsonrpc-tests/Cargo.toml b/chain/jsonrpc/jsonrpc-tests/Cargo.toml index dd9d0bed43a..400ad59892e 100644 --- a/chain/jsonrpc/jsonrpc-tests/Cargo.toml +++ b/chain/jsonrpc/jsonrpc-tests/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-jsonrpc-tests" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/chain/network/Cargo.toml b/chain/network/Cargo.toml index f997a9754a4..2f7de94dac1 100644 --- a/chain/network/Cargo.toml +++ b/chain/network/Cargo.toml @@ -1,8 +1,11 @@ [package] name = "near-network" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true publish = false [build-dependencies] diff --git a/chain/pool/Cargo.toml b/chain/pool/Cargo.toml index 71b1c1b820a..90cc6ebd1d4 100644 --- a/chain/pool/Cargo.toml +++ b/chain/pool/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "near-pool" -version = "0.0.0" -license = "MIT OR Apache-2.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] borsh.workspace = true diff --git a/chain/rosetta-rpc/Cargo.toml b/chain/rosetta-rpc/Cargo.toml index 9c28c0f9893..027660e8511 100644 --- a/chain/rosetta-rpc/Cargo.toml +++ b/chain/rosetta-rpc/Cargo.toml @@ -1,11 +1,12 @@ [package] +name = "near-rosetta-rpc" +version.workspace = true authors.workspace = true edition.workspace = true -name = "near-rosetta-rpc" +rust-version.workspace = true +repository.workspace = true +license.workspace = true publish = false -version = "0.0.0" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] actix-cors.workspace = true diff --git a/chain/telemetry/Cargo.toml b/chain/telemetry/Cargo.toml index 8bbdd01980c..da5837d753d 100644 --- a/chain/telemetry/Cargo.toml +++ b/chain/telemetry/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-telemetry" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/core/account-id/Cargo.toml b/core/account-id/Cargo.toml index 50019d1ea73..b741b8cac67 100644 --- a/core/account-id/Cargo.toml +++ b/core/account-id/Cargo.toml @@ -1,15 +1,15 @@ [package] name = "near-account-id" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# This crate is published to crates.io with a semver API. Care must be taken +edition.workspace = true +# This crate is published to crates.io with a semver API. Care must be taken # when updaing its rust-version. -rust-version = "1.60.0" -edition = "2021" -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version = "1.64.0" description = "This crate contains the Account ID primitive and its validation facilities" +repository.workspace = true +license.workspace = true +publish = true [features] default = ["borsh", "serde"] diff --git a/core/account-id/fuzz/Cargo.toml b/core/account-id/fuzz/Cargo.toml index 38ad38346e1..9823fe7a6a3 100644 --- a/core/account-id/fuzz/Cargo.toml +++ b/core/account-id/fuzz/Cargo.toml @@ -1,10 +1,12 @@ - [package] name = "near-account-id-fuzz" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [package.metadata] cargo-fuzz = true diff --git a/core/async/Cargo.toml b/core/async/Cargo.toml index 501bae22005..941f85b82b1 100644 --- a/core/async/Cargo.toml +++ b/core/async/Cargo.toml @@ -1,13 +1,13 @@ [package] name = "near-async" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate contains the async helpers specific for nearcore" +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/core/chain-configs/Cargo.toml b/core/chain-configs/Cargo.toml index 265186999f3..41783156158 100644 --- a/core/chain-configs/Cargo.toml +++ b/core/chain-configs/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-chain-configs" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This crate provides typed interfaces to the NEAR Genesis and Chain Configs" +repository.workspace = true +license.workspace = true +publish = true [dependencies] anyhow.workspace = true diff --git a/core/crypto/Cargo.toml b/core/crypto/Cargo.toml index b3ac6e3716b..ae5ead4ddb9 100644 --- a/core/crypto/Cargo.toml +++ b/core/crypto/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-crypto" -version = "0.0.0" -license = "MIT OR Apache-2.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This is an internal crate for common cryptographic types" +repository.workspace = true +license.workspace = true +publish = true [dependencies] blake2.workspace = true diff --git a/core/dyn-configs/Cargo.toml b/core/dyn-configs/Cargo.toml index 1e9c314431b..bebbea3a585 100644 --- a/core/dyn-configs/Cargo.toml +++ b/core/dyn-configs/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-dyn-configs" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -rust-version.workspace = true edition.workspace = true -readme = "README.md" -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "Dynamic configure helpers for the near codebase" +repository.workspace = true +license.workspace = true +publish = true [dependencies] anyhow.workspace = true diff --git a/core/o11y/Cargo.toml b/core/o11y/Cargo.toml index d22aa8c9364..b51e0ea1fcb 100644 --- a/core/o11y/Cargo.toml +++ b/core/o11y/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-o11y" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -rust-version.workspace = true edition.workspace = true -readme = "README.md" -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "Observability helpers for the near codebase" +repository.workspace = true +license.workspace = true +publish = true [dependencies] near-crypto.workspace = true diff --git a/core/primitives-core/Cargo.toml b/core/primitives-core/Cargo.toml index 7971232b141..5fa1859928e 100644 --- a/core/primitives-core/Cargo.toml +++ b/core/primitives-core/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "near-primitives-core" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" -description = """ -This crate provides the core set of primitives used by other nearcore crates including near-primitives -""" +rust-version.workspace = true +description = "This crate provides the core set of primitives used by other nearcore crates including near-primitives" +repository.workspace = true +license.workspace = true +publish = true [dependencies] arbitrary.workspace = true diff --git a/core/primitives/Cargo.toml b/core/primitives/Cargo.toml index 811019cd7eb..263a5b03616 100644 --- a/core/primitives/Cargo.toml +++ b/core/primitives/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "near-primitives" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" -description = """ -This crate provides the base set of primitives used by other nearcore crates -""" +rust-version.workspace = true +description = "This crate provides the base set of primitives used by other nearcore crates" +repository.workspace = true +license.workspace = true +publish = true [dependencies] arbitrary.workspace = true diff --git a/core/store/Cargo.toml b/core/store/Cargo.toml index 8593bddd639..263d1b2e3f0 100644 --- a/core/store/Cargo.toml +++ b/core/store/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "near-store" -version = "0.0.0" -license = "MIT OR Apache-2.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-rt.workspace = true diff --git a/deny.toml b/deny.toml index 982f59f69a6..03f6c735028 100644 --- a/deny.toml +++ b/deny.toml @@ -7,7 +7,7 @@ targets = [ [licenses] unlicensed = "deny" allow = ["MIT", "Apache-2.0", "Apache-2.0 WITH LLVM-exception"] -deny = ["AGPL-1.0", "AGPL-3.0",] +deny = ["AGPL-1.0", "AGPL-3.0"] copyleft = "warn" allow-osi-fsf-free = "either" default = "deny" @@ -136,11 +136,6 @@ skip = [ # validator 0.12 ~ 0.16 is still using an old version of idna { name = "idna", version = "=0.2.3" }, - # v0.0.0 is the local code, whereas the published crate must depend on a - # published crate when they are published. - # TODO(#8604) Remove this skip entry. - { name = "near-stdx", version = "0.0.0" }, - # zeropool-bn uses borsh 0.9 { name = "borsh", version = "=0.9.3" }, { name = "borsh-derive", version = "=0.9.3" }, diff --git a/genesis-tools/genesis-csv-to-json/Cargo.toml b/genesis-tools/genesis-csv-to-json/Cargo.toml index 39898ae4ab1..186c6e04bdf 100644 --- a/genesis-tools/genesis-csv-to-json/Cargo.toml +++ b/genesis-tools/genesis-csv-to-json/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "genesis-csv-to-json" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] chrono.workspace = true diff --git a/genesis-tools/genesis-populate/Cargo.toml b/genesis-tools/genesis-populate/Cargo.toml index fd9af17ccbe..e2ff72aa6a6 100644 --- a/genesis-tools/genesis-populate/Cargo.toml +++ b/genesis-tools/genesis-populate/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "genesis-populate" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] borsh.workspace = true diff --git a/genesis-tools/keypair-generator/Cargo.toml b/genesis-tools/keypair-generator/Cargo.toml index 965066e9efb..27f9ab7a109 100644 --- a/genesis-tools/keypair-generator/Cargo.toml +++ b/genesis-tools/keypair-generator/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "keypair-generator" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] clap.workspace = true diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml index 8039ef3763f..23f7854aa12 100644 --- a/integration-tests/Cargo.toml +++ b/integration-tests/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "integration-tests" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-rt.workspace = true diff --git a/nearcore/Cargo.toml b/nearcore/Cargo.toml index 01f3531a687..7c91075bc96 100644 --- a/nearcore/Cargo.toml +++ b/nearcore/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "nearcore" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-rt.workspace = true diff --git a/neard/Cargo.toml b/neard/Cargo.toml index f28e6e678ce..2feaf59d0de 100644 --- a/neard/Cargo.toml +++ b/neard/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "neard" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true -default-run = "neard" +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [[bin]] path = "src/main.rs" diff --git a/runtime/near-test-contracts/Cargo.toml b/runtime/near-test-contracts/Cargo.toml index 581230ef257..241ef60627f 100644 --- a/runtime/near-test-contracts/Cargo.toml +++ b/runtime/near-test-contracts/Cargo.toml @@ -1,17 +1,13 @@ [package] name = "near-test-contracts" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -readme = "README.md" -repository = "https://github.com/near/nearcore" -description =""" -A collection of smart-contract used in nearcore tests. -""" +rust-version.workspace = true +description = "A collection of smart-contract used in nearcore tests." +repository.workspace = true +license.workspace = true +publish = false [dependencies] once_cell.workspace = true diff --git a/runtime/near-vm-errors/Cargo.toml b/runtime/near-vm-errors/Cargo.toml index fcdecd9e31d..bee52ac25b1 100644 --- a/runtime/near-vm-errors/Cargo.toml +++ b/runtime/near-vm-errors/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "near-vm-errors" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -readme = "README.md" +rust-version.workspace = true +description = "Error that can occur inside Near Runtime encapsulated in a separate crate. Might merge it later." +repository.workspace = true +license.workspace = true categories = ["wasm"] -repository = "https://github.com/near/nearcore" -description = """ -Error that can occur inside Near Runtime encapsulated in a separate crate. Might merge it later. -""" +publish = true [dependencies] borsh.workspace = true diff --git a/runtime/near-vm-logic/Cargo.toml b/runtime/near-vm-logic/Cargo.toml index bcfe9e31404..dab0744be6d 100644 --- a/runtime/near-vm-logic/Cargo.toml +++ b/runtime/near-vm-logic/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "near-vm-logic" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -readme = "README.md" +rust-version.workspace = true +description = "This crate implements the specification of the interface that Near blockchain exposes to the smart contracts." +repository.workspace = true +license.workspace = true categories = ["wasm"] -repository = "https://github.com/near/nearcore" -description = """ -This crate implements the specification of the interface that Near blockchain exposes to the smart contracts. -""" +publish = true [dependencies] bn.workspace = true diff --git a/runtime/near-vm-runner/Cargo.toml b/runtime/near-vm-runner/Cargo.toml index 6e97687ba2f..c66217ec280 100644 --- a/runtime/near-vm-runner/Cargo.toml +++ b/runtime/near-vm-runner/Cargo.toml @@ -1,18 +1,14 @@ [package] name = "near-vm-runner" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -readme = "README.md" +rust-version.workspace = true +description = "This crate implements the specification of the interface that Near blockchain exposes to the smart contracts." +repository.workspace = true +license.workspace = true categories = ["wasm"] -repository = "https://github.com/near/nearcore" -description = """ -This crate implements the specification of the interface that Near blockchain exposes to the smart contracts. -""" +publish = true [dependencies] anyhow = { workspace = true, optional = true } @@ -41,7 +37,7 @@ parity-wasm_41.workspace = true [target.'cfg(target_arch = "x86_64")'.dependencies] wasmer-runtime = { workspace = true, optional = true } -wasmer-runtime-core = { 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 } diff --git a/runtime/near-vm-runner/fuzz/Cargo.toml b/runtime/near-vm-runner/fuzz/Cargo.toml index 95fdd9f2e04..416440abb8e 100644 --- a/runtime/near-vm-runner/fuzz/Cargo.toml +++ b/runtime/near-vm-runner/fuzz/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-vm-runner-fuzz" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [package.metadata] cargo-fuzz = true diff --git a/runtime/near-vm/api/Cargo.toml b/runtime/near-vm/api/Cargo.toml index c370801ae9e..89d6050b026 100644 --- a/runtime/near-vm/api/Cargo.toml +++ b/runtime/near-vm/api/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm" -version = "0.0.0" +version.workspace = true description = "High-performance WebAssembly runtime" categories = ["wasm"] keywords = ["wasm", "webassembly", "runtime", "vm"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT" readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/compiler-singlepass/Cargo.toml b/runtime/near-vm/compiler-singlepass/Cargo.toml index 7ba1622ae7a..22a1cdc64fe 100644 --- a/runtime/near-vm/compiler-singlepass/Cargo.toml +++ b/runtime/near-vm/compiler-singlepass/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm-compiler-singlepass" -version = "0.0.0" +version.workspace = true description = "Singlepass compiler for Wasmer WebAssembly runtime" categories = ["wasm"] keywords = ["wasm", "webassembly", "compiler", "singlepass"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT" readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/compiler-test-derive/Cargo.toml b/runtime/near-vm/compiler-test-derive/Cargo.toml index 1683f3138da..e3bcabaadfd 100644 --- a/runtime/near-vm/compiler-test-derive/Cargo.toml +++ b/runtime/near-vm/compiler-test-derive/Cargo.toml @@ -3,7 +3,7 @@ proc-macro = true [package] name = "near-vm-compiler-test-derive" -version = "0.0.0" +version.workspace = true authors = ["Wasmer Engineering Team ", "Near Inc "] edition = "2021" license = "MIT" diff --git a/runtime/near-vm/compiler/Cargo.toml b/runtime/near-vm/compiler/Cargo.toml index 7cc429b46ae..8d3ddef52f2 100644 --- a/runtime/near-vm/compiler/Cargo.toml +++ b/runtime/near-vm/compiler/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm-compiler" -version = "0.0.0" +version.workspace = true description = "Base compiler abstraction for Wasmer WebAssembly runtime" categories = ["wasm", "no-std"] keywords = ["wasm", "webassembly", "compiler"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT OR Apache-2.0 WITH LLVM-exception" readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/engine-universal/Cargo.toml b/runtime/near-vm/engine-universal/Cargo.toml index ab647a3a365..b3d57f27af6 100644 --- a/runtime/near-vm/engine-universal/Cargo.toml +++ b/runtime/near-vm/engine-universal/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm-engine-universal" -version = "0.0.0" +version.workspace = true description = "Wasmer Universal Engine" categories = ["wasm"] keywords = ["wasm", "webassembly", "engine", "universal"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT OR Apache-2.0 WITH LLVM-exception " readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/engine/Cargo.toml b/runtime/near-vm/engine/Cargo.toml index 63e27944eda..3fd7359645f 100644 --- a/runtime/near-vm/engine/Cargo.toml +++ b/runtime/near-vm/engine/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm-engine" -version = "0.0.0" +version.workspace = true description = "Wasmer Engine abstraction" categories = ["wasm"] keywords = ["wasm", "webassembly", "engine"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT OR Apache-2.0 WITH LLVM-exception " readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/test-generator/Cargo.toml b/runtime/near-vm/test-generator/Cargo.toml index 1df7885e25e..805ae8a9936 100644 --- a/runtime/near-vm/test-generator/Cargo.toml +++ b/runtime/near-vm/test-generator/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-vm-test-generator" -version = "0.0.0" +version.workspace = true edition = "2021" authors = ["Wasmer Engineering Team ", "Near Inc "] publish = false diff --git a/runtime/near-vm/types/Cargo.toml b/runtime/near-vm/types/Cargo.toml index f06a928de62..6f5def1999d 100644 --- a/runtime/near-vm/types/Cargo.toml +++ b/runtime/near-vm/types/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm-types" -version = "0.0.0" +version.workspace = true description = "Near VM Common Types" categories = ["wasm", "data-structures"] keywords = ["wasm", "webassembly", "types"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT OR Apache-2.0 WITH LLVM-exception" readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/vm/Cargo.toml b/runtime/near-vm/vm/Cargo.toml index a0629fd8b2f..a7205fcf0d7 100644 --- a/runtime/near-vm/vm/Cargo.toml +++ b/runtime/near-vm/vm/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "near-vm-vm" -version = "0.0.0" +version.workspace = true description = "Runtime library support for Wasmer" categories = ["wasm"] keywords = ["wasm", "webassembly"] authors = ["Wasmer Engineering Team ", "Near Inc "] -repository = "https://github.com/near/nearcore" +repository.workspace = true license = "MIT OR Apache-2.0 WITH LLVM-exception" readme = "README.md" edition = "2021" diff --git a/runtime/near-vm/wast/Cargo.toml b/runtime/near-vm/wast/Cargo.toml index 4f6d35cd1d8..53205c0b7bc 100644 --- a/runtime/near-vm/wast/Cargo.toml +++ b/runtime/near-vm/wast/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "near-vm-wast" -version = "0.0.0" +version.workspace = true authors = ["Wasmer Engineering Team ", "Near Inc "] description = "wast testing support for wasmer" license = "MIT OR Apache-2.0 WITH LLVM-exception" categories = ["wasm"] keywords = ["wasm", "webassembly"] -repository = "https://github.com/wasmerio/wasmer" +repository.workspace = true readme = "README.md" edition = "2021" publish = false diff --git a/runtime/runtime-params-estimator/Cargo.toml b/runtime/runtime-params-estimator/Cargo.toml index 5a82b54a6db..9e816d003e7 100644 --- a/runtime/runtime-params-estimator/Cargo.toml +++ b/runtime/runtime-params-estimator/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "runtime-params-estimator" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [[bin]] name = "runtime-params-estimator" diff --git a/runtime/runtime-params-estimator/estimator-warehouse/Cargo.toml b/runtime/runtime-params-estimator/estimator-warehouse/Cargo.toml index 05aae3d4adb..40640485081 100644 --- a/runtime/runtime-params-estimator/estimator-warehouse/Cargo.toml +++ b/runtime/runtime-params-estimator/estimator-warehouse/Cargo.toml @@ -1,9 +1,12 @@ [package] -authors.workspace = true name = "estimator-warehouse" -version = "0.0.0" -publish = false +version.workspace = true +authors.workspace = true edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/runtime/runtime/Cargo.toml b/runtime/runtime/Cargo.toml index 2faa6dde3ce..46c3e964d4c 100644 --- a/runtime/runtime/Cargo.toml +++ b/runtime/runtime/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "node-runtime" -version = "0.0.0" -license = "MIT OR Apache-2.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] borsh.workspace = true diff --git a/test-utils/actix-test-utils/Cargo.toml b/test-utils/actix-test-utils/Cargo.toml index d956ab7ac50..79be66c1eaa 100644 --- a/test-utils/actix-test-utils/Cargo.toml +++ b/test-utils/actix-test-utils/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-actix-test-utils" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-rt.workspace = true diff --git a/test-utils/logger/Cargo.toml b/test-utils/logger/Cargo.toml index dd0493f1700..75d2e36b466 100644 --- a/test-utils/logger/Cargo.toml +++ b/test-utils/logger/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-logger-utils" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] tracing.workspace = true diff --git a/test-utils/runtime-tester/Cargo.toml b/test-utils/runtime-tester/Cargo.toml index 3c2e9352f92..20a9614e689 100644 --- a/test-utils/runtime-tester/Cargo.toml +++ b/test-utils/runtime-tester/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "runtime-tester" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] cpu-time.workspace = true diff --git a/test-utils/runtime-tester/fuzz/Cargo.toml b/test-utils/runtime-tester/fuzz/Cargo.toml index 907be5068c7..14273fd47f9 100644 --- a/test-utils/runtime-tester/fuzz/Cargo.toml +++ b/test-utils/runtime-tester/fuzz/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "runtime-tester-fuzz" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [package.metadata] cargo-fuzz = true diff --git a/test-utils/store-validator/Cargo.toml b/test-utils/store-validator/Cargo.toml index d0b8ee45950..832feff0936 100644 --- a/test-utils/store-validator/Cargo.toml +++ b/test-utils/store-validator/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "store-validator" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] ansi_term.workspace = true diff --git a/test-utils/testlib/Cargo.toml b/test-utils/testlib/Cargo.toml index 9f2a4629f43..e9aab04ff55 100644 --- a/test-utils/testlib/Cargo.toml +++ b/test-utils/testlib/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "testlib" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] once_cell.workspace = true diff --git a/tools/amend-genesis/Cargo.toml b/tools/amend-genesis/Cargo.toml index 5b76dc9a1f3..aaddc473d95 100644 --- a/tools/amend-genesis/Cargo.toml +++ b/tools/amend-genesis/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-amend-genesis" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/tools/chainsync-loadtest/Cargo.toml b/tools/chainsync-loadtest/Cargo.toml index adadbe45a1e..3971db9766c 100644 --- a/tools/chainsync-loadtest/Cargo.toml +++ b/tools/chainsync-loadtest/Cargo.toml @@ -1,10 +1,12 @@ [package] name = "chainsync-loadtest" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true -default-run = "chainsync-loadtest" +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [[bin]] path = "src/main.rs" diff --git a/tools/cold-store/Cargo.toml b/tools/cold-store/Cargo.toml index 13b3f4fa7d1..b09689d99f9 100644 --- a/tools/cold-store/Cargo.toml +++ b/tools/cold-store/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "cold-store-tool" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/tools/delay-detector/Cargo.toml b/tools/delay-detector/Cargo.toml index 93ac4422c5a..ffeda04b116 100644 --- a/tools/delay-detector/Cargo.toml +++ b/tools/delay-detector/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "delay-detector" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] tracing.workspace = true diff --git a/tools/flat-storage/Cargo.toml b/tools/flat-storage/Cargo.toml index cda97369c76..b2d49aba6d6 100644 --- a/tools/flat-storage/Cargo.toml +++ b/tools/flat-storage/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-flat-storage" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/tools/indexer/example/Cargo.toml b/tools/indexer/example/Cargo.toml index 869247199f4..1baea8d9e20 100644 --- a/tools/indexer/example/Cargo.toml +++ b/tools/indexer/example/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "indexer-example" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/tools/mirror/Cargo.toml b/tools/mirror/Cargo.toml index fdbfddf1f38..40c11622ed2 100644 --- a/tools/mirror/Cargo.toml +++ b/tools/mirror/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-mirror" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix.workspace = true diff --git a/tools/mock-node/Cargo.toml b/tools/mock-node/Cargo.toml index d9eaf20065a..1c2a0ded27b 100644 --- a/tools/mock-node/Cargo.toml +++ b/tools/mock-node/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "mock-node" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] actix-rt.workspace = true diff --git a/tools/ping/Cargo.toml b/tools/ping/Cargo.toml index 1065e2fee42..764e0e78c03 100644 --- a/tools/ping/Cargo.toml +++ b/tools/ping/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-ping" -version = "0.0.0" +version.workspace = true authors.workspace = true +edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true publish = false -edition = "2021" [dependencies] actix-web.workspace = true diff --git a/tools/restaked/Cargo.toml b/tools/restaked/Cargo.toml index 8dee4388c15..d64cef619de 100644 --- a/tools/restaked/Cargo.toml +++ b/tools/restaked/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "restaked" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] clap.workspace = true diff --git a/tools/rpctypegen/core/Cargo.toml b/tools/rpctypegen/core/Cargo.toml index 47c05abe9a4..a9f260dd889 100644 --- a/tools/rpctypegen/core/Cargo.toml +++ b/tools/rpctypegen/core/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "near-rpc-error-core" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" -description = """ -This crate generates schema for Rust structs which can be used by TypeScript. -""" +rust-version.workspace = true +description = "This crate generates schema for Rust structs which can be used by TypeScript." +repository.workspace = true +license.workspace = true +publish = true [dependencies] quote.workspace = true diff --git a/tools/rpctypegen/macro/Cargo.toml b/tools/rpctypegen/macro/Cargo.toml index 82e56e55af8..776d80bf437 100644 --- a/tools/rpctypegen/macro/Cargo.toml +++ b/tools/rpctypegen/macro/Cargo.toml @@ -1,16 +1,13 @@ [package] name = "near-rpc-error-macro" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" -description = """ -This crate generates schema for Rust structs which can be used by TypeScript. -""" +rust-version.workspace = true +description = "This crate generates schema for Rust structs which can be used by TypeScript." +repository.workspace = true +license.workspace = true +publish = true [lib] proc-macro = true diff --git a/tools/speedy_sync/Cargo.toml b/tools/speedy_sync/Cargo.toml index f9055660f83..bf7b1efb3b7 100644 --- a/tools/speedy_sync/Cargo.toml +++ b/tools/speedy_sync/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "speedy_sync" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false -rust-version.workspace = true edition.workspace = true - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] near-store.workspace = true diff --git a/tools/state-parts/Cargo.toml b/tools/state-parts/Cargo.toml index 11ee07c3f35..ddd356171af 100644 --- a/tools/state-parts/Cargo.toml +++ b/tools/state-parts/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-state-parts" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/tools/state-viewer/Cargo.toml b/tools/state-viewer/Cargo.toml index 4c414457ba4..3bafd0ea907 100644 --- a/tools/state-viewer/Cargo.toml +++ b/tools/state-viewer/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "state-viewer" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] ansi_term.workspace = true diff --git a/tools/storage-usage-delta-calculator/Cargo.toml b/tools/storage-usage-delta-calculator/Cargo.toml index bc8cbc133b8..9b4e2fcf048 100644 --- a/tools/storage-usage-delta-calculator/Cargo.toml +++ b/tools/storage-usage-delta-calculator/Cargo.toml @@ -1,11 +1,12 @@ [package] name = "storage-usage-delta-calculator" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/tools/themis/Cargo.toml b/tools/themis/Cargo.toml index e3af3bf23e0..7765058e54a 100644 --- a/tools/themis/Cargo.toml +++ b/tools/themis/Cargo.toml @@ -1,11 +1,13 @@ [package] name = "themis" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true -publish = false -license = "MIT OR Apache-2.0" +rust-version.workspace = true description = "https://en.wikipedia.org/wiki/Themis" +repository.workspace = true +license.workspace = true +publish = false [dependencies] toml.workspace = true diff --git a/tools/undo-block/Cargo.toml b/tools/undo-block/Cargo.toml index 7a4f2272991..43e0bb3367a 100644 --- a/tools/undo-block/Cargo.toml +++ b/tools/undo-block/Cargo.toml @@ -1,9 +1,12 @@ [package] name = "near-undo-block" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = false edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true +publish = false [dependencies] anyhow.workspace = true diff --git a/utils/config/Cargo.toml b/utils/config/Cargo.toml index 369a397e0c5..6fd62fc75e3 100644 --- a/utils/config/Cargo.toml +++ b/utils/config/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-config-utils" -version = "0.0.0" -license = "MIT OR Apache-2.0" +version.workspace = true authors.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: -rust-version.workspace = true edition.workspace = true -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "This is an internal crate to provide utils for reading config files" +repository.workspace = true +license.workspace = true +publish = true [dependencies] anyhow.workspace = true diff --git a/utils/fmt/Cargo.toml b/utils/fmt/Cargo.toml index 432d58e1f41..70fb9e23a50 100644 --- a/utils/fmt/Cargo.toml +++ b/utils/fmt/Cargo.toml @@ -1,14 +1,13 @@ [package] name = "near-fmt" -version = "0.0.0" +version.workspace = true authors.workspace = true -publish = true -rust-version.workspace = true edition.workspace = true -readme = "README.md" -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" +rust-version.workspace = true description = "Helpers for pretty formatting." +repository.workspace = true +license.workspace = true +publish = true [dependencies] near-primitives-core.workspace = true diff --git a/utils/mainnet-res/Cargo.toml b/utils/mainnet-res/Cargo.toml index b7760add842..d4a44da70d3 100644 --- a/utils/mainnet-res/Cargo.toml +++ b/utils/mainnet-res/Cargo.toml @@ -1,12 +1,13 @@ [package] name = "near-mainnet-res" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true publish = false -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [dependencies] serde_json.workspace = true diff --git a/utils/near-cache/Cargo.toml b/utils/near-cache/Cargo.toml index 0a23b0abb20..9b36edd403d 100644 --- a/utils/near-cache/Cargo.toml +++ b/utils/near-cache/Cargo.toml @@ -1,15 +1,13 @@ [package] name = "near-cache" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: rust-version.workspace = true -license = "MIT OR Apache-2.0" -readme = "README.md" -repository = "https://github.com/near/nearcore" description = "do not use this, new versions can stop being published at literally any time" +repository.workspace = true +license.workspace = true +publish = true [dependencies] lru.workspace = true diff --git a/utils/near-performance-metrics-macros/Cargo.toml b/utils/near-performance-metrics-macros/Cargo.toml index 661823948b5..2079f6d4faa 100644 --- a/utils/near-performance-metrics-macros/Cargo.toml +++ b/utils/near-performance-metrics-macros/Cargo.toml @@ -1,8 +1,11 @@ [package] name = "near-performance-metrics-macros" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true publish = false [dependencies] diff --git a/utils/near-performance-metrics/Cargo.toml b/utils/near-performance-metrics/Cargo.toml index e6e7f414a77..140fff972ad 100644 --- a/utils/near-performance-metrics/Cargo.toml +++ b/utils/near-performance-metrics/Cargo.toml @@ -1,8 +1,11 @@ [package] name = "near-performance-metrics" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true +rust-version.workspace = true +repository.workspace = true +license.workspace = true publish = false [dependencies] diff --git a/utils/near-stable-hasher/Cargo.toml b/utils/near-stable-hasher/Cargo.toml index 5273a1678ec..4734081b84d 100644 --- a/utils/near-stable-hasher/Cargo.toml +++ b/utils/near-stable-hasher/Cargo.toml @@ -1,14 +1,10 @@ [package] name = "near-stable-hasher" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true -publish = true -# Please update rust-toolchain.toml as well when changing version here: rust-version.workspace = true -license = "MIT OR Apache-2.0" -readme = "README.md" -repository = "https://github.com/near/nearcore" -description = """ -`near-stable-hasher` is a library that is essentially a wrapper around, now deprecated, `std::hash::SipHasher`. -""" \ No newline at end of file +description = "`near-stable-hasher` is a library that is essentially a wrapper around, now deprecated, `std::hash::SipHasher`." +repository.workspace = true +license.workspace = true +publish = true diff --git a/utils/stdx/Cargo.toml b/utils/stdx/Cargo.toml index c4eca4778ae..2a94cef2dba 100644 --- a/utils/stdx/Cargo.toml +++ b/utils/stdx/Cargo.toml @@ -1,15 +1,13 @@ [package] name = "near-stdx" -version = "0.0.0" +version.workspace = true authors.workspace = true edition.workspace = true -publish = true rust-version.workspace = true -license = "MIT OR Apache-2.0" -repository = "https://github.com/near/nearcore" -description = """ -This crate contains polyfills which should really be in std, but currently aren't for one reason or another. -""" +description = "This crate contains polyfills which should really be in std, but currently aren't for one reason or another." +repository.workspace = true +license.workspace = true +publish = true [dependencies] # Absolutely must not depend on any crates from nearcore workspace, From 31d89da4293b45058b7914891a08ff0b06e95aa2 Mon Sep 17 00:00:00 2001 From: Miraculous Owonubi Date: Wed, 17 May 2023 07:37:51 +0100 Subject: [PATCH 2/2] fuzz: inherit near-account-id from workspace as well --- core/account-id/fuzz/Cargo.toml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/core/account-id/fuzz/Cargo.toml b/core/account-id/fuzz/Cargo.toml index 9823fe7a6a3..bdfaa4ad7a6 100644 --- a/core/account-id/fuzz/Cargo.toml +++ b/core/account-id/fuzz/Cargo.toml @@ -15,9 +15,7 @@ cargo-fuzz = true libfuzzer-sys.workspace = true borsh.workspace = true serde_json.workspace = true - -[dependencies.near-account-id] -path = ".." +near-account-id.workspace = true [[bin]] name = "serde"