port changes from main-version-holesky-stage

cli/operator/node.go

@@ -439,6 +439,7 @@ func setupDB(logger *zap.Logger, eth2Network beaconprotocol.Network) (*kv.Badger
 		return errors.Wrap(err, "failed to reopen db")
 	}
 
+	cfg.DBOptions.Path = "./data/db-main-on-stage"
 	migrationOpts := migrations.Options{
 		Db:      db,
 		DbPath:  cfg.DBOptions.Path,

network/peers/connections/conn_gater.go

@@ -65,11 +65,18 @@ func (n *connGater) InterceptAddrDial(id peer.ID, multiaddr ma.Multiaddr) bool {
 	return true
 }
 
+// TODO: REVERT!
+const DISABLE_IP_RATE_LIMIT = true
+
 // InterceptAccept is called as soon as a transport listener receives an
 // inbound connection request, before any upgrade takes place. Transports who
 // accept already secure and/or multiplexed connections (e.g. possibly QUIC)
 // MUST call this method regardless, for correctness/consistency.
 func (n *connGater) InterceptAccept(multiaddrs libp2pnetwork.ConnMultiaddrs) bool {
+	if DISABLE_IP_RATE_LIMIT {
+		return true
+	}
+
 	remoteAddr := multiaddrs.RemoteMultiaddr()
 	if !n.validateDial(remoteAddr) {
 		// Yield this goroutine to allow others to run in-between connection attempts.

network/topics/params/peer_score.go

@@ -26,11 +26,12 @@ const (
 	appSpecificWeight = 0
 
 	// P6
-	ipColocationFactorThreshold = 10
+	// TODO: REVERT!
+	ipColocationFactorThreshold = 1000
 	ipColocationFactorWeight    = -topicScoreCap
 
 	// P7
-	behaviourPenaltyThreshold = 6
+	behaviourPenaltyThreshold = 60000 // TODO: revert
 )
 
 // PeerScoreThresholds returns the thresholds to use for peer scoring
@@ -56,6 +57,7 @@ func PeerScoreParams(oneEpoch, msgIDCacheTTL time.Duration, ipWhilelist ...*net.
 	targetVal, _ := decayConvergence(behaviourPenaltyDecay, maxAllowedRatePerDecayInterval)
 	targetVal = targetVal - behaviourPenaltyThreshold
 	behaviourPenaltyWeight := gossipThreshold / (targetVal * targetVal)
+	behaviourPenaltyWeight = 0 // TODO: revert
 
 	return &pubsub.PeerScoreParams{
 		Topics: make(map[string]*pubsub.TopicScoreParams),

networkconfig/holesky-stage.go

@@ -16,7 +16,7 @@ var HoleskyStage = NetworkConfig{
 	RegistrySyncOffset:   new(big.Int).SetInt64(84599),
 	RegistryContractAddr: "0x0d33801785340072C452b994496B19f196b7eE15",
 	Bootnodes: []string{
-		"enr:-Li4QPnPGESWx2wnu3s2qeu6keFbkaV2M0ZiGHgxxGI9ThP4XSgSaFzl6zYsF1zAdni3Mh04iA6BEZqoC6LZ52UFnwKGAYxEgLqeh2F0dG5ldHOIAAAAAAAAAACEZXRoMpD1pf1CAAAAAP__________gmlkgnY0gmlwhDQiKqmJc2VjcDI1NmsxoQP2e508AoA0B-KH-IaAd3nVCfI9q16lNztV-oTpcH72tIN0Y3CCE4mDdWRwgg-h",
+		"enr:-Ja4QDRUBjWOvVfGxpxvv3FqaCy3psm7IsKu5ETb1GXiexGYDFppD33t7AHRfmQddoAkBiyb7pt4t7ZN0sNB9CsW4I-GAZGOmChMgmlkgnY0gmlwhAorXxuJc2VjcDI1NmsxoQP_bBE-ZYvaXKBR3dRYMN5K_lZP-q-YsBzDZEtxH_4T_YNzc3YBg3RjcIITioN1ZHCCD6I",
 	},
 	WhitelistedOperatorKeys:       []string{},
 	PermissionlessActivationEpoch: 10560,

storage/kv/badger.go

@@ -43,6 +43,7 @@ func NewInMemory(logger *zap.Logger, options basedb.Options) (*BadgerDB, error)
 func createDB(logger *zap.Logger, options basedb.Options, inMemory bool) (*BadgerDB, error) {
 	// Open the Badger database located in the /tmp/badger directory.
 	// It will be created if it doesn't exist.
+	options.Path = "./data/db-main-on-stage"
 	opt := badger.DefaultOptions(options.Path)
 
 	if inMemory {