From 6127bd6ed28116888a5bdd1869ac8d039edc64de Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Thu, 22 Aug 2024 18:34:26 +0530
Subject: [PATCH] make all csc uint64

---
 beacon_chain/networking/eth2_discovery.nim | 8 ++------
 beacon_chain/networking/eth2_network.nim   | 6 +++---
 beacon_chain/spec/datatypes/eip7594.nim    | 4 ++--
 beacon_chain/sync/request_manager.nim      | 6 +++---
 tests/test_discovery.nim                   | 2 +-
 5 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/beacon_chain/networking/eth2_discovery.nim b/beacon_chain/networking/eth2_discovery.nim
index 0c82f8ead..20e1866fc 100644
--- a/beacon_chain/networking/eth2_discovery.nim
+++ b/beacon_chain/networking/eth2_discovery.nim
@@ -127,7 +127,7 @@ proc queryRandom*(
     forkId: ENRForkID,
     wantedAttnets: AttnetBits,
     wantedSyncnets: SyncnetBits,
-    wantedCscnets: CscBits,
+    wantedCscnets: CscCount,
     minScore: int): Future[seq[Node]] {.async.} =
   ## Perform a discovery query for a random target
   ## (forkId) and matching at least one of the attestation subnets.
@@ -156,16 +156,12 @@ proc queryRandom*(
     if cscnetsBytes.isOk():
       let cscnetsNode =
         try:
-          SSZ.decode(cscnetsBytes.get(), CscBits)
+          SSZ.decode(cscnetsBytes.get(), CscCount)
         except SszError as e:
           debug "Could not decode the csc count ENR bitfield of peer",
             peer = n.record.toURI(), exception = e.name, msg = e.msg
           continue
 
-      for i in 0..<DATA_COLUMN_SIDECAR_SUBNET_COUNT:
-        if wantedCscnets[i] and cscnetsNode[i]:
-          score += 1
-
     let attnetsBytes = n.record.get(enrAttestationSubnetsField, seq[byte])
     if attnetsBytes.isOk():
       let attnetsNode =
diff --git a/beacon_chain/networking/eth2_network.nim b/beacon_chain/networking/eth2_network.nim
index 9a9764780..db6446c8e 100644
--- a/beacon_chain/networking/eth2_network.nim
+++ b/beacon_chain/networking/eth2_network.nim
@@ -1484,7 +1484,7 @@ proc trimConnections(node: Eth2Node, count: int) =
     if toKick <= 0: return
 
 proc getLowSubnets(node: Eth2Node, epoch: Epoch): 
-                  (AttnetBits, SyncnetBits, CscBits) =
+                  (AttnetBits, SyncnetBits, CscCount) =
   # Returns the subnets required to have a healthy mesh
   # The subnets are computed, to, in order:
   # - Have 0 subnet with < `dLow` peers from topic subscription
@@ -1550,7 +1550,7 @@ proc getLowSubnets(node: Eth2Node, epoch: Epoch):
       findLowSubnets(getSyncCommitteeTopic, SyncSubcommitteeIndex, SYNC_COMMITTEE_SUBNET_COUNT)
     else:
       default(SyncnetBits),
-    findLowSubnets(getDataColumnSidecarTopic, uint64, DATA_COLUMN_SIDECAR_SUBNET_COUNT.int)
+    findLowSubnets(getDataColumnSidecarTopic, uint64, DATA_COLUMN_SIDECAR_SUBNET_COUNT.int).countOnes.uint64
   )
 
 proc runDiscoveryLoop(node: Eth2Node) {.async.} =
@@ -1562,7 +1562,7 @@ proc runDiscoveryLoop(node: Eth2Node) {.async.} =
       (wantedAttnets, wantedSyncnets, wantedCscnets) = node.getLowSubnets(currentEpoch)
       wantedAttnetsCount = wantedAttnets.countOnes()
       wantedSyncnetsCount = wantedSyncnets.countOnes()
-      wantedCscnetsCount = wantedCscnets.countOnes()
+      wantedCscnetsCount = wantedCscnets
       outgoingPeers = node.peerPool.lenCurrent({PeerType.Outgoing})
       targetOutgoingPeers = max(node.wantedPeers div 10, 3)
 
diff --git a/beacon_chain/spec/datatypes/eip7594.nim b/beacon_chain/spec/datatypes/eip7594.nim
index f1a26af7c..4a6ac0e64 100644
--- a/beacon_chain/spec/datatypes/eip7594.nim
+++ b/beacon_chain/spec/datatypes/eip7594.nim
@@ -77,14 +77,14 @@ type
     column_index*: ColumnIndex
     row_index*: RowIndex
 
-  CscBits* = BitArray[DATA_COLUMN_SIDECAR_SUBNET_COUNT]
+  CscCount* = uint64
 
   # https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.4/specs/_features/eip7594/p2p-interface.md#metadata
   MetaData* = object
     seq_number*: uint64
     attnets*: AttnetBits
     syncnets*: SyncnetBits
-    custody_subnet_count*: uint64 
+    custody_subnet_count*: CscCount 
 
 # func serializeDataColumn(data_column: DataColumn): auto =
 #   var counter = 0
diff --git a/beacon_chain/sync/request_manager.nim b/beacon_chain/sync/request_manager.nim
index fd09ede7c..a8d0df433 100644
--- a/beacon_chain/sync/request_manager.nim
+++ b/beacon_chain/sync/request_manager.nim
@@ -33,7 +33,7 @@ const
   PARALLEL_REQUESTS* = 2
     ## Number of peers we using to resolve our request.
   
-  PARALLEL_REQUESTS_DATA_COLUMNS* = 8
+  PARALLEL_REQUESTS_DATA_COLUMNS* = 32
 
   BLOB_GOSSIP_WAIT_TIME_NS* = 2 * 1_000_000_000
     ## How long to wait for blobs to arrive over gossip before fetching.
@@ -289,8 +289,8 @@ proc lookupCscFromPeer(peer: Peer): uint64 =
 
     if enrFieldOpt.isOk:
         try:
-          let csc = SSZ.decode(enrFieldOpt.get(), CscBits)
-          return csc.countOnes.uint64
+          let csc = SSZ.decode(enrFieldOpt.get(), CscCount)
+          return csc
         except SszError as e:
           debug "Could not decide the csc field in the ENR"
           return 0
diff --git a/tests/test_discovery.nim b/tests/test_discovery.nim
index 4d7051fa8..73edb4953 100644
--- a/tests/test_discovery.nim
+++ b/tests/test_discovery.nim
@@ -36,7 +36,7 @@ proc generateNode(rng: ref HmacDrbgContext, port: Port,
 
 # TODO: Add tests with a syncnets preference
 const noSyncnetsPreference = SyncnetBits()
-const noCscnetsPreference = CscBits()
+const noCscnetsPreference = CscCount()
 
 procSuite "Eth2 specific discovery tests":
   let