Bump narwhal revision in Sui (MystenLabs#1918)

bagnetov · May 12, 2022 · 3996636 · 3996636
1 parent cb604d2
commit 3996636
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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" }