Skip to content

Commit

Permalink
Update dalek crates, k256, and wasmi for protocol 22 (#1466)
Browse files Browse the repository at this point in the history
Just update deps for p22

fix #1353 
fix #1313
  • Loading branch information
graydon authored Sep 24, 2024
1 parent 0497816 commit 1647571
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 52 deletions.
47 changes: 22 additions & 25 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@ default-features = false

[workspace.dependencies.wasmi]
package = "soroban-wasmi"
version = "=0.36.0-soroban.22.0.0"
git = "https://github.com/stellar/wasmi"
rev = "122a74a7c491929e5ac9de876099154ef7c06d06"
version = "=0.36.1-soroban.22.0.0"
features = ["no-hash-maps"]
# git = "https://github.com/stellar/wasmi"
# rev = "8eb77b143ca5382c349dd5a8170ffa32a2d0ef03"

# [patch."https://github.com/stellar/rs-stellar-xdr"]
# [patch.crates-io]
Expand Down
2 changes: 0 additions & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,6 @@ exclude = [
# subsystems also winds up pulling in conflicts, but again, just
# dev-deps or non-produciton configs.
"tracking-allocator",
# Temporary
"curve25519-dalek"
]

# If true, metadata will be collected with `--all-features`. Note that this can't
Expand Down
24 changes: 2 additions & 22 deletions soroban-env-host/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ 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", default-features = false, features = ["ecdsa", "arithmetic"]}
k256 = {version = "0.13.3", default-features = false, features = ["ecdsa", "arithmetic"]}
p256 = {version = "0.13.2", default-features = false, features = ["ecdsa", "arithmetic"]}
ecdsa = {version = "0.16.7", default-features = false}
sec1 = {version = "0.7.2"}
Expand All @@ -46,27 +46,7 @@ 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
#
# NB temporary: curve25519-dalek _should_ be pinned to =4.1.1, and it _is_
# pinned to that version in stellar-core (which embeds soroban-env-host), but
# there is code in curve25519-dalek version 4.1.1 that does not compile on rust
# nightly 2024-02-05, because of a small change to the way SIMD code is
# feature-gated in the rust stdlib, and for inexplicable reasons docs.rs builds
# its documentation using a nightly compiler. As a result, docs for
# soroban-env-host can't build if we pin this to 4.1.1 here. So we give it a
# _slightly_ wider version range _locally_, just to help the docs.rs build when
# it is building docs for this crate alone. When stellar-core builds
# soroban-env-host, it will still resolve curve25519-dalek to 4.1.1, since that
# version satisfies both stellar-core's strict 4.1.1 requirement as well as our
# range-requirement here. IOW nothing about this range-requirement changes what
# stellar-core ultimately ships. This is a temporary workaround until the next
# protocol release when we can safely bump the minimum curve25519-dalek version
# in stellar-core as well.
#
# NB: we relaxed this further in order to comply with the security advisory
# which requires "4.1.3". We will need to pin to this version once Core is
# updated to the new env version.
curve25519-dalek = { version = ">=4.1.1", default-features = false, features = ["digest"]}
curve25519-dalek = { version = ">=4.1.3", default-features = false, features = ["digest"]}
ark-bls12-381 = { version = "0.4.0"}
ark-serialize = { version = "0.4.2"}
ark-ff = { version = "0.4.2"}
Expand Down

0 comments on commit 1647571

Please sign in to comment.