diff --git a/Cargo.lock b/Cargo.lock index e5d550ef14e30..b19bfb9d98782 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -925,7 +925,7 @@ dependencies = [ [[package]] name = "config" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "crypto", "multiaddr", @@ -954,7 +954,7 @@ dependencies = [ [[package]] name = "consensus" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "bincode", "blake2", @@ -1118,7 +1118,7 @@ dependencies = [ [[package]] name = "crypto" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "ark-bls12-377", "ark-ec", @@ -1626,7 +1626,7 @@ checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71" [[package]] name = "executor" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "async-trait", "bincode", @@ -3539,7 +3539,7 @@ checksum = "ca2b420f638f07fe83056b55ea190bb815f609ec5a35e7017884a10f78839c9e" [[package]] name = "network" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "async-trait", "backoff", @@ -3612,7 +3612,7 @@ dependencies = [ [[package]] name = "node" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "anyhow", "async-trait", @@ -3636,6 +3636,7 @@ dependencies = [ "tracing-subscriber 0.3.11", "typed-store", "types", + "url", "worker", ] @@ -4217,7 +4218,7 @@ dependencies = [ [[package]] name = "primary" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "async-recursion", "async-trait", @@ -6326,7 +6327,7 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "types" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "base64", "bincode", @@ -6796,7 +6797,7 @@ checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" [[package]] name = "worker" version = "0.1.0" -source = "git+https://github.com/MystenLabs/narwhal?rev=a188b870eb1a4b601a58e5744290b7d56ccd4039#a188b870eb1a4b601a58e5744290b7d56ccd4039" +source = "git+https://github.com/MystenLabs/narwhal?rev=23745f48103656eae4a4205d0b3edd53ad8894de#23745f48103656eae4a4205d0b3edd53ad8894de" dependencies = [ "anyhow", "async-trait", diff --git a/scripts/dependency.py b/scripts/dependency.py index 4140ce9883487..c6be8a6f79c8a 100644 --- a/scripts/dependency.py +++ b/scripts/dependency.py @@ -23,7 +23,7 @@ def parse_args(): ) subparser.add_parser("local") upgrade = subparser.add_parser("upgrade") - upgrade.add_argument("--repo", required=False, default="move-language") + upgrade.add_argument("--repo", required=False) upgrade_group = upgrade.add_mutually_exclusive_group(required=True) upgrade_group.add_argument("--rev") upgrade_group.add_argument("--branch") @@ -130,4 +130,10 @@ def process_line(line, _): switch_to_local(args.project) else: assert args.command == "upgrade" - upgrade_revision(args.project, args.repo, args.rev, args.branch) + repo = args.repo + if not repo: + if args.project == "move": + repo = "move-language" + else: + repo = "MystenLabs" + upgrade_revision(args.project, repo, args.rev, args.branch) diff --git a/sui/Cargo.toml b/sui/Cargo.toml index 21acc2b0eef9d..659286498e96c 100644 --- a/sui/Cargo.toml +++ b/sui/Cargo.toml @@ -59,9 +59,9 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "3d8 move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" } move-unit-test = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" } -narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "node" } -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "config" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "crypto" } +narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "node" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "config" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "crypto" } once_cell = "1.10.0" diff --git a/sui_core/Cargo.toml b/sui_core/Cargo.toml index f43403842cd29..bcedb5965f151 100644 --- a/sui_core/Cargo.toml +++ b/sui_core/Cargo.toml @@ -50,8 +50,8 @@ move-vm-types = { git = "https://github.com/move-language/move", rev = "3d809365 typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev = "3b7daedf91fd8937dde26e905b8114cac459b866"} -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "executor" } -narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "types" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "executor" } +narwhal-types = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "types" } [dev-dependencies] serde-reflection = "0.3.5" diff --git a/sui_types/Cargo.toml b/sui_types/Cargo.toml index 52c1a67f17200..f25e04bf683c3 100644 --- a/sui_types/Cargo.toml +++ b/sui_types/Cargo.toml @@ -44,5 +44,5 @@ move-disassembler = { git = "https://github.com/move-language/move", rev = "3d80 move-ir-types = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" } move-vm-types = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" } -narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "executor" } -narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "crypto" } +narwhal-executor = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "executor" } +narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "crypto" } diff --git a/test_utils/Cargo.toml b/test_utils/Cargo.toml index d464daf854ac8..a542139ce81c1 100644 --- a/test_utils/Cargo.toml +++ b/test_utils/Cargo.toml @@ -23,7 +23,7 @@ sui-framework = { path = "../sui_programmability/framework" } move-package = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5" } move-core-types = { git = "https://github.com/move-language/move", rev = "3d80936565ef39550f99b37c7c1accde74069fc5", features = ["address20"] } typed-store = { git = "https://github.com/MystenLabs/mysten-infra", rev ="3b7daedf91fd8937dde26e905b8114cac459b866"} -narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "a188b870eb1a4b601a58e5744290b7d56ccd4039", package = "config" } +narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "23745f48103656eae4a4205d0b3edd53ad8894de", package = "config" } sui-types = { path = "../sui_types" } sui_core = { path = "../sui_core" }