Skip to content

Commit

Permalink
chore: update the narwhal pointer (MystenLabs#3067)
Browse files Browse the repository at this point in the history
  • Loading branch information
@huitseeker
huitseeker authored Jul 7, 2022
1 parent 659f5ec commit 306b331
Show file tree
Hide file tree
Showing 27 changed files with 130 additions and 152 deletions.
141 changes: 68 additions & 73 deletions Cargo.lock
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/generate-json-rpc-spec/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ sui-json = { path = "../sui-json" }
sui-types = { path = "../sui-types" }
sui-config = { path = "../sui-config" }
test-utils = { path = "../test-utils" }
workspace-hack = { path = "../workspace-hack"}

move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
workspace-hack = { path = "../workspace-hack"}
5 changes: 2 additions & 3 deletions crates/sui-benchmark/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ strum_macros = "0.24.2"
num_cpus = "1.13.1"
rocksdb = "0.18.0"
serde_with = { version = "1.14.0", features = ["hex"] }
tracing = "0.1.34"
tracing = "0.1.35"
tracing-subscriber = { version = "0.3.11", features = ["time", "registry", "env-filter"] }
clap = { version = "3.1.17", features = ["derive"] }
prometheus = "0.13.1"
Expand All @@ -31,8 +31,7 @@ sui-config = { path = "../sui-config" }
sui-types = { path = "../sui-types" }

move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "node" }

narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "node" }
workspace-hack = { path = "../workspace-hack"}

[features]
Expand Down
4 changes: 2 additions & 2 deletions crates/sui-cluster-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ futures = "0.3.21"
serde_json = "1.0.80"
tempfile = "3.3.0"
tokio = { version = "1.17.0", features = ["full"] }
tracing = { version = "0.1.34", features = ["log"] }
tracing = { version = "0.1.35", features = ["log"] }
clap = { version = "3.1.14", features = ["derive"] }
reqwest = { version = "0.11.11", features = ["blocking", "json"] }
telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
Expand All @@ -22,4 +22,4 @@ sui-json-rpc-api = { path = "../sui-json-rpc-api" }
sui-types = { path = "../sui-types" }
sui-json = { path = "../sui-json" }
sui-config = { path = "../sui-config" }
workspace-hack = { path = "../workspace-hack"}
workspace-hack = { path = "../workspace-hack"}
6 changes: 3 additions & 3 deletions crates/sui-config/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ dirs = "4.0.0"
multiaddr = "0.14.0"
once_cell = "1.11.0"
debug-ignore = { version = "1.0.2", features = ["serde"] }
tracing = "0.1.34"
tracing = "0.1.35"

narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "config" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "crypto" }
narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "config" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "crypto" }
move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }

Expand Down
9 changes: 5 additions & 4 deletions crates/sui-config/src/builder.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,11 @@ impl<R: ::rand::RngCore + ::rand::CryptoRng> ConfigBuilder<R> {
(name, authority)
})
.collect::<BTreeMap<_, _>>();
let narwhal_committee = DebugIgnore(Arc::new(narwhal_config::Committee {
authorities: ArcSwap::from_pointee(narwhal_committee),
epoch: ArcSwap::from_pointee(genesis.epoch() as Epoch),
}));
let narwhal_committee =
DebugIgnore(Arc::new(ArcSwap::from_pointee(narwhal_config::Committee {
authorities: narwhal_committee,
epoch: genesis.epoch() as Epoch,
})));

let validator_configs = validators
.into_iter()
Expand Down
8 changes: 4 additions & 4 deletions crates/sui-core/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ tokio-stream = { version = "0.1.8", features = ["sync", "net"] }
parking_lot = "0.12.1"
async-trait = "0.1.53"
tempfile = "3.3.0"
tracing = "0.1.34"
tracing = "0.1.35"
signature = "1.5.0"
bincode = "1.3.3"
multiaddr = "0.14.0"
Expand All @@ -46,9 +46,9 @@ move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99
typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4"}
mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }

narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "executor" }
narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "types" }
narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "node" }
narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "executor" }
narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "types" }
narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "node" }
workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
Expand Down
3 changes: 1 addition & 2 deletions crates/sui-faucet/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ axum = "0.5.11"
clap = { version = "3.1.17", features = ["derive"] }
thiserror = "1.0.31"
tokio = { version = "1.18.2", features = ["full"] }
tracing = "0.1.34"
tracing = "0.1.35"
serde = { version = "1.0.138", features = ["derive"] }
tower = { version = "0.4.12", features = ["util", "timeout", "load-shed", "limit"] }
tower-http = { version = "0.3.4", features = ["cors"] }
Expand All @@ -24,7 +24,6 @@ sui-json-rpc-api = { path = "../sui-json-rpc-api" }
sui-types = { path = "../sui-types" }
sui-config = { path = "../sui-config" }
telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }

workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion crates/sui-framework-build/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ move-bytecode-verifier = { git = "https://github.com/move-language/move", rev =
move-compiler = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }

workspace-hack = { path = "../workspace-hack"}
1 change: 0 additions & 1 deletion crates/sui-framework/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ move-stdlib = { git = "https://github.com/move-language/move", rev = "f07e99473e
move-unit-test = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-vm-runtime = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }

workspace-hack = { path = "../workspace-hack"}

[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions crates/sui-gateway/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ edition = "2021"
anyhow = { version = "1.0.58", features = ["backtrace"] }
async-trait = "0.1.53"
serde = { version = "1.0.138", features = ["derive"] }
tracing = "0.1.34"
tracing = "0.1.35"
tokio = { version = "1.18.2", features = ["full"] }
futures = "0.3.21"
prometheus = "0.13.1"
Expand All @@ -26,8 +26,8 @@ sui-json-rpc-api = { path = "../sui-json-rpc-api" }
sui-node = { path = "../sui-node" }

mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
workspace-hack = { path = "../workspace-hack"}
move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
test-utils = { path = "../test-utils" }
Expand Down
3 changes: 1 addition & 2 deletions crates/sui-json-rpc-api/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ sui-types = { path = "../sui-types" }
sui-json = { path = "../sui-json" }
sui-open-rpc = { path = "../sui-open-rpc" }
sui-open-rpc-macros = { path = "../sui-open-rpc-macros" }

workspace-hack = { path = "../workspace-hack" }
workspace-hack = { path = "../workspace-hack"}
3 changes: 1 addition & 2 deletions crates/sui-json-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jsonrpsee = { version = "0.14.0", features = ["full"] }
jsonrpsee-core = "0.14.0"
prometheus = "0.13.1"
anyhow = "1.0.58"
tracing = "0.1.34"
tracing = "0.1.35"
async-trait = "0.1.53"
ed25519-dalek = { version = "1.0.1", features = ["batch", "serde"] }
serde = { version = "1.0.138", features = ["derive"] }
Expand All @@ -23,5 +23,4 @@ sui-types = { path = "../sui-types" }
sui-json = { path = "../sui-json" }
sui-open-rpc = { path = "../sui-open-rpc" }
sui-json-rpc-api = { path = "../sui-json-rpc-api" }

workspace-hack = { path = "../workspace-hack"}
1 change: 0 additions & 1 deletion crates/sui-json/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ sui-verifier = { path = "../sui-verifier" }

move-binary-format = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }
workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
test-fuzz = "3.0.2"
Expand Down
1 change: 0 additions & 1 deletion crates/sui-network/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ tonic = "0.7"
sui-types = { path = "../sui-types" }

mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }

workspace-hack = { path = "../workspace-hack"}

[build-dependencies]
Expand Down
3 changes: 1 addition & 2 deletions crates/sui-node/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ clap = { version = "3.1.17", features = ["derive"] }
multiaddr = "0.14.0"
prometheus = "0.13.1"
tokio = { version = "1.18.2", features = ["full"] }
tracing = "0.1.34"
tracing = "0.1.35"
parking_lot = "0.12.1"
futures = "0.3.21"
jsonrpsee = { version = "0.14.0", features = ["full"] }
Expand All @@ -27,5 +27,4 @@ sui-types = { path = "../sui-types" }

telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }
mysten-network = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }

