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

Bump fastcrypto #5147

Merged
merged 27 commits into from
Oct 15, 2022
Merged

Bump fastcrypto #5147

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1411da7
Set fastcrypto version to update_hash branch
jonas-lj Oct 12, 2022
b58b10b
Update narwhal to (almost) run with new version of fastcrypto
jonas-lj Oct 12, 2022
11ca5ff
fmt
jonas-lj Oct 12, 2022
15c7bc1
Make hasher mutable and specify iterator types
jonas-lj Oct 12, 2022
23f5233
Update path
jonas-lj Oct 12, 2022
8840286
Revert removing MallocSizeOf
jonas-lj Oct 12, 2022
c151440
Update dependencies
jonas-lj Oct 12, 2022
82679ee
Point fastcrypto dependency at github
jonas-lj Oct 12, 2022
4ebf3e4
Update to new version of fastcrypto
jonas-lj Oct 12, 2022
845b725
Update to api of hashfunctions in fastcrypto
jonas-lj Oct 13, 2022
71a8789
Merge branch 'main' into bump-fastcrypto
jonas-lj Oct 13, 2022
c8cc4fd
Update bls12377
jonas-lj Oct 13, 2022
f9af532
Merge branch 'bump-fastcrypto' of github.com:MystenLabs/sui into bump…
jonas-lj Oct 13, 2022
21fe3ef
Update Cargo.lock
jonas-lj Oct 13, 2022
2644737
Remove unnecessary import
jonas-lj Oct 13, 2022
307ebf0
fmt
jonas-lj Oct 13, 2022
8f9a372
Merge main
jonas-lj Oct 13, 2022
2be0b74
Remove merge conflict marker
jonas-lj Oct 13, 2022
aebf1c4
Try downgrading tokio
jonas-lj Oct 13, 2022
a5f2428
Also update fastcrypto dep in mysten-infra
jonas-lj Oct 13, 2022
8764d08
Merge branch 'main' into bump-fastcrypto
jonas-lj Oct 14, 2022
79e04a3
Try with tokio 1.20.1 version
jonas-lj Oct 14, 2022
9c1eab2
Update workspace dependencies
jonas-lj Oct 14, 2022
c226505
Update fastcrypto version and update hkdf
jonas-lj Oct 14, 2022
3c5f127
Try with new json schema
jonas-lj Oct 14, 2022
a2df9c0
Set fastcrypto version to head of main branch
jonas-lj Oct 14, 2022
c9754ae
Merge branch 'main' into bump-fastcrypto
jonas-lj Oct 15, 2022
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
Prev Previous commit
Next Next commit
Set fastcrypto version to head of main branch
  • Loading branch information
@jonas-lj
jonas-lj committed Oct 14, 2022
commit a2df9c09085c525455b2b29642225e46cd18d451
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ move-ir-types = { git = "https://github.com/move-language/move", rev = "7c8552e0
move-prover = { git = "https://github.com/move-language/move", rev = "7c8552e0001c0c041c929e050c2d2959935485f1" }
move-prover-boogie-backend = { git = "https://github.com/move-language/move", rev = "7c8552e0001c0c041c929e050c2d2959935485f1" }

fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2495f7dcc64a80c0d838cbecff889356e8614d6b" }
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "7c685a4b67680ef3e5d48117f4e2e3aef5c50526" }

