From 8b71b978e094e524f4309ad2c41ce9adcd3671f9 Mon Sep 17 00:00:00 2001
From: Marius van der Wijden <m.vanderwijden@live.de>
Date: Sat, 17 Sep 2022 23:42:49 +0200
Subject: [PATCH] new round of hacks (config etc)

---
 beacon_node/lighthouse_network/src/rpc/mod.rs    |   1 +
 .../src/beacon_processor/worker/rpc_methods.rs   |   4 ++--
 .../eip4844/boot_enr.yaml                        |   1 +
 .../eip4844/genesis.ssz.zip                      | Bin 3518 -> 0 bytes
 consensus/types/src/eth_spec.rs                  |   2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip

diff --git a/beacon_node/lighthouse_network/src/rpc/mod.rs b/beacon_node/lighthouse_network/src/rpc/mod.rs
index 6197d57f19..daa565199c 100644
--- a/beacon_node/lighthouse_network/src/rpc/mod.rs
+++ b/beacon_node/lighthouse_network/src/rpc/mod.rs
@@ -125,6 +125,7 @@ impl<Id: ReqId, TSpec: EthSpec> RPC<Id, TSpec> {
                 Duration::from_secs(10),
             )
             .n_every(Protocol::BlocksByRoot, 128, Duration::from_secs(10))
+            .n_every(Protocol::BlobsByRange, 128, Duration::from_secs(10))
             .build()
             .expect("Configuration parameters are valid");
         RPC {
diff --git a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
index 97cab17822..83949f6ace 100644
--- a/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
+++ b/beacon_node/network/src/beacon_processor/worker/rpc_methods.rs
@@ -460,7 +460,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                     Ok(None) => {
                         error!(
                             self.log,
-                            "Block in the chain is not in the store";
+                            "Blob in the chain is not in the store";
                             "request_root" => ?root
                         );
                         break;
@@ -509,7 +509,7 @@ impl<T: BeaconChainTypes> Worker<T> {
                 // send the stream terminator
                 self.send_network_message(NetworkMessage::SendResponse {
                     peer_id,
-                    response: Response::BlocksByRange(None),
+                    response: Response::BlobsByRange(None),
                     id: request_id,
                 });
             }
diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml b/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml
index e69de29bb2..d4cf63c389 100644
--- a/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml
+++ b/common/eth2_network_config/built_in_network_configs/eip4844/boot_enr.yaml
@@ -0,0 +1 @@
+- enr:-MK4QI-wkVW1PxL4ksUM4H_hMgTTwxKMzvvDMfoiwPBuRxcsGkrGPLo4Kho3Ri1DEtJG4B6pjXddbzA9iF2gVctxv42GAX9v5WG5h2F0dG5ldHOIAAAAAAAAAACEZXRoMpBzql9ccAAAcDIAAAAAAAAAgmlkgnY0gmlwhKRcjMiJc2VjcDI1NmsxoQK1fc46pmVHKq8HNYLkSVaUv4uK2UBsGgjjGWU6AAhAY4hzeW5jbmV0cwCDdGNwgiMog3VkcIIjKA
diff --git a/common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip b/common/eth2_network_config/built_in_network_configs/eip4844/genesis.ssz.zip
deleted file mode 100644
index 9a1c014f63769577fd9c06fe2988f338dbb83f8f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3518
zcmWIWW@Zs#U|`^2c(lkcbkSCsze2nW3}P&r4BQMd4C$$Psl}Padd0<6p&^_M%pC%1
z$?Ji*w1S&~k>v$50|S_Ndp0vej78$W$MEGhYxa6O-kh>$+HnWt>6>~o+s{o=N{u_4
z95<tDkzur3R>hR#L4oGCZM3>iE!^klD{aib$RPaL36-E{LDOeP?=m}@tZO}?V?nK;
zVx4_O#XcLG|0mq@Rao;ftMo1yZU6be@*!(_o`~ucx%}FMFUvmYUQRz#yPz)X$k&9z
z2iuN?)}NbOSmOVCWAHAKm>7ZC8|>enx^#V?+_tX?Zx8Jhm9~God(*Dmn=7ravI6})
z3PxrK{Id_c`buQQiyNh%pXe`=*P1C}zVq6%%CA=To3yP>*3>n>$Q9M@{yuM3?DzGz
zRcE`+_pK`YzTzAIvoJC99O19;!k?F2^?mp0=8scnmmc>zJ?+oG)$i{Ao7P&&^#zzC
zM!{$ZjE2By2#kinXb6mkz%UPi9jBQn^kIQ_x7FN#Gj^xt{*2!F^zZDibIX>g>?^GM
z^&<KAtz&#Mf4+Wog!g<1+r9XRs+x!!TbIAj{h1q7cDd6y=$JU`G<&hAKOc^?$c8&V
ze^x(9N;2L?ukz^G^V#ZVlEPjmB=@Kbm?xF(t>+H?fB2f^#)BV3nXj>JkLmAte{)g!
zyIr^3&#9+AU3xZ4`0uyx@_P*a|617b{M?lL^Z)<3we)JHvlr9Cwzt>6ybQjv&?3an
zF74SB*UrCw=2|zzrKR>|xS!f1sGTiS_xaYtLhi*;@gBdQed)~8taMLH)7uwflKm^V
zyZF{o^I7GIXBWKM@K)BlNd1V8{@;}aDUa2eUvsZoR3)?bOJKXz-tBWUzJ0tIy1V#Q
z>XYxMJn9x-)mFAza?N6ot)gk+gHFTCpVyV_`}6d|?7d}aU$ca4B(AB|{;h3RGl>!l
zoLRavJu;*_F!*ub-kMF>)597I3(v<@KKgU-$i$cS{Z)IPTHh3vH=BPc<=}xsb3>Wq
zde3pLFRZwE^z^|qz3iWk<-MA3sJT-^ZGZHKtg5TF&c^Xkw~|lr^OlK!%M2H^fB0a^
zi<NhikM*n-mW;Uj_rrpOz-J3Z58t=mxj*yNp|ZdAYdYpk`{f<>tz5ESJ%2^vk8cm_
y-`r;i@MdI^W5(67l7Od~C5<2^N;iuY(#=BaVg-1!vVoK`0%0JK4hQzq7#IMuda*<R

diff --git a/consensus/types/src/eth_spec.rs b/consensus/types/src/eth_spec.rs
index 9de4777f54..138b8ddf41 100644
--- a/consensus/types/src/eth_spec.rs
+++ b/consensus/types/src/eth_spec.rs
@@ -253,7 +253,7 @@ impl EthSpec for MainnetEthSpec {
     type SubnetBitfieldLength = U64;
     type MaxValidatorsPerCommittee = U2048;
     type GenesisEpoch = U0;
-    type SlotsPerEpoch = U32;
+    type SlotsPerEpoch = U8;
     type EpochsPerEth1VotingPeriod = U64;
     type SlotsPerHistoricalRoot = U8192;
     type EpochsPerHistoricalVector = U65536;