workspace-hack = { path = "../workspace-hack"}
1 change: 0 additions & 1 deletion crates/sui-open-rpc-macros/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ quote = "1.0"
proc-macro2 = "1.0"
itertools = "0.10.3"
derive-syn-parse = "0.1.5"

workspace-hack = { path = "../workspace-hack"}
1 change: 0 additions & 1 deletion crates/sui-open-rpc/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,4 @@ edition = "2021"
[dependencies]
schemars = "0.8.10"
serde = "1.0.138"

workspace-hack = { path = "../workspace-hack"}
3 changes: 1 addition & 2 deletions crates/sui-quorum-driver/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ edition = "2021"
[dependencies]
arc-swap = "1.5.0"
tokio = { version = "1.18.2", features = ["full"] }
tracing = "0.1.34"
tracing = "0.1.35"

sui-core = { path = "../sui-core" }
sui-types = { path = "../sui-types" }

workspace-hack = { path = "../workspace-hack"}
3 changes: 1 addition & 2 deletions crates/sui-storage/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,14 @@ serde_json = "1.0.80"
tokio = { version = "1.17.0", features = ["full", "tracing"] }
tokio-stream = "^0.1"
rocksdb = "0.18.0"
tracing = "0.1.34"
tracing = "0.1.35"
sqlx = { version = "0.5", features = [ "runtime-tokio-rustls", "sqlite" ] }
strum = "^0.24"
strum_macros = "^0.24"

sui-types = { path = "../sui-types" }
typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4"}
move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }

workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion crates/sui-swarm/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2021"
[dependencies]
anyhow = { version = "1.0.58", features = ["backtrace"] }
rand = "0.7.3"
tracing = "0.1.34"
tracing = "0.1.35"
tokio = { version = "1.18.2", features = ["full"] }
futures = "0.3.21"
tempfile = "3.3.0"
Expand Down
1 change: 0 additions & 1 deletion crates/sui-transactional-test-runner/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,4 @@ sui-framework = { path = "../sui-framework" }
sui-types = { path = "../sui-types" }
sui-adapter = { path = "../sui-adapter" }
sui-core = { path = "../sui-core" }

workspace-hack = { path = "../workspace-hack"}
6 changes: 3 additions & 3 deletions crates/sui-types/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@ move-disassembler = { git = "https://github.com/move-language/move", rev = "f07e
move-ir-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-vm-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }

narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "executor" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "fe7de29b59810d4515604af949cdcf1fb5a3720a", package = "crypto" }
narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "executor" }
narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "5be9046d6b8f7563740f4d03bba10550d3628672", package = "crypto" }
workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
bincode = "1.3.3"
bincode = "1.3.3"
1 change: 0 additions & 1 deletion crates/sui-verifier/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,4 @@ move-bytecode-verifier = { git = "https://github.com/move-language/move", rev =
move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }

sui-types = { path = "../sui-types" }

workspace-hack = { path = "../workspace-hack"}
4 changes: 1 addition & 3 deletions crates/sui/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ serde_json = "1.0.80"
tokio = { version = "1.18.2", features = ["full"] }
async-trait = "0.1.53"
serde_with = { version = "1.14.0", features = ["hex"] }
tracing = "0.1.34"
tracing = "0.1.35"
clap = { version = "3.1.17", features = ["derive"] }
telemetry-subscribers = { git = "https://github.com/MystenLabs/mysten-infra", rev = "94d7da89f6a52d7f60a9802b0a03147a9c89c3e4" }

Expand All @@ -36,8 +36,6 @@ move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99
move-unit-test = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-cli = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }


workspace-hack = { path = "../workspace-hack"}

[dev-dependencies]
Expand Down
1 change: 0 additions & 1 deletion crates/test-utils/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,4 @@ sui-types = { path = "../sui-types" }

move-package = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a" }
move-core-types = { git = "https://github.com/move-language/move", rev = "f07e99473e6edfff22f30596dd493ac770f0bb4a", features = ["address20"] }

workspace-hack = { path = "../workspace-hack"}
Loading

0 comments on commit 306b331

Please sign in to comment.