Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cargo version pinning #1255

Merged
merged 2 commits into from
Nov 28, 2023
Merged

Cargo version pinning #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8456d1
Pin dep versions using "=" constraints.
graydon Nov 28, 2023
4d17c16
Add --locked to Makefile targets
graydon Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@ exclude = ["soroban-test-wasms/wasm-workspace"]
version = "20.0.0-rc2"

[workspace.dependencies]
soroban-env-common = { version = "20.0.0-rc2", path = "soroban-env-common", default-features = false }
soroban-env-guest = { version = "20.0.0-rc2", path = "soroban-env-guest" }
soroban-env-host = { version = "20.0.0-rc2", path = "soroban-env-host" }
soroban-env-macros = { version = "20.0.0-rc2", path = "soroban-env-macros" }
soroban-builtin-sdk-macros = { version = "20.0.0-rc2", path = "soroban-builtin-sdk-macros" }
soroban-env-common = { version = "=20.0.0-rc2", path = "soroban-env-common", default-features = false }
soroban-env-guest = { version = "=20.0.0-rc2", path = "soroban-env-guest" }
soroban-env-host = { version = "=20.0.0-rc2", path = "soroban-env-host" }
soroban-env-macros = { version = "=20.0.0-rc2", path = "soroban-env-macros" }
soroban-builtin-sdk-macros = { version = "=20.0.0-rc2", path = "soroban-builtin-sdk-macros" }

[workspace.dependencies.stellar-xdr]
version = "20.0.0-rc1"
version = "=20.0.0-rc1"
git = "https://github.com/stellar/rs-stellar-xdr"
rev = "d6f8ece2c89809d5e2800b9df64ae60787ee492b"
default-features = false

[workspace.dependencies.wasmi]
package = "soroban-wasmi"
version = "0.31.0-soroban1"
version = "=0.31.0-soroban1"
git = "https://github.com/stellar/wasmi"
rev = "7e63b4c9e08c4163f417d118d81f7ea34789d0be"

Expand Down
10 changes: 5 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
all: build test test-opt

test:
cargo hack --each-feature test
cargo hack --locked --each-feature test

test-opt:
cargo hack --each-feature test --profile test-opt
cargo hack --locked --each-feature test --profile test-opt

build:
cargo hack --each-feature clippy
cargo hack clippy --target wasm32-unknown-unknown
cargo hack --locked --each-feature clippy
cargo hack --locked clippy --target wasm32-unknown-unknown

# We use "run" to run the soroban-env-host/src/bin/main.rs
# entrypoint, which both excludes dev-deps (noisy) and
Expand All @@ -31,7 +31,7 @@ regenerate-test-wasms:
make -C soroban-test-wasms regenerate-test-wasms

reobserve-tests:
UPDATE_OBSERVATIONS=1 cargo test -p soroban-env-host --features testutils --profile test-opt
UPDATE_OBSERVATIONS=1 cargo test --locked -p soroban-env-host --features testutils --profile test-opt

publish:
cargo workspaces publish --all --force '*' --from-git --yes
Expand Down
2 changes: 1 addition & 1 deletion soroban-bench-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ publish = false

[dependencies]
soroban-env-common = { workspace = true }
tracking-allocator = "0.4.0"
tracking-allocator = "=0.4.0"

[features]
next = ["soroban-env-common/next"]
Expand Down
8 changes: 4 additions & 4 deletions soroban-builtin-sdk-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ rust-version = "1.74"
proc-macro = true

[dependencies]
syn = {version="2.0",features=["full"]}
quote = "1.0"
proc-macro2 = "1.0"
itertools = "0.11.0"
syn = {version="=2.0.39",features=["full"]}
quote = "=1.0.33"
proc-macro2 = "=1.0.69"
itertools = "=0.11.0"

[package.metadata.docs.rs]
all-features = true
18 changes: 9 additions & 9 deletions soroban-env-common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,25 @@ edition = "2021"
rust-version = "1.74"

[build_dependencies]
crate-git-revision = "0.0.6"
crate-git-revision = "=0.0.6"

[dependencies]
soroban-env-macros = { workspace = true }
stellar-xdr = { workspace = true, default-features = false, features = [ "curr" ] }
wasmi = { workspace = true, optional = true }
serde = { version = "1.0.0", features = ["derive"], optional = true }
static_assertions = "1.1.0"
ethnum = "1.5.0"
arbitrary = { version = "1.3.2", features = ["derive"], optional = true }
num-traits = {version = "0.2.17", default-features = false}
num-derive = "0.4.1"
serde = { version = "=1.0.192", features = ["derive"], optional = true }
static_assertions = "=1.1.0"
ethnum = "=1.5.0"
arbitrary = { version = "=1.3.2", features = ["derive"], optional = true }
num-traits = {version = "=0.2.17", default-features = false}
num-derive = "=0.4.1"

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tracy-client = { version = "=0.15.2", features = ["enable", "timer-fallback"], default-features = false, optional = true }

[dev-dependencies]
num_enum = "0.7.1"
num-traits = "0.2.17"
num_enum = "=0.7.1"
num-traits = "=0.2.17"

