Skip to content
This repository has been archived by the owner on Oct 17, 2022. It is now read-only.

Commit

Permalink
chore(deps): bump the mysten infra pointer (#692)
Browse files Browse the repository at this point in the history
  • Loading branch information
@huitseeker
huitseeker authored Aug 5, 2022
1 parent 7b0421b commit 8ab5133
Show file tree
Hide file tree
Showing 10 changed files with 154 additions and 71 deletions.
171 changes: 123 additions & 48 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion consensus/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ rand = { version = "0.8.5", optional = true }
rocksdb = { version = "0.18.0", features = ["snappy", "lz4", "zstd", "zlib"], default-features = false }
serde = { version = "1.0.142", features = ["derive"] }
serde_bytes = "0.11.6"
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
thiserror = "1.0.31"
tokio = { version = "1.20.1", features = ["sync"] }
tracing = "0.1.36"
Expand Down
4 changes: 2 additions & 2 deletions executor/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ multiaddr = "0.14.0"
types = { path = "../types" }
worker = { path = "../worker" }

store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
workspace-hack = { version = "0.1", path = "../workspace-hack" }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ multiaddr = "0.14.0"
anyhow = "1.0.59"
prometheus = "0.13.1"

mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
workspace-hack = { version = "0.1", path = "../workspace-hack" }
serde = "1.0.142"

Expand Down
4 changes: 2 additions & 2 deletions node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ futures = "0.3.21"
multiaddr = "0.14.0"
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "20ef52a00135114eb361e28673cfaa9bf4560f6f" }
rand = "0.8.5"
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
thiserror = "1.0.31"
tokio = { version = "1.20.1", features = ["full"] }
tokio-stream = "0.1.9"
tokio-util = { version = "0.7.3", features = ["codec"] }
tracing = "0.1.36"
tracing-log = "0.1.3"
tracing-subscriber = { version = "0.3.15", features = ["time", "env-filter"] }
telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
url = "2.2.2"
dhat = { version = "0.3.0", optional = true }

Expand Down
6 changes: 3 additions & 3 deletions primary/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ crypto = { path = "../crypto" }
network = { path = "../network" }
types = { path = "../types" }

store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
prometheus = "0.13.1"
once_cell = "1.13.0"
dashmap = "5.3.4"
Expand All @@ -55,7 +55,7 @@ async-trait = "0.1.57"
executor = { path = "../executor" }
thiserror = "1.0.31"
tracing = "0.1.36"
telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
indexmap = { version = "1.9.1", features = ["serde"] }

[features]
Expand Down
4 changes: 2 additions & 2 deletions test_utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ worker = { path = "../worker"}
node = { path = "../node"}
executor = { path = "../executor"}

store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
workspace-hack = { version = "0.1", path = "../workspace-hack" }
2 changes: 1 addition & 1 deletion types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ prost = "0.10.4"
rand = "0.8.5"
serde = { version = "1.0.142", features = ["derive"] }
signature = "1.5.0"
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
thiserror = "1.0.31"
tokio = { version = "1.20.1", features = ["sync", "rt", "macros"] }
tokio-util = { version = "0.7.3", features = ["codec"] }
Expand Down
4 changes: 2 additions & 2 deletions worker/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ network = { path = "../network" }
primary = { path = "../primary" }
types = { path = "../types" }

