make the csc encoding updates as per latest spec

packages/beacon-node/src/network/metadata.ts

@@ -3,6 +3,7 @@ import {ForkSeq} from "@lodestar/params";
 import {computeStartSlotAtEpoch} from "@lodestar/state-transition";
 import {altair, Epoch, phase0, ssz, peerdas} from "@lodestar/types";
 import {BeaconConfig} from "@lodestar/config";
+import {intToBytes} from "@lodestar/utils";
 import {FAR_FUTURE_EPOCH} from "../constants/index.js";
 import {getCurrentAndNextFork} from "./forks.js";
 
@@ -59,7 +60,10 @@ export class MetadataController {
     }
 
     if (this.config.getForkSeq(computeStartSlotAtEpoch(currentEpoch)) >= ForkSeq.peerdas) {
-      this.onSetValue(ENRKey.csc, ssz.Uint8.serialize(this._metadata.csc));
+      this.onSetValue(
+        ENRKey.csc,
+        intToBytes(this._metadata.csc, Math.ceil(Math.log2(this._metadata.csc + 1) / 8), "be")
+      );
     }
   }
 
@@ -91,7 +95,7 @@ export class MetadataController {
   }
 
   set csc(csc: number) {
-    this.onSetValue(ENRKey.csc, ssz.Uint8.serialize(csc));
+    this.onSetValue(ENRKey.csc, intToBytes(this._metadata.csc, Math.ceil(Math.log2(this._metadata.csc + 1) / 8), "be"));
     this._metadata.csc = csc;
   }
 

packages/beacon-node/src/network/peers/discover.ts

@@ -7,6 +7,7 @@ import {pruneSetToMax, sleep} from "@lodestar/utils";
 import {ATTESTATION_SUBNET_COUNT, SYNC_COMMITTEE_SUBNET_COUNT} from "@lodestar/params";
 import {LoggerNode} from "@lodestar/logger/node";
 import {ssz} from "@lodestar/types";
+import {bytesToInt} from "@lodestar/utils";
 import {NetworkCoreMetrics} from "../core/metrics.js";
 import {Libp2p} from "../interface.js";
 import {ENRKey, SubnetType} from "../metadata.js";
@@ -375,7 +376,9 @@ export class PeerDiscovery {
     // never throw and treat too long or too short bitfields as zero-ed
     const attnets = attnetsBytes ? deserializeEnrSubnets(attnetsBytes, ATTESTATION_SUBNET_COUNT) : zeroAttnets;
     const syncnets = syncnetsBytes ? deserializeEnrSubnets(syncnetsBytes, SYNC_COMMITTEE_SUBNET_COUNT) : zeroSyncnets;
-    const custodySubnetCount = custodySubnetCountBytes ? ssz.Uint8.deserialize(custodySubnetCountBytes) : 4;
+    const custodySubnetCount = custodySubnetCountBytes
+      ? bytesToInt(custodySubnetCountBytes, "be")
+      : this.config.CUSTODY_REQUIREMENT;
     this.peerIdToCustodySubnetCount.set(peerId.toString(), custodySubnetCount);
 
     const status = this.handleDiscoveredPeer(peerId, multiaddrTCP, attnets, syncnets, custodySubnetCount);

packages/cli/src/cmds/beacon/initPeerIdAndEnr.ts

@@ -7,7 +7,7 @@ import {Multiaddr} from "@multiformats/multiaddr";
 import {createPrivateKeyFromPeerId, SignableENR} from "@chainsafe/enr";
 import {Logger, fromHex} from "@lodestar/utils";
 import {ChainForkConfig} from "@lodestar/config";
-import {ssz} from "@lodestar/types";
+import {intToBytes} from "@lodestar/utils";
 
 import {exportToJSON, readPeerId} from "../../config/index.js";
 import {writeFile600Perm} from "../../util/file.js";
@@ -89,7 +89,8 @@ export function overwriteEnrWithCliArgs(
   }
 
   // csc is big ending but since 1 bytes suffices for now so its the same
-  enr.set("csc", ssz.Uint8.serialize(Math.max(config.CUSTODY_REQUIREMENT, config.NODE_CUSTODY_REQUIREMENT)));
+  const csc = Math.max(config.CUSTODY_REQUIREMENT, config.NODE_CUSTODY_REQUIREMENT);
+  enr.set("csc", intToBytes(csc, Math.ceil(Math.log2(csc + 1) / 8), "be"));
 
   function testMultiaddrForLocal(mu: Multiaddr, ip4: boolean): void {
     const isLocal = isLocalMultiAddr(mu);

packages/types/src/peerdas/sszTypes.ts

@@ -13,12 +13,12 @@ import {ssz as phase0Ssz} from "../phase0/index.js";
 import {ssz as altariSsz} from "../altair/index.js";
 import {ssz as denebSsz} from "../deneb/index.js";
 
-const {BLSSignature, Root, ColumnIndex, Bytes32, Slot, UintNum64, Uint8} = primitiveSsz;
+const {BLSSignature, Root, ColumnIndex, Bytes32, Slot, UintNum64} = primitiveSsz;
 
 export const Metadata = new ContainerType(
   {
     ...altariSsz.Metadata.fields,
-    csc: Uint8,
+    csc: UintNum64,
   },
   {typeName: "Metadata", jsonCase: "eth2"}
 );