Skip to content

Commit

Permalink
chore: use workspace dependencies (#790)
Browse files Browse the repository at this point in the history 
## Description

The PR adds the possibility to define crate versions used in all crates
in the monorepo in `workspace.depdndencies` section of the main
`Cargo.toml` file.
  • Loading branch information
@aleksuss
aleksuss authored Jul 11, 2023
1 parent 3c8f866 commit 79cb327
Show file tree
Hide file tree
Showing 12 changed files with 392 additions and 318 deletions.
213 changes: 123 additions & 90 deletions Cargo.lock
View file

Large diffs are not rendered by default.

111 changes: 87 additions & 24 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,90 @@
[workspace.package]
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
readme = "README.md"
publish = false

[workspace.dependencies]
aurora-engine = { path = "engine", default-features = false }
aurora-engine-precompiles = { path = "engine-precompiles", default-features = false }
aurora-engine-sdk = { path = "engine-sdk", default-features = false }
aurora-engine-transactions = { path = "engine-transactions", default-features = false }
aurora-engine-types = { path = "engine-types", default-features = false }
aurora-engine-modexp = { path = "engine-modexp", default-features = false }
aurora-engine-test-doubles = { path = "engine-test-doubles" }
engine-standalone-storage = { path = "engine-standalone-storage" }
engine-standalone-tracing = { path = "engine-standalone-tracing", default-features = false, features = ["impl-serde"] }

base64 = { version = "0.21", default-features = false, features = ["alloc"] }
bitflags = { version = "1", default-features = false }
bn = { version = "0.5", package = "zeropool-bn", default-features = false }
borsh = { version = "0.10", default-features = false }
borsh-compat = { version = "0.9", package = "borsh", default-features = false }
bstr = "1"
byte-slice-cast = { version = "1", default-features = false }
criterion = "0.5"
digest = "0.10"
ethabi = { version = "18", default-features = false }
evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false }
evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std"] }
evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
git2 = "0.17"
hex = { version = "0.4", default-features = false, features = ["alloc"] }
ibig = { version = "0.3", default-features = false, features = ["num-traits"] }
libsecp256k1 = { version = "0.7", default-features = false }
near-crypto = "0.16"
near-primitives = "0.16"
near-primitives-core = "0.16"
near-sdk-sim = { git = "https://github.com/aurora-is-near/near-sdk-rs.git", rev = "cc4d4aaf2e1f7297aa060b342ca3ef3ff8e67003" }
near-vm-errors = "0.16"
near-vm-logic = "0.16"
near-vm-runner = { version = "0.16", default-features = false, features = [ "wasmer2_vm", "wasmtime_vm" ] }
num = { version = "0.4", default-features = false, features = ["alloc"] }
postgres = "0.19"
primitive-types = { version = "0.12", default-features = false, features = ["rlp", "serde_no_std"] }
rand = "0.8"
ripemd = { version = "0.1", default-features = false }
rlp = { version = "0.5", default-features = false }
rocksdb = { version = "0.19", default-features = false }
serde = { version = "1", default-features = false, features = ["alloc", "derive"] }
serde_json = { version = "1", default-features = false, features = ["alloc"] }
sha2 = { version = "0.10", default-features = false }
sha3 = { version = "0.10", default-features = false }
tempfile = "3"
test-case = "3.1"
walrus = "0.20"
wee_alloc = { version = "0.4", default-features = false }


[workspace]
resolver = "2"
members = [
"engine",
"engine-test-doubles",
"engine-modexp",
"engine-precompiles",
"engine-sdk",
"engine-standalone-storage",
"engine-standalone-tracing",
"engine-tests",
"engine-transactions",
"engine-types",
]

exclude = [
"etc/tests/state-migration-test",
"etc/tests/ft-receiver",
"etc/tests/benchmark-contract",
"etc/tests/self-contained-5bEgfRQ",
"etc/tests/fibonacci",
"etc/tests/modexp-bench",
"etc/xcc-router",
]