store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c" }
store = { git = "https://github.com/mystenlabs/mysten-infra.git", package = "typed-store", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
mysten-network = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa" }
prometheus = "0.13.1"
workspace-hack = { version = "0.1", path = "../workspace-hack" }

Expand Down
26 changes: 17 additions & 9 deletions workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ byteorder = { version = "1", features = ["i128", "std"] }
bytes = { version = "1", features = ["std"] }
bzip2-sys = { version = "0.1", default-features = false, features = ["static"] }
cast = { version = "0.3", default-features = false }
cfg-if = { version = "1", default-features = false }
cfg-if-c65f7effa3be6d31 = { package = "cfg-if", version = "0.1", default-features = false }
cfg-if-dff4ba8e3ae991db = { package = "cfg-if", version = "1", default-features = false }
clap-f595c2ba2a3f28df = { package = "clap", version = "2", features = ["ansi_term", "atty", "color", "strsim", "suggestions", "vec_map"] }
clap-7b89eefb6aaa9bf3 = { package = "clap", version = "3", features = ["atty", "color", "std", "strsim", "suggestions", "termcolor"] }
clap_lex = { version = "0.2", default-features = false }
Expand Down Expand Up @@ -172,8 +173,8 @@ mio = { version = "0.8", features = ["net", "os-ext", "os-poll"] }
mockall = { version = "0.11", default-features = false }
multiaddr = { version = "0.14", features = ["url"] }
multihash = { version = "0.16", default-features = false, features = ["alloc", "derive", "identity", "multihash-derive", "multihash-impl", "std"] }
mysten-network-c01aa52156ee3946 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false }
mysten-network-4bfefd54e41eb1ee = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "20ef52a00135114eb361e28673cfaa9bf4560f6f", default-features = false }
mysten-network-2187a2855c8ab378 = { package = "mysten-network", git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false }
normalize-line-endings = { version = "0.3", default-features = false }
num-bigint = { version = "0.4", default-features = false }
num-integer = { version = "0.1", default-features = false, features = ["i128"] }
Expand Down Expand Up @@ -201,6 +202,7 @@ plotters = { version = "0.3", default-features = false, features = ["area_series
plotters-backend = { version = "0.3", default-features = false }
plotters-svg = { version = "0.3", default-features = false }
ppv-lite86 = { version = "0.2", default-features = false, features = ["simd", "std"] }
pre = { version = "0.2", features = ["alloc", "core", "std"] }
predicates = { version = "2", features = ["diff", "difflib", "float-cmp", "normalize-line-endings", "regex"] }
predicates-core = { version = "1", default-features = false }
predicates-tree = { version = "1", default-features = false }
Expand Down Expand Up @@ -264,7 +266,7 @@ structopt = { version = "0.3" }
subtle = { version = "2", default-features = false, features = ["i128", "std"] }
subtle-ng = { version = "2", default-features = false }
sync_wrapper = { version = "0.1", default-features = false }
telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] }
telemetry-subscribers = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", features = ["chrome", "jaeger", "opentelemetry", "opentelemetry-jaeger", "tracing-chrome", "tracing-opentelemetry"] }
tempfile = { version = "3", default-features = false }
termcolor = { version = "1", default-features = false }
terminal_size = { version = "0.1", default-features = false }
Expand Down Expand Up @@ -303,7 +305,7 @@ tracing-subscriber-6f8ce4dd05d13bba = { package = "tracing-subscriber", version
tracing-subscriber-468e82937335b1c9 = { package = "tracing-subscriber", version = "0.3", features = ["alloc", "ansi", "ansi_term", "env-filter", "fmt", "matchers", "once_cell", "regex", "registry", "sharded-slab", "smallvec", "std", "thread_local", "time", "tracing", "tracing-log"] }
tracing-test = { version = "0.2", default-features = false }
try-lock = { version = "0.2", default-features = false }
typed-store = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "123c9e40b529315e1c1d91a54fb717111c3e349c", default-features = false }
typed-store = { git = "https://github.com/mystenlabs/mysten-infra.git", rev = "d965a5a795dcdb4d1c7964acf556bc249fdc58aa", default-features = false }
typenum = { version = "1", default-features = false }
unicode-bidi = { version = "0.3", features = ["hardcoded-data", "std"] }
unicode-normalization = { version = "0.1", features = ["std"] }
Expand Down Expand Up @@ -334,7 +336,8 @@ bitflags = { version = "1" }
bytes = { version = "1", features = ["std"] }
cc = { version = "1", default-features = false, features = ["jobserver", "parallel"] }
cexpr = { version = "0.6", default-features = false }
cfg-if = { version = "1", default-features = false }
cfg-if-c65f7effa3be6d31 = { package = "cfg-if", version = "0.1", default-features = false }
cfg-if-dff4ba8e3ae991db = { package = "cfg-if", version = "1", default-features = false }
clang-sys = { version = "1", default-features = false, features = ["clang_3_5", "clang_3_6", "clang_3_7", "clang_3_8", "clang_3_9", "clang_4_0", "clang_5_0", "clang_6_0", "libloading", "runtime"] }
cmake = { version = "0.1", default-features = false }
darling = { version = "0.14", features = ["suggestions"] }
Expand Down Expand Up @@ -377,8 +380,10 @@ pest = { version = "2", features = ["std", "thiserror"] }
petgraph = { version = "0.6", default-features = false }
pin-project-internal = { version = "1", default-features = false }
pkg-config = { version = "0.3", default-features = false }
pre-proc-macro = { version = "0.2", default-features = false }
prettyplease = { version = "0.1", default-features = false }
proc-macro-crate = { version = "1", default-features = false }
proc-macro-crate-c65f7effa3be6d31 = { package = "proc-macro-crate", version = "0.1", default-features = false }
proc-macro-crate-dff4ba8e3ae991db = { package = "proc-macro-crate", version = "1", default-features = false }
proc-macro-error = { version = "1", features = ["syn", "syn-error"] }
proc-macro-error-attr = { version = "1", default-features = false }
proc-macro2-9fbad63c4bcf4a8f = { package = "proc-macro2", version = "0.4", features = ["proc-macro"] }
Expand All @@ -395,10 +400,13 @@ regex = { version = "1", features = ["aho-corasick", "memchr", "perf", "perf-cac
regex-syntax = { version = "0.6", features = ["unicode", "unicode-age", "unicode-bool", "unicode-case", "unicode-gencat", "unicode-perl", "unicode-script", "unicode-segment"] }
remove_dir_all = { version = "0.5", default-features = false }
rustc-hash = { version = "1", features = ["std"] }
rustc_version = { version = "0.3", default-features = false }
rustc_version-6f8ce4dd05d13bba = { package = "rustc_version", version = "0.2", default-features = false }
rustc_version-468e82937335b1c9 = { package = "rustc_version", version = "0.3", default-features = false }
rustversion = { version = "1", default-features = false }
semver = { version = "0.11" }
semver-parser = { version = "0.10", default-features = false }
semver-a6292c17cd707f01 = { package = "semver", version = "0.11" }
semver-274715c4dabd11b0 = { package = "semver", version = "0.9" }
semver-parser-93f6ce9d446188ac = { package = "semver-parser", version = "0.10", default-features = false }
semver-parser-ca01ad9e24f5d932 = { package = "semver-parser", version = "0.7", default-features = false }
serde = { version = "1", features = ["alloc", "derive", "rc", "serde_derive", "std"] }
serde_derive = { version = "1" }
serde_with_macros = { version = "2", default-features = false }
Expand Down

1 comment on commit 8ab5133

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Bench results

SUMMARY:

  • CONFIG:
    Faults: 0 node(s)
    Committee size: 4 node(s)
    Worker(s) per node: 1 worker(s)
    Collocate primary and workers: True
    Input rate: 50,000 tx/s
    Transaction size: 512 B
    Execution time: 20 s

Header size: 1,000 B
Max header delay: 200 ms
GC depth: 50 round(s)
Sync retry delay: 10,000 ms
Sync retry nodes: 3 node(s)
batch size: 500,000 B
Max batch delay: 200 ms
Max concurrent requests: 500,000

  • RESULTS:
    Consensus TPS: 28,102 tx/s
    Consensus BPS: 14,388,418 B/s
    Consensus latency: 487 ms

End-to-end TPS: 27,773 tx/s
End-to-end BPS: 14,219,614 B/s
End-to-end latency: 1,007 ms

PR to merge 8ab5133 ->

Please sign in to comment.