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.

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

Allow using higher versions of dalek in env. #1421

Merged
merged 4 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ jobs:
steps:
- uses: actions/checkout@v3
- run: rustup update
- uses: stellar/binaries@v18
- uses: stellar/binaries@v24
with:
name: cargo-semver-checks
version: 0.27.0
version: 0.32.0
- run: cargo semver-checks --exclude soroban-simulation

build-and-test:
Expand Down
4 changes: 3 additions & 1 deletion deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ exclude = [
# Somehow the tracking machinery of two different dev-dep tracing
# subsystems also winds up pulling in conflicts, but again, just
# dev-deps or non-produciton configs.
"tracking-allocator"
"tracking-allocator",
# Temporary
"curve25519-dalek"
]

# If true, metadata will be collected with `--all-features`. Note that this can't
Expand Down
2 changes: 1 addition & 1 deletion soroban-env-common/src/tuple.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,6 @@ impl<E: Env> TryFromVal<E, ()> for [Val; 0] {
type Error = crate::Error;

fn try_from_val(_env: &E, _v: &()) -> Result<Self, Self::Error> {
Ok([Val::VOID.into(); 0])
Ok([])
}
}
3 changes: 2 additions & 1 deletion soroban-env-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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: We'll need to pin this again after switching the Core to the new env version.
sisuresh marked this conversation as resolved.
Show resolved Hide resolved
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"
# NB: this must match the same rand_chacha version used by ed25519-dalek above
Expand Down
Loading