[profile.release]
opt-level = 3
debug = false
Expand Down Expand Up @@ -26,27 +113,3 @@ rpath = false
# it to actually happen when running tests with --release
lto = true
opt-level = 3

[workspace]
resolver = "2"
members = [
"engine",
"engine-test-doubles",
"engine-modexp",
"engine-precompiles",
"engine-sdk",
"engine-standalone-storage",
"engine-standalone-tracing",
"engine-tests",
"engine-transactions",
"engine-types",
]
exclude = [
"etc/tests/state-migration-test",
"etc/tests/ft-receiver",
"etc/tests/benchmark-contract",
"etc/tests/self-contained-5bEgfRQ",
"etc/tests/fibonacci",
"etc/tests/modexp-bench",
"etc/xcc-router",
]
24 changes: 10 additions & 14 deletions engine-modexp/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
[package]
name = "aurora-engine-modexp"
version = "1.0.0"
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
description = ""
documentation = ""
readme = true
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
publish = false
authors.workspace = true
edition.workspace = true
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[dependencies]
ibig = { version = "0.3.6", default-features = false, features = ["num-traits"] }
num = { version = "0.4.0", default-features = false, features = ["alloc"] }
hex = { version = "0.4", default-features = false, features = ["alloc"] }

[dev-dependencies]
hex.workspace = true
num.workspace = true
ibig.workspace = true

[features]
default = ["std"]
Expand Down
48 changes: 23 additions & 25 deletions engine-precompiles/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
[package]
name = "aurora-engine-precompiles"
version = "1.0.0"
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
description = ""
documentation = ""
readme = true
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
publish = false
authors.workspace = true
edition.workspace = true
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[dependencies]
aurora-engine-modexp = { path = "../engine-modexp", default-features = false }
aurora-engine-types = { path = "../engine-types", default-features = false }
aurora-engine-sdk = { path = "../engine-sdk", default-features = false }
bn = { version = "0.5.11", package = "zeropool-bn", default-features = false }
evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false }
libsecp256k1 = { version = "0.7.0", default-features = false, features = ["static-context", "hmac"] }
num = { version = "0.4.0", default-features = false, features = ["alloc"] }
ripemd = { version = "0.1.1", default-features = false }
sha2 = { version = "0.10.2", default-features = false }
sha3 = { version = "0.10.2", default-features = false }
ethabi = { version = "18.0", default-features = false }
hex = { version = "0.4", default-features = false, features = ["alloc"] }
aurora-engine-modexp.workspace = true
aurora-engine-sdk.workspace = true
aurora-engine-types.workspace = true
bn.workspace = true
ethabi.workspace = true
evm.workspace = true
hex.workspace = true
libsecp256k1 = { workspace = true, features = ["static-context", "hmac"] }
num.workspace = true
ripemd.workspace = true
sha2.workspace = true
sha3.workspace = true

[dev-dependencies]
aurora-engine-test-doubles = { path = "../engine-test-doubles" }
serde = { version = "1", features = ["derive"] }
serde_json = "1"
rand = "0.8.5"
aurora-engine-test-doubles.workspace = true
rand.workspace = true
serde.workspace = true
serde_json.workspace = true

[features]
default = ["std"]
Expand Down
25 changes: 11 additions & 14 deletions engine-sdk/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
[package]
name = "aurora-engine-sdk"
version = "1.0.0"
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
description = ""
documentation = ""
readme = true
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
publish = false
authors.workspace = true
edition.workspace = true
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[dependencies]
aurora-engine-types = { path = "../engine-types", default-features = false }

base64 = { version = "0.21", default-features = false, features = [ "alloc" ] }
sha2 = { version = "0.10", default-features = false }
sha3 = { version = "0.10", default-features = false }
aurora-engine-types.workspace = true
base64.workspace = true
sha2.workspace = true
sha3.workspace = true

[features]
std = ["aurora-engine-types/std", "sha3/std", "sha2/std", "base64/std" ]
Expand Down
36 changes: 18 additions & 18 deletions engine-standalone-storage/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
[package]
name = "engine-standalone-storage"
version = "0.1.0"
edition = "2021"
authors = ["Aurora Labs <hello@aurora.dev>"]
authors.workspace = true
edition.workspace = true
description = "Aurora engine standalone storage library. Provides the storage backend used by the standalone engine."
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
publish = false
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[lib]
crate-type = ["lib"]

