From de444ee8fe801a05112563ca71c2dd944bcd61fd Mon Sep 17 00:00:00 2001
From: Eitan Seri-Levi <eserilev@ucsc.edu>
Date: Fri, 29 Mar 2024 12:37:35 +0300
Subject: [PATCH] resolve merge conflicts, move redb to v2.0

---
 Cargo.lock                   | 5 +++--
 beacon_node/store/Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d07d3810336..33e10c83855 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6662,8 +6662,9 @@ dependencies = [
 
 [[package]]
 name = "redb"
-version = "1.5.0"
-source = "git+https://github.com/cberner/redb?branch=master#2a362662733d1bf83b4dcc45d493bba9b3382eef"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1100a056c5dcdd4e5513d5333385223b26ef1bf92f31eb38f407e8c20549256"
 dependencies = [
  "libc",
 ]
diff --git a/beacon_node/store/Cargo.toml b/beacon_node/store/Cargo.toml
index 6dbebc20a00..502b9f30d34 100644
--- a/beacon_node/store/Cargo.toml
+++ b/beacon_node/store/Cargo.toml
@@ -16,7 +16,7 @@ beacon_chain = { workspace = true }
 [dependencies]
 db-key = "0.0.5"
 leveldb = { version = "0.8.6", optional = true }
-redb = {  git = "https://github.com/cberner/redb", branch = "master", optional = true }
+redb = { version = "2.0", optional = true }
 parking_lot = { workspace = true }
 itertools = { workspace = true }
 ethereum_ssz = { workspace = true }