# Use the same workspace-hack across crates.
workspace-hack = { path = "crates/workspace-hack" }
12 changes: 6 additions & 6 deletions crates/workspace-hack/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ ethnum = { version = "1", default-features = false }
event-listener = { version = "2", default-features = false }
eyre = { version = "0.6", features = ["auto-install", "track-caller"] }
fail = { version = "0.4", default-features = false }
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2495f7dcc64a80c0d838cbecff889356e8614d6b", features = ["copy_key", "secure"] }
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "7c685a4b67680ef3e5d48117f4e2e3aef5c50526", features = ["copy_key", "secure"] }
fastrand = { version = "1", default-features = false }
fd-lock = { version = "3", default-features = false }
fdlimit = { version = "0.2", default-features = false }
Expand Down Expand Up @@ -333,7 +333,7 @@ move-vm-types = { git = "https://github.com/move-language/move", rev = "7c8552e0
multiaddr = { version = "0.14", features = ["url"] }
multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] }
mysten-network = { version = "0.2", default-features = false }
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "9479c1a8e1ca6ebd8d6da3c5e7b1eb065d7ef797", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] }
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "b8cbd02537a7b546d8f859d9b639a4a90e4d1126", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] }
named-lock = { version = "0.2", default-features = false }
nested = { version = "0.1", default-features = false }
nexlint = { git = "https://github.com/nextest-rs/nexlint.git", rev = "5926141c20414814290bb1b04bd3b2238bbbc90e", default-features = false }
Expand Down Expand Up @@ -813,8 +813,8 @@ ethnum = { version = "1", default-features = false }
event-listener = { version = "2", default-features = false }
eyre = { version = "0.6", features = ["auto-install", "track-caller"] }
fail = { version = "0.4", default-features = false }
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2495f7dcc64a80c0d838cbecff889356e8614d6b", features = ["copy_key", "secure"] }
fastcrypto-derive = { git = "https://github.com/MystenLabs/fastcrypto", rev = "2495f7dcc64a80c0d838cbecff889356e8614d6b", default-features = false }
fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "7c685a4b67680ef3e5d48117f4e2e3aef5c50526", features = ["copy_key", "secure"] }
fastcrypto-derive = { git = "https://github.com/MystenLabs/fastcrypto", rev = "7c685a4b67680ef3e5d48117f4e2e3aef5c50526", default-features = false }
fastrand = { version = "1", default-features = false }
fd-lock = { version = "3", default-features = false }
fdlimit = { version = "0.2", default-features = false }
Expand Down Expand Up @@ -985,8 +985,8 @@ multihash = { version = "0.16", default-features = false, features = ["alloc", "
multihash-derive = { version = "0.8", default-features = false, features = ["std"] }
multimap = { version = "0.8", default-features = false }
mysten-network = { version = "0.2", default-features = false }
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "9479c1a8e1ca6ebd8d6da3c5e7b1eb065d7ef797", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] }
mysten-util-mem-derive = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "9479c1a8e1ca6ebd8d6da3c5e7b1eb065d7ef797", default-features = false }
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "b8cbd02537a7b546d8f859d9b639a4a90e4d1126", features = ["estimate-heapsize", "hashbrown", "parking_lot", "smallvec", "std"] }
mysten-util-mem-derive = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "b8cbd02537a7b546d8f859d9b639a4a90e4d1126", default-features = false }
name-variant = { version = "0.1", default-features = false }
named-lock = { version = "0.2", default-features = false }
nested = { version = "0.1", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion narwhal/consensus/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ arc-swap = { version = "1.5.1", features = ["serde"] }
bincode = "1.3.3"
bytes = "1.2.1"
match_opt = "0.1.2"
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "9479c1a8e1ca6ebd8d6da3c5e7b1eb065d7ef797" }
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "b8cbd02537a7b546d8f859d9b639a4a90e4d1126" }
rand = { version = "0.8.5", optional = true }
serde = { version = "1.0.144", features = ["derive"] }
store.workspace = true
Expand Down
2 changes: 1 addition & 1 deletion narwhal/types/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ derive_builder = "0.11.2"
futures = "0.3.24"
indexmap = { version = "1.9.1", features = ["serde"] }
mockall = "0.11.2"
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "9479c1a8e1ca6ebd8d6da3c5e7b1eb065d7ef797" }
mysten-util-mem = { git = "https://github.com/MystenLabs/mysten-infra/", rev = "b8cbd02537a7b546d8f859d9b639a4a90e4d1126" }
prometheus = "0.13.2"
proptest = "1.0.0"
proptest-derive = "0.3.0"
Expand Down