[dependencies]
aurora-engine = { path = "../engine", default-features = false, features = ["std"] }
aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] }
aurora-engine-modexp = { path = "../engine-modexp", default-features = false, features = ["std"] }
aurora-engine-sdk = { path = "../engine-sdk", default-features = false, features = ["std"] }
aurora-engine-transactions = { path = "../engine-transactions", default-features = false, features = ["std"] }
aurora-engine-precompiles = { path = "../engine-precompiles", default-features = false, features = ["std"] }
evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false }
hex = "0.4.3"
rocksdb = { version = "0.19.0", default-features = false }
postgres = "0.19.2"
serde = "1.0.130"
serde_json = "1.0.72"
aurora-engine = { workspace = true, features = ["std"] }
aurora-engine-types = { workspace = true, features = ["std"] }
aurora-engine-modexp = { workspace = true, features = ["std"] }
aurora-engine-precompiles = { workspace = true, features = ["std"] }
aurora-engine-sdk = { workspace = true, features = ["std"] }
aurora-engine-transactions = { workspace = true, features = ["std"] }
evm-core.workspace = true
hex = { workspace = true, features = ["std"] }
rocksdb.workspace = true
postgres.workspace = true
serde = { workspace = true, features = ["std"] }
serde_json = { workspace = true, features = ["std"] }

[features]
default = ["snappy", "lz4", "zstd", "zlib"]
Expand Down
26 changes: 13 additions & 13 deletions engine-standalone-tracing/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
[package]
name = "engine-standalone-tracing"
version = "0.1.0"
edition = "2021"
authors = ["Aurora Labs <hello@aurora.dev>"]
edition.workspace = true
authors.workspace = true
description = "Aurora engine standalone tracing library. Provides functions and types for extracing geth-like traces from standalone engine execution."
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "CC0-1.0"
publish = false
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[lib]
crate-type = ["lib"]

[dependencies]
aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] }
evm-core = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std"] }
evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
hex = { version = "0.4", default-features = false, features = ["std"] }
serde = { version = "1", features = ["derive"], optional = true }
aurora-engine-types = { workspace = true, features = ["std"] }
evm-core.workspace = true
evm = { workspace = true, features = ["std", "tracing"] }
evm-runtime.workspace = true
evm-gasometer.workspace = true
hex = { workspace = true, features = ["std"] }
serde = { workspace = true, features = ["std"], optional = true }

[features]
default = []
Expand Down
27 changes: 12 additions & 15 deletions engine-test-doubles/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,19 @@
[package]
name = "aurora-engine-test-doubles"
version = "1.0.0"
authors = ["Aurora Labs <hello@aurora.dev>"]
edition = "2021"
authors.workspace = true
edition.workspace = true
description = "Contains implementations of engine traits suitable for using in tests"
documentation = ""
readme = true
homepage = "https://github.com/aurora-is-near/aurora-engine"
repository = "https://github.com/aurora-is-near/aurora-engine"
license = "GPL-3.0"
publish = false
readme.workspace = true
homepage.workspace = true
repository.workspace = true
license.workspace = true
publish.workspace = true
autobenches = false

[dependencies]
aurora-engine-types = { path = "../engine-types", default-features = false, features = ["std"] }
aurora-engine-sdk = { path = "../engine-sdk" }
evm = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
evm-runtime = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }
evm-gasometer = { git = "https://github.com/aurora-is-near/sputnikvm.git", tag = "v0.38.0-aurora", default-features = false, features = ["std", "tracing"] }

[dev-dependencies]
aurora-engine-types = { workspace = true, features = ["std"] }
aurora-engine-sdk.workspace = true
evm = { workspace = true, features = ["std", "tracing"] }
evm-gasometer.workspace = true
evm-runtime.workspace = true
Loading

0 comments on commit 79cb327

Please sign in to comment.