Fix narwhal dependency with net updates (MystenLabs#1677)

Fix narwhal & shared object support
nigolov · Apr 30, 2022 · 2b57818 · 2b57818
1 parent fe024fd
commit 2b57818
Show file tree

Hide file tree

Showing 12 changed files with 415 additions and 163 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sui/Cargo.toml b/sui/Cargo.toml
@@ -56,9 +56,9 @@ move-binary-format = { git = "https://github.com/move-language/move", rev = "4e0
 move-bytecode-utils = { git = "https://github.com/move-language/move", rev = "4e025186af502c931318884df53c11bf34a664bc" }
 move-unit-test = { git = "https://github.com/move-language/move", rev = "4e025186af502c931318884df53c11bf34a664bc" }
 
-narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "976355d2ff75aefc6b7ec7fd32742d3d7188c4e0", package = "node" }
-narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "976355d2ff75aefc6b7ec7fd32742d3d7188c4e0", package = "config" }
-narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "976355d2ff75aefc6b7ec7fd32742d3d7188c4e0", package = "crypto" }
+narwhal-node = { git = "https://github.com/MystenLabs/narwhal", rev = "72efe71f0615f91f861cc658e031b763ba30fd5b", package = "node" }
+narwhal-config = { git = "https://github.com/MystenLabs/narwhal", rev = "72efe71f0615f91f861cc658e031b763ba30fd5b", package = "config" }
+narwhal-crypto = { git = "https://github.com/MystenLabs/narwhal", rev = "72efe71f0615f91f861cc658e031b763ba30fd5b", package = "crypto" }
 
 once_cell = "1.10.0"
 

diff --git a/sui/src/sui_commands.rs b/sui/src/sui_commands.rs
@@ -553,11 +553,7 @@ pub async fn make_authority(
 
     // Spawn a consensus listener. It listen for consensus outputs and notifies the
     // authority server when a sequenced transaction is ready for execution.
-    ConsensusListener::spawn(
-        authority_state.clone(),
-        rx_sui_to_consensus,
-        rx_consensus_to_sui,
-    );
+    ConsensusListener::spawn(rx_sui_to_consensus, rx_consensus_to_sui);
 
     // If we have network information make authority clients
     // to all authorities in the system.