[features]
std = ["stellar-xdr/std", "stellar-xdr/base64"]
Expand Down
58 changes: 29 additions & 29 deletions soroban-env-host/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,51 +15,51 @@ build = "build.rs"
soroban-builtin-sdk-macros = { workspace = true }
soroban-env-common = { workspace = true, features = ["std", "wasmi"] }
wasmi = { workspace = true }
stellar-strkey = "0.0.8"
static_assertions = "1.1.0"
sha2 = "0.10.0"
hex-literal = "0.4.1"
hmac = "0.12.1"
ed25519-dalek = {version = "2.0.0", features = ["rand_core"] }
stellar-strkey = "=0.0.8"
static_assertions = "=1.1.0"
sha2 = "=0.10.8"
hex-literal = "=0.4.1"
hmac = "=0.12.1"
ed25519-dalek = {version = "=2.0.0", features = ["rand_core"] }
# NB: this must match the same rand version used by ed25519-dalek above
rand = "0.8.5"
rand = "=0.8.5"
# NB: this must match the same rand_chacha version used by ed25519-dalek above
rand_chacha = "0.3.1"
num-traits = "0.2.17"
num-integer = "0.1.45"
num-derive = "0.4.1"
backtrace = { version = "0.3", optional = true }
k256 = {version = "0.13.1", features=["ecdsa", "arithmetic"]}
rand_chacha = "=0.3.1"
num-traits = "=0.2.17"
num-integer = "=0.1.45"
num-derive = "=0.4.1"
backtrace = { version = "=0.3.69", optional = true }
k256 = {version = "=0.13.1", features=["ecdsa", "arithmetic"]}
# NB: getrandom is a transitive dependency of k256 which we're not using directly
# but we have to specify it here in order to enable its 'js' feature which
# is needed to build the host for wasm (a rare but supported config).
getrandom = { version = "0.2", features=["js"] }
sha3 = "0.10.8"
getrandom = { version = "=0.2.11", features=["js"] }
sha3 = "=0.10.8"
# NB: this must match the same curve25519-dalek version used by ed25519-dalek above
# used only for calibration
curve25519-dalek = { version = "4", default-features = false, features = ["digest"]}
curve25519-dalek = { version = "=4.1.1", default-features = false, features = ["digest"]}

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tracy-client = { version = "=0.15.2", features = ["enable", "timer-fallback"], default-features = false, optional = true }

[dev-dependencies]
hex = "0.4.3"
itertools = "0.11.0"
tabwriter = "1.3.0"
thousands = "0.2.0"
hex = "=0.4.3"
itertools = "=0.11.0"
tabwriter = "=1.3.0"
thousands = "=0.2.0"
soroban-env-macros = { workspace = true }
soroban-test-wasms = { package = "soroban-test-wasms", path = "../soroban-test-wasms" }
soroban-synth-wasm = { package = "soroban-synth-wasm", path = "../soroban-synth-wasm" }
soroban-bench-utils = { package = "soroban-bench-utils", path = "../soroban-bench-utils" }
bytes-lit = "0.0.5"
textplots = "0.8.4"
wasmprinter = "0.2.72"
expect-test = "1.4.1"
more-asserts = "0.3.1"
linregress = "0.5.3"
pretty_assertions = "1.4.0"
backtrace = "0.3"
serde_json = "1.0.0"
bytes-lit = "=0.0.5"
textplots = "=0.8.4"
wasmprinter = "=0.2.72"
expect-test = "=1.4.1"
more-asserts = "=0.3.1"
linregress = "=0.5.3"
pretty_assertions = "=1.4.0"
backtrace = "=0.3.69"
serde_json = "=1.0.108"

[features]
testutils = ["soroban-env-common/testutils", "soroban-synth-wasm/testutils", "recording_auth", "dep:backtrace"]
Expand Down
16 changes: 8 additions & 8 deletions soroban-env-host/fuzz/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions soroban-env-host/fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ edition = "2021"
cargo-fuzz = true

[dependencies]
libfuzzer-sys = "0.4"
arbitrary = { version = "1.3.0", features = ["derive"] }
libfuzzer-sys = "=0.4.7"
arbitrary = { version = "=1.3.2", features = ["derive"] }
soroban-env-host = { path = "..", features = ["testutils"]}
soroban-synth-wasm = { path = "../../soroban-synth-wasm", features = ["testutils"]}

Expand Down
12 changes: 6 additions & 6 deletions soroban-env-macros/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ proc-macro = true

[dependencies]
stellar-xdr = { workspace = true, features = ["curr", "std"] }
syn = {version="2.0",features=["full"]}
quote = "1.0"
proc-macro2 = "1.0"
itertools = "0.11.0"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
syn = {version="=2.0.39",features=["full"]}
quote = "=1.0.33"
proc-macro2 = "=1.0.69"
itertools = "=0.11.0"
serde = { version = "=1.0.192", features = ["derive"] }
serde_json = "=1.0.108"

[features]
next = ["stellar-xdr/next"]
Expand Down
10 changes: 5 additions & 5 deletions soroban-synth-wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ rust-version = "1.74"
publish = false

[dependencies]
wasm-encoder = "0.36.2"
wasmparser = "0.116.1"
wasm-encoder = "=0.36.2"
wasmparser = "=0.116.1"
soroban-env-common = { workspace = true }
arbitrary = { version = "1.3.0", features = ["derive"] }
arbitrary = { version = "=1.3.2", features = ["derive"] }
soroban-env-macros = { workspace = true }

[features]
next = ["soroban-env-common/next"]
testutils = ["soroban-env-common/testutils"]

[dev-dependencies]
expect-test = "1.4.1"
wasmprinter = "0.2.72"
expect-test = "=1.4.1"
wasmprinter = "=0.2.72"
4 changes: 2 additions & 2 deletions soroban-test-wasms/wasm-workspace/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ codegen-units = 1
lto = true

[workspace.dependencies.soroban-sdk]
version = "20.0.0-rc2"
version = "=20.0.0-rc2"
git = "https://github.com/stellar/rs-soroban-sdk"

[workspace.dependencies.soroban-env-common]
version = "20.0.0-rc2"
version = "=20.0.0-rc2"
git = "https://github.com/stellar/rs-soroban-env"

# Always build from the local instance of env as we need to rebuild test WASMs
Expand Down