chore: storage node version

0glabs · Oct 15, 2024 · 30d1714 · 30d1714
1 parent f5f2857
commit 30d1714
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,11 +16,11 @@ enr = { path = "version-meld/enr" }
 discv5 = { path = "version-meld/discv5" }
 
 [workspace.dependencies]
-append_merkle = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995" }
-merkle_light = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995" }
-merkle_tree = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995" }
-shared_types = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995" }
-task_executor = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995" }
-storage = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995", package = "storage" }
-contract-interface = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995" }
+append_merkle = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1" }
+merkle_light = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1" }
+merkle_tree = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1" }
+shared_types = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1" }
+task_executor = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1" }
+storage = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1", package = "storage" }
+contract-interface = { git = "https://github.com/0glabs/0g-storage-node.git",rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1" }
 metrics = { git = "https://github.com/Conflux-Chain/conflux-rust.git", rev = "992ebc5483d937c8f6b883e266f8ed2a67a7fa9a" }
diff --git a/node/log_entry_sync/src/sync_manager/mod.rs b/node/log_entry_sync/src/sync_manager/mod.rs
@@ -324,7 +324,13 @@ impl LogSyncManager {
         let _ = self.event_send.send(LogSyncEvent::ReorgDetected { tx_seq });
 
         // TODO(zz): `wrapping_sub` here is a hack to handle the case of tx_seq=0.
-        if let Err(e) = self.store.write().await.revert_stream(tx_seq.wrapping_sub(1)).await {
+        if let Err(e) = self
+            .store
+            .write()
+            .await
+            .revert_stream(tx_seq.wrapping_sub(1))
+            .await
+        {
             error!("revert_to fails: e={:?}", e);
             return;
         }

diff --git a/node/rpc/Cargo.toml b/node/rpc/Cargo.toml
@@ -17,7 +17,7 @@ tokio = { version = "1.19.2", features = ["macros", "sync"] }
 tracing = "0.1.35"
 merkle_light = { workspace = true }
 merkle_tree = { workspace = true }
-zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995", package = "rpc" }
+zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1", package = "rpc" }
 futures-channel = "^0.3"
 ethereum-types = "0.14"
 storage_with_stream = { path = "../storage_with_stream" }

diff --git a/node/stream/Cargo.toml b/node/stream/Cargo.toml
@@ -20,8 +20,8 @@ ethers = { version = "^2", features = ["ws"] }
 serde_json = "1.0.127"
 storage_with_stream = { path = "../storage_with_stream" }
 rpc = {path = "../rpc"}
-zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995", package = "rpc" }
-zgs_storage = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "3fc1543fb4a1b9321cf5ecc9a81e152a14950995", package = "storage" }
+zgs_rpc = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1", package = "rpc" }
+zgs_storage = { git = "https://github.com/0glabs/0g-storage-node.git", rev = "80b4d63cbabf3dd1cd84d95f2384a2e4cfdd3cd1", package = "storage" }
 contract-interface = { workspace = true }
 rusqlite = { version = "0.28.0", features = ["bundled"] }
 tracing = "0.1.35"