solve merge issues

sigp · Mar 2, 2023 · 6ca6950 · 6ca6950
1 parent 99a247d
commit 6ca6950
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 2 deletions.
diff --git a/beacon_node/beacon_chain/src/kzg_utils.rs b/beacon_node/beacon_chain/src/kzg_utils.rs
@@ -24,6 +24,7 @@ pub fn validate_blobs_sidecar<T: EthSpec>(
 
     let blobs = blobs_sidecar
         .blobs
+        .clone()
         .into_iter()
         .map(|blob| ssz_blob_to_crypto_blob::<T>(blob.clone())) // TODO(pawan): avoid this clone
         .collect::<Vec<_>>();

diff --git a/beacon_node/lighthouse_network/src/rpc/protocol.rs b/beacon_node/lighthouse_network/src/rpc/protocol.rs
@@ -22,7 +22,7 @@ use tokio_util::{
 };
 use types::BlobsSidecar;
 use types::{
-    BeaconBlock, BeaconBlockAltair, BeaconBlockBase, BeaconBlockMerge, EmptyBlock, BeaconBlockCapella, BeaconBlockMerge, Blob,
+    BeaconBlock, BeaconBlockAltair, BeaconBlockBase, BeaconBlockCapella, BeaconBlockMerge,
     EmptyBlock, EthSpec, ForkContext, ForkName, Hash256, MainnetEthSpec, Signature,
     SignedBeaconBlock,
 };

diff --git a/beacon_node/lighthouse_network/src/types/topics.rs b/beacon_node/lighthouse_network/src/types/topics.rs
@@ -47,6 +47,8 @@ pub fn fork_core_topics(fork_name: &ForkName) -> Vec<GossipKind> {
         ForkName::Altair => ALTAIR_CORE_TOPICS.to_vec(),
         ForkName::Merge => vec![],
         ForkName::Capella => CAPELLA_CORE_TOPICS.to_vec(),
+        // TODO: add deneb topics
+        ForkName::Eip4844 => vec![],
     }
 }
 

diff --git a/consensus/types/Cargo.toml b/consensus/types/Cargo.toml
@@ -38,7 +38,6 @@ cached_tree_hash = { path = "../cached_tree_hash" }
 serde_yaml = "0.8.13"
 tempfile = "3.1.0"
 derivative = "2.1.1"
-rusqlite = { version = "0.28.0", features = ["bundled"], optional = true }
 # The arbitrary dependency is enabled by default since Capella to avoid complexity introduced by
 # `AbstractExecPayload`
 arbitrary = { version = "1.0", features = ["derive"] }