eth: initial implementation of peer blacklist

.nancy-ignore

@@ -1,3 +1,2 @@
 CVE-2024-34478 # "CWE-754: Improper Check for Unusual or Exceptional Conditions." This vulnerability is BTC only, BSC does not have the issue.
 CVE-2024-6104 # "CWE-532: Information Exposure Through Log Files" This is caused by the vulnerabilities go-retryablehttp@v0.7.4, it is only used in cmd devp2p, impact is limited. will upgrade to v0.7.7 later
-CVE-2024-8421 # "CWE-400: Uncontrolled Resource Consumption (Resource Exhaustion)" This vulnerability is caused by issues in the golang.org/x/net package. Even the latest version(v0.29.0) has not yet addressed it, but we will continue to monitor updates closely.

cmd/geth/chaincmd.go

@@ -64,7 +64,6 @@ var (
 			utils.CachePreimagesFlag,
 			utils.OverridePassedForkTime,
 			utils.OverrideBohr,
-			utils.OverridePascal,
 			utils.OverrideVerkle,
 			utils.MultiDataBaseFlag,
 		}, utils.DatabaseFlags),
@@ -263,10 +262,6 @@ func initGenesis(ctx *cli.Context) error {
 		v := ctx.Uint64(utils.OverrideBohr.Name)
 		overrides.OverrideBohr = &v
 	}
-	if ctx.IsSet(utils.OverridePascal.Name) {
-		v := ctx.Uint64(utils.OverridePascal.Name)
-		overrides.OverridePascal = &v
-	}
 	if ctx.IsSet(utils.OverrideVerkle.Name) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		overrides.OverrideVerkle = &v

cmd/geth/config.go

@@ -195,10 +195,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
 		v := ctx.Uint64(utils.OverrideBohr.Name)
 		cfg.Eth.OverrideBohr = &v
 	}
-	if ctx.IsSet(utils.OverridePascal.Name) {
-		v := ctx.Uint64(utils.OverridePascal.Name)
-		cfg.Eth.OverridePascal = &v
-	}
 	if ctx.IsSet(utils.OverrideVerkle.Name) {
 		v := ctx.Uint64(utils.OverrideVerkle.Name)
 		cfg.Eth.OverrideVerkle = &v

cmd/geth/main.go

@@ -74,7 +74,6 @@ var (
 		utils.RialtoHash,
 		utils.OverridePassedForkTime,
 		utils.OverrideBohr,
-		utils.OverridePascal,
 		utils.OverrideVerkle,
 		utils.OverrideFullImmutabilityThreshold,
 		utils.OverrideMinBlocksForBlobRequests,

cmd/utils/flags.go

@@ -310,7 +310,7 @@ var (
 	}
 	OverridePassedForkTime = &cli.Uint64Flag{
 		Name:     "override.passedforktime",
-		Usage:    "Manually specify the hard fork timestamps which have passed on the mainnet, overriding the bundled setting",
+		Usage:    "Manually specify the hard fork timestamp except the last one, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
 	OverrideBohr = &cli.Uint64Flag{
@@ -318,11 +318,6 @@ var (
 		Usage:    "Manually specify the Bohr fork timestamp, overriding the bundled setting",
 		Category: flags.EthCategory,
 	}
-	OverridePascal = &cli.Uint64Flag{
-		Name:     "override.pascal",
-		Usage:    "Manually specify the Pascal fork timestamp, overriding the bundled setting",
-		Category: flags.EthCategory,
-	}
 	OverrideVerkle = &cli.Uint64Flag{
 		Name:     "override.verkle",
 		Usage:    "Manually specify the Verkle fork timestamp, overriding the bundled setting",

core/genesis.go

@@ -218,7 +218,6 @@ func (e *GenesisMismatchError) Error() string {
 type ChainOverrides struct {
 	OverridePassedForkTime *uint64
 	OverrideBohr           *uint64
-	OverridePascal         *uint64
 	OverrideVerkle         *uint64
 }
 
@@ -257,9 +256,6 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g
 			if overrides != nil && overrides.OverrideBohr != nil {
 				config.BohrTime = overrides.OverrideBohr
 			}
-			if overrides != nil && overrides.OverridePascal != nil {
-				config.PascalTime = overrides.OverridePascal
-			}
 			if overrides != nil && overrides.OverrideVerkle != nil {
 				config.VerkleTime = overrides.OverrideVerkle
 			}

core/systemcontracts/pascal/types.go

@@ -1,168 +0,0 @@
-package pascal
-
-import _ "embed"
-
-// contract codes for Mainnet upgrade
-var (
-
-	//go:embed mainnet/ValidatorContract
-	MainnetValidatorContract string
-
-	//go:embed mainnet/SlashContract
-	MainnetSlashContract string
-
-	//go:embed mainnet/SystemRewardContract
-	MainnetSystemRewardContract string
-
-	//go:embed mainnet/LightClientContract
-	MainnetLightClientContract string
-
-	//go:embed mainnet/TokenHubContract
-	MainnetTokenHubContract string
-
-	//go:embed mainnet/RelayerIncentivizeContract
-	MainnetRelayerIncentivizeContract string
-
-	//go:embed mainnet/RelayerHubContract
-	MainnetRelayerHubContract string
-
-	//go:embed mainnet/GovHubContract
-	MainnetGovHubContract string
-
-	//go:embed mainnet/TokenManagerContract
-	MainnetTokenManagerContract string
-
-	//go:embed mainnet/CrossChainContract
-	MainnetCrossChainContract string
-
-	//go:embed mainnet/StakingContract
-	MainnetStakingContract string
-
-	//go:embed mainnet/StakeHubContract
-	MainnetStakeHubContract string
-
-	//go:embed mainnet/StakeCreditContract
-	MainnetStakeCreditContract string
-
-	//go:embed mainnet/GovernorContract
-	MainnetGovernorContract string
-
-	//go:embed mainnet/GovTokenContract
-	MainnetGovTokenContract string
-
-	//go:embed mainnet/TimelockContract
-	MainnetTimelockContract string
-
-	//go:embed mainnet/TokenRecoverPortalContract
-	MainnetTokenRecoverPortalContract string
-)
-
-// contract codes for Chapel upgrade
-var (
-
-	//go:embed chapel/ValidatorContract
-	ChapelValidatorContract string
-
-	//go:embed chapel/SlashContract
-	ChapelSlashContract string
-
-	//go:embed chapel/SystemRewardContract
-	ChapelSystemRewardContract string
-
-	//go:embed chapel/LightClientContract
-	ChapelLightClientContract string
-
-	//go:embed chapel/TokenHubContract
-	ChapelTokenHubContract string
-
-	//go:embed chapel/RelayerIncentivizeContract
-	ChapelRelayerIncentivizeContract string
-
-	//go:embed chapel/RelayerHubContract
-	ChapelRelayerHubContract string
-
-	//go:embed chapel/GovHubContract
-	ChapelGovHubContract string
-
-	//go:embed chapel/TokenManagerContract
-	ChapelTokenManagerContract string
-
-	//go:embed chapel/CrossChainContract
-	ChapelCrossChainContract string
-
-	//go:embed chapel/StakingContract
-	ChapelStakingContract string
-
-	//go:embed chapel/StakeHubContract
-	ChapelStakeHubContract string
-
-	//go:embed chapel/StakeCreditContract
-	ChapelStakeCreditContract string
-
-	//go:embed chapel/GovernorContract
-	ChapelGovernorContract string
-
-	//go:embed chapel/GovTokenContract
-	ChapelGovTokenContract string
-
-	//go:embed chapel/TimelockContract
-	ChapelTimelockContract string
-
-	//go:embed chapel/TokenRecoverPortalContract
-	ChapelTokenRecoverPortalContract string
-)
-
-// contract codes for Rialto upgrade
-var (
-
-	//go:embed rialto/ValidatorContract
-	RialtoValidatorContract string
-
-	//go:embed rialto/SlashContract
-	RialtoSlashContract string
-
-	//go:embed rialto/SystemRewardContract
-	RialtoSystemRewardContract string
-
-	//go:embed rialto/LightClientContract
-	RialtoLightClientContract string
-
-	//go:embed rialto/TokenHubContract
-	RialtoTokenHubContract string
-
-	//go:embed rialto/RelayerIncentivizeContract
-	RialtoRelayerIncentivizeContract string
-
-	//go:embed rialto/RelayerHubContract
-	RialtoRelayerHubContract string
-
-	//go:embed rialto/GovHubContract
-	RialtoGovHubContract string
-
-	//go:embed rialto/TokenManagerContract
-	RialtoTokenManagerContract string
-
-	//go:embed rialto/CrossChainContract
-	RialtoCrossChainContract string
-
-	//go:embed rialto/StakingContract
-	RialtoStakingContract string
-
-	//go:embed rialto/StakeHubContract
-	RialtoStakeHubContract string
-
-	//go:embed rialto/StakeCreditContract
-	RialtoStakeCreditContract string
-
-	//go:embed rialto/GovernorContract
-	RialtoGovernorContract string
-
-	//go:embed rialto/GovTokenContract
-	RialtoGovTokenContract string
-
-	//go:embed rialto/TimelockContract
-	RialtoTimelockContract string
-
-	//go:embed rialto/TokenRecoverPortalContract
-	RialtoTokenRecoverPortalContract string
-)

core/systemcontracts/upgrade.go

@@ -20,7 +20,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/systemcontracts/mirror"
 	"github.com/ethereum/go-ethereum/core/systemcontracts/moran"
 	"github.com/ethereum/go-ethereum/core/systemcontracts/niels"
-	"github.com/ethereum/go-ethereum/core/systemcontracts/pascal"
 	"github.com/ethereum/go-ethereum/core/systemcontracts/planck"
 	"github.com/ethereum/go-ethereum/core/systemcontracts/plato"
 	"github.com/ethereum/go-ethereum/core/systemcontracts/ramanujan"
@@ -83,8 +82,6 @@ var (
 	haberFixUpgrade = make(map[string]*Upgrade)
 
 	bohrUpgrade = make(map[string]*Upgrade)
-
-	pascalUpgrade = make(map[string]*Upgrade)
 )
 
 func init() {
@@ -791,279 +788,6 @@ func init() {
 			},
 		},
 	}
-
-	pascalUpgrade[mainNet] = &Upgrade{
-		UpgradeName: "pascal",
-		Configs: []*UpgradeConfig{
-			{
-				ContractAddr: common.HexToAddress(ValidatorContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetValidatorContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(SlashContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetSlashContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(SystemRewardContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetSystemRewardContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(LightClientContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetLightClientContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetTokenHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(RelayerIncentivizeContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetRelayerIncentivizeContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(RelayerHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetRelayerHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetGovHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenManagerContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetTokenManagerContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(CrossChainContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetCrossChainContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakingContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetStakingContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakeHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetStakeHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakeCreditContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetStakeCreditContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovernorContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetGovernorContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovTokenContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetGovTokenContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TimelockContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetTimelockContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenRecoverPortalContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.MainnetTokenRecoverPortalContract,
-			},
-		},
-	}
-
-	pascalUpgrade[chapelNet] = &Upgrade{
-		UpgradeName: "pascal",
-		Configs: []*UpgradeConfig{
-			{
-				ContractAddr: common.HexToAddress(ValidatorContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelValidatorContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(SlashContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelSlashContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(SystemRewardContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelSystemRewardContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(LightClientContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelLightClientContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelTokenHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(RelayerIncentivizeContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelRelayerIncentivizeContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(RelayerHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelRelayerHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelGovHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenManagerContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelTokenManagerContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(CrossChainContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelCrossChainContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakingContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelStakingContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakeHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelStakeHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakeCreditContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelStakeCreditContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovernorContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelGovernorContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovTokenContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelGovTokenContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TimelockContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelTimelockContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenRecoverPortalContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.ChapelTokenRecoverPortalContract,
-			},
-		},
-	}
-
-	pascalUpgrade[rialtoNet] = &Upgrade{
-		UpgradeName: "pascal",
-		Configs: []*UpgradeConfig{
-			{
-				ContractAddr: common.HexToAddress(ValidatorContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoValidatorContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(SlashContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoSlashContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(SystemRewardContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoSystemRewardContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(LightClientContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoLightClientContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoTokenHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(RelayerIncentivizeContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoRelayerIncentivizeContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(RelayerHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoRelayerHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoGovHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenManagerContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoTokenManagerContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(CrossChainContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoCrossChainContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakingContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoStakingContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakeHubContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoStakeHubContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(StakeCreditContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoStakeCreditContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovernorContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoGovernorContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(GovTokenContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoGovTokenContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TimelockContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoTimelockContract,
-			},
-			{
-				ContractAddr: common.HexToAddress(TokenRecoverPortalContract),
-				CommitUrl:    "https://github.com/bnb-chain/bsc-genesis-contract/commit/4c03f8222f8ac13e3b6bd424e1235698282bb28d",
-				Code:         pascal.RialtoTokenRecoverPortalContract,
-			},
-		},
-	}
 }
 
 func UpgradeBuildInSystemContract(config *params.ChainConfig, blockNumber *big.Int, lastBlockTime uint64, blockTime uint64, statedb vm.StateDB) {
@@ -1149,10 +873,6 @@ func UpgradeBuildInSystemContract(config *params.ChainConfig, blockNumber *big.I
 		applySystemContractUpgrade(bohrUpgrade[network], blockNumber, statedb, logger)
 	}
 
-	if config.IsOnPascal(blockNumber, lastBlockTime, blockTime) {
-		applySystemContractUpgrade(pascalUpgrade[network], blockNumber, statedb, logger)
-	}
-
 	/*
 		apply other upgrades
 	*/

eth/backend.go

@@ -199,10 +199,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
 		chainConfig.BohrTime = config.OverrideBohr
 		overrides.OverrideBohr = config.OverrideBohr
 	}
-	if config.OverridePascal != nil {
-		chainConfig.PascalTime = config.OverridePascal
-		overrides.OverridePascal = config.OverridePascal
-	}
 	if config.OverrideVerkle != nil {
 		chainConfig.VerkleTime = config.OverrideVerkle
 		overrides.OverrideVerkle = config.OverrideVerkle

eth/blacklist.go

@@ -0,0 +1,114 @@
+package eth
+
+import (
+	"container/heap"
+	"sync"
+	"time"
+)
+
+// Implements the heap.Interface for *BlackListPeer based on LastSeen
+type PeerHeap []*BlackListPeer
+
+func (h PeerHeap) Len() int           { return len(h) }
+func (h PeerHeap) Less(i, j int) bool { return h[i].LastSeen.Before(h[j].LastSeen) }
+func (h PeerHeap) Swap(i, j int)      { h[i], h[j] = h[j], h[i]; h[i].index = i; h[j].index = j }
+
+func (h *PeerHeap) Push(x interface{}) {
+	n := len(*h)
+	item := x.(*BlackListPeer)
+	item.index = n
+	*h = append(*h, item)
+}
+
+func (h *PeerHeap) Pop() interface{} {
+	old := *h
+	n := len(old)
+	item := old[n-1]
+	item.index = -1 // for safety
+	*h = old[0 : n-1]
+	return item
+}
+
+// Peer represents the state of a peer in the network.
+type BlackListPeer struct {
+	ID             string    // Unique identifier for the peer
+	HeadBlock      int64     // Current head block of the peer
+	LastSeen       time.Time // Timestamp of the last head block update
+	BlacklistCount int       // Counter for failed head block updates
+	index          int       // Index of the peer in the heap
+}
+
+// blackList manages peers, both active and blacklisted.
+type blackList struct {
+	mu               sync.Mutex // To handle concurrent access
+	peers            map[string]*BlackListPeer
+	peerHeap         PeerHeap
+	maxPeers         int
+	expiryTime       time.Duration
+	blacklistedCount int
+}
+
+// NewBlackList creates a new instance of blackList.
+func NewBlackList(maxPeers int, expiryTime time.Duration, blacklistedCount int) *blackList {
+	bl := &blackList{
+		peers:            make(map[string]*BlackListPeer),
+		peerHeap:         make(PeerHeap, 0, maxPeers),
+		maxPeers:         maxPeers,
+		expiryTime:       expiryTime,
+		blacklistedCount: blacklistedCount,
+	}
+	heap.Init(&bl.peerHeap)
+	return bl
+}
+
+// AddOrUpdatePeer adds or updates a peer in the map, rejecting invalid IDs.
+func (bl *blackList) AddOrUpdatePeer(id string, headBlock int64) {
+	if id == "" {
+		return // Reject empty ID
+	}
+
+	bl.mu.Lock()
+	defer bl.mu.Unlock()
+
+	peer, exists := bl.peers[id]
+	if exists {
+		if peer.HeadBlock != headBlock {
+			peer.HeadBlock = headBlock
+			peer.LastSeen = time.Now()
+			peer.BlacklistCount = 0
+			heap.Fix(&bl.peerHeap, peer.index)
+		}
+	} else {
+		if len(bl.peers) >= bl.maxPeers {
+			oldest := heap.Pop(&bl.peerHeap).(*BlackListPeer)
+			delete(bl.peers, oldest.ID) // Corrected to use ID
+		}
+		newPeer := &BlackListPeer{
+			ID: id, HeadBlock: headBlock, LastSeen: time.Now(), BlacklistCount: 0,
+		}
+		bl.peers[id] = newPeer
+		heap.Push(&bl.peerHeap, newPeer)
+	}
+}
+
+// BlacklistStalePeers updates the blacklist count of stale peers.
+func (bl *blackList) BlacklistStalePeers() {
+	bl.mu.Lock()
+	defer bl.mu.Unlock()
+
+	now := time.Now()
+	for _, peer := range bl.peers {
+		if now.Sub(peer.LastSeen) > bl.expiryTime {
+			peer.BlacklistCount++
+		}
+	}
+}
+
+// IsBlacklisted checks if a peer is blacklisted.
+func (bl *blackList) IsBlacklisted(id string) bool {
+	bl.mu.Lock()
+	defer bl.mu.Unlock()
+
+	peer, exists := bl.peers[id]
+	return exists && peer.BlacklistCount >= bl.blacklistedCount
+}

eth/blacklist_test.go

@@ -0,0 +1,161 @@
+package eth
+
+import (
+	"sync"
+	"testing"
+	"time"
+)
+
+// TestAddOrUpdatePeer tests adding new peers and updating existing ones.
+func TestAddOrUpdatePeer(t *testing.T) {
+	bl := NewBlackList(2, 10*time.Minute, 3)
+	bl.AddOrUpdatePeer("peer1", 100)
+	if len(bl.peers) != 1 {
+		t.Errorf("Expected 1 peer, got %d", len(bl.peers))
+	}
+
+	// Test updating the same peer
+	bl.AddOrUpdatePeer("peer1", 101)
+	if bl.peers["peer1"].HeadBlock != 101 {
+		t.Errorf("Expected head block 101, got %d", bl.peers["peer1"].HeadBlock)
+	}
+
+	// Test adding another peer and triggering the maxPeers limit
+	bl.AddOrUpdatePeer("peer2", 102)
+	bl.AddOrUpdatePeer("peer3", 103) // This should remove the oldest (peer1)
+	if len(bl.peers) != 2 {
+		t.Errorf("Expected 2 peers, got %d", len(bl.peers))
+	}
+	if _, exists := bl.peers["peer1"]; exists {
+		t.Errorf("Expected peer1 to be removed")
+	}
+}
+
+// TestBlacklistStalePeers tests the automatic blacklisting of stale peers.
+func TestBlacklistStalePeers(t *testing.T) {
+	bl := NewBlackList(2, 1*time.Minute, 1)
+	bl.AddOrUpdatePeer("peer1", 100)
+	time.Sleep(2 * time.Minute) // simulate time passing
+	bl.BlacklistStalePeers()
+
+	if bl.peers["peer1"].BlacklistCount != 1 {
+		t.Errorf("Expected BlacklistCount of 1, got %d", bl.peers["peer1"].BlacklistCount)
+	}
+}
+
+// TestIsBlacklisted tests checking if a peer is blacklisted.
+func TestIsBlacklisted(t *testing.T) {
+	bl := NewBlackList(2, 1*time.Minute, 1)
+	bl.AddOrUpdatePeer("peer1", 100)
+	bl.peers["peer1"].LastSeen = time.Now().Add(-2 * time.Minute) // make peer stale
+	bl.BlacklistStalePeers()
+
+	if !bl.IsBlacklisted("peer1") {
+		t.Errorf("Expected peer1 to be blacklisted")
+	}
+}
+
+// TestEdgeCases tests handling of edge cases such as invalid IDs.
+func TestEdgeCases(t *testing.T) {
+	bl := NewBlackList(2, 1*time.Minute, 1)
+	bl.AddOrUpdatePeer("", 100) // testing with empty ID
+	if len(bl.peers) != 0 {
+		t.Errorf("Expected 0 peers, got %d", len(bl.peers))
+	}
+}
+
+// TestAddOrUpdatePeer_MaxPeers tests behavior when adding peers up to and beyond the maximum limit.
+func TestAddOrUpdatePeer_MaxPeers(t *testing.T) {
+	bl := NewBlackList(3, 10*time.Minute, 3)
+
+	bl.AddOrUpdatePeer("peer1", 100)
+	bl.AddOrUpdatePeer("peer2", 101)
+	bl.AddOrUpdatePeer("peer3", 102)
+	bl.AddOrUpdatePeer("peer4", 103) // This should remove peer1
+
+	if len(bl.peers) != 3 {
+		t.Errorf("Expected 3 peers, got %d", len(bl.peers))
+	}
+
+	if _, exists := bl.peers["peer1"]; exists {
+		t.Errorf("Expected peer1 to be removed")
+	}
+}
+
+// TestBlacklistCountOverflow checks how the system handles when a peer's BlacklistCount exceeds the threshold.
+func TestBlacklistCountOverflow(t *testing.T) {
+	bl := NewBlackList(2, 1*time.Second, 2)
+	bl.AddOrUpdatePeer("peer1", 100)
+
+	// Simulate multiple blacklist increments
+	time.Sleep(2 * time.Second)
+	bl.BlacklistStalePeers()
+	bl.BlacklistStalePeers()
+
+	if !bl.IsBlacklisted("peer1") {
+		t.Errorf("Expected peer1 to be blacklisted after exceeding blacklist count")
+	}
+}
+
+// TestExpiryTimeBoundary tests behavior when a peer's LastSeen is exactly at the expiry boundary.
+func TestExpiryTimeBoundary(t *testing.T) {
+	bl := NewBlackList(2, 1*time.Second, 2)
+	bl.AddOrUpdatePeer("peer1", 100)
+	time.Sleep(1 * time.Second)
+
+	bl.BlacklistStalePeers() // Should increment blacklist count but not blacklisted yet
+
+	if bl.peers["peer1"].BlacklistCount != 1 {
+		t.Errorf("Expected BlacklistCount of 1, got %d", bl.peers["peer1"].BlacklistCount)
+	}
+
+	if bl.IsBlacklisted("peer1") {
+		t.Errorf("Peer1 should not be blacklisted yet")
+	}
+}
+
+// TestConcurrentAccess tests concurrent access to the blackList.
+func TestConcurrentAccess(t *testing.T) {
+	bl := NewBlackList(100, 10*time.Minute, 3)
+	var wg sync.WaitGroup
+
+	for i := 0; i < 50; i++ {
+		wg.Add(1)
+		go func(id string) {
+			defer wg.Done()
+			bl.AddOrUpdatePeer(id, int64(i))
+		}(string(rune('a' + i)))
+	}
+
+	wg.Wait()
+
+	if len(bl.peers) != 50 {
+		t.Errorf("Expected 50 peers, got %d", len(bl.peers))
+	}
+}
+
+// TestReaddingBlacklistedPeer tests the behavior when a blacklisted peer is re-added.
+func TestReaddingBlacklistedPeer(t *testing.T) {
+	bl := NewBlackList(2, 1*time.Second, 1)
+	bl.AddOrUpdatePeer("peer1", 100)
+
+	// Simulate time passing to trigger blacklist
+	time.Sleep(2 * time.Second)
+	bl.BlacklistStalePeers()
+
+	// Ensure peer1 is blacklisted
+	if !bl.IsBlacklisted("peer1") {
+		t.Errorf("Expected peer1 to be blacklisted")
+	}
+
+	// Re-add the same peer
+	bl.AddOrUpdatePeer("peer1", 101)
+
+	if bl.peers["peer1"].BlacklistCount != 0 {
+		t.Errorf("Expected BlacklistCount to be reset, got %d", bl.peers["peer1"].BlacklistCount)
+	}
+
+	if bl.IsBlacklisted("peer1") {
+		t.Errorf("Peer1 should not be blacklisted after re-adding with updated information")
+	}
+}

eth/ethconfig/config.go

@@ -194,9 +194,6 @@ type Config struct {
 	// OverrideBohr (TODO: remove after the fork)
 	OverrideBohr *uint64 `toml:",omitempty"`
 
-	// OverridePascal (TODO: remove after the fork)
-	OverridePascal *uint64 `toml:",omitempty"`
-
 	// OverrideVerkle (TODO: remove after the fork)
 	OverrideVerkle *uint64 `toml:",omitempty"`
 

eth/ethconfig/gen_config.go

@@ -72,7 +72,6 @@ func (c Config) MarshalTOML() (interface{}, error) {
 		RPCTxFeeCap             float64
 		OverridePassedForkTime      *uint64 `toml:",omitempty"`
 		OverrideBohr            *uint64 `toml:",omitempty"`
-		OverridePascal          *uint64 `toml:",omitempty"`
 		OverrideVerkle          *uint64 `toml:",omitempty"`
 		BlobExtraReserve        uint64
 	}
@@ -132,7 +131,6 @@ func (c Config) MarshalTOML() (interface{}, error) {
 	enc.RPCTxFeeCap = c.RPCTxFeeCap
 	enc.OverridePassedForkTime = c.OverridePassedForkTime
 	enc.OverrideBohr = c.OverrideBohr
-	enc.OverridePascal = c.OverridePascal
 	enc.OverrideVerkle = c.OverrideVerkle
 	enc.BlobExtraReserve = c.BlobExtraReserve
 	return &enc, nil
@@ -196,7 +194,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
 		RPCTxFeeCap             *float64
 		OverridePassedForkTime      *uint64 `toml:",omitempty"`
 		OverrideBohr            *uint64 `toml:",omitempty"`
-		OverridePascal          *uint64 `toml:",omitempty"`
 		OverrideVerkle          *uint64 `toml:",omitempty"`
 		BlobExtraReserve        *uint64
 	}
@@ -369,9 +366,6 @@ func (c *Config) UnmarshalTOML(unmarshal func(interface{}) error) error {
 	if dec.OverrideBohr != nil {
 		c.OverrideBohr = dec.OverrideBohr
 	}
-	if dec.OverridePascal != nil {
-		c.OverridePascal = dec.OverridePascal
-	}
 	if dec.OverrideVerkle != nil {
 		c.OverrideVerkle = dec.OverrideVerkle
 	}

eth/handler.go

@@ -172,6 +172,8 @@ type handler struct {
 
 	handlerStartCh chan struct{}
 	handlerDoneCh  chan struct{}
+
+	blackList *blackList
 }
 
 // newHandler returns a handler for all Ethereum chain management protocol.
@@ -702,6 +704,7 @@ func (h *handler) unregisterPeer(id string) {
 func (h *handler) Start(maxPeers int, maxPeersPerIP int) {
 	h.maxPeers = maxPeers
 	h.maxPeersPerIP = maxPeersPerIP
+	h.blackList = NewBlackList(maxPeers, 1*time.Hour, 3)
 	// broadcast and announce transactions (only new ones, not resurrected ones)
 	h.wg.Add(1)
 	h.txsCh = make(chan core.NewTxsEvent, txChanSize)

params/config.go

@@ -155,8 +155,6 @@ var (
 		HaberTime:           newUint64(1718863500), // 2024-06-20 06:05:00 AM UTC
 		HaberFixTime:        newUint64(1727316120), // 2024-09-26 02:02:00 AM UTC
 		BohrTime:            newUint64(1727317200), // 2024-09-26 02:20:00 AM UTC
-		// TODO
-		PascalTime: nil,
 
 		Parlia: &ParliaConfig{
 			Period: 3,
@@ -198,8 +196,6 @@ var (
 		HaberTime:           newUint64(1716962820), // 2024-05-29 06:07:00 AM UTC
 		HaberFixTime:        newUint64(1719986788), // 2024-07-03 06:06:28 AM UTC
 		BohrTime:            newUint64(1724116996), // 2024-08-20 01:23:16 AM UTC
-		// TODO
-		PascalTime: nil,
 
 		Parlia: &ParliaConfig{
 			Period: 3,
@@ -242,8 +238,6 @@ var (
 		HaberTime:           newUint64(0),
 		HaberFixTime:        newUint64(0),
 		BohrTime:            newUint64(0),
-		// TODO
-		PascalTime: newUint64(0),
 
 		Parlia: &ParliaConfig{
 			Period: 3,
@@ -523,7 +517,6 @@ type ChainConfig struct {
 	HaberTime      *uint64 `json:"haberTime,omitempty"`      // Haber switch time (nil = no fork, 0 = already on haber)
 	HaberFixTime   *uint64 `json:"haberFixTime,omitempty"`   // HaberFix switch time (nil = no fork, 0 = already on haberFix)
 	BohrTime       *uint64 `json:"bohrTime,omitempty"`       // Bohr switch time (nil = no fork, 0 = already on bohr)
-	PascalTime     *uint64 `json:"pascalTime,omitempty"`     // Pascal switch time (nil = no fork, 0 = already on pascal)
 	PragueTime     *uint64 `json:"pragueTime,omitempty"`     // Prague switch time (nil = no fork, 0 = already on prague)
 	VerkleTime     *uint64 `json:"verkleTime,omitempty"`     // Verkle switch time (nil = no fork, 0 = already on verkle)
 
@@ -644,12 +637,7 @@ func (c *ChainConfig) String() string {
 		BohrTime = big.NewInt(0).SetUint64(*c.BohrTime)
 	}
 
-	var PascalTime *big.Int
-	if c.PascalTime != nil {
-		PascalTime = big.NewInt(0).SetUint64(*c.PascalTime)
-	}
-
-	return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Ramanujan: %v, Niels: %v, MirrorSync: %v, Bruno: %v, Berlin: %v, YOLO v3: %v, CatalystBlock: %v, London: %v, ArrowGlacier: %v, MergeFork:%v, Euler: %v, Gibbs: %v, Nano: %v, Moran: %v, Planck: %v,Luban: %v, Plato: %v, Hertz: %v, Hertzfix: %v, ShanghaiTime: %v, KeplerTime: %v, FeynmanTime: %v, FeynmanFixTime: %v, CancunTime: %v, HaberTime: %v, HaberFixTime: %v, BohrTime: %v, PascalTime: %v, Engine: %v}",
+	return fmt.Sprintf("{ChainID: %v Homestead: %v DAO: %v DAOSupport: %v EIP150: %v EIP155: %v EIP158: %v Byzantium: %v Constantinople: %v Petersburg: %v Istanbul: %v, Muir Glacier: %v, Ramanujan: %v, Niels: %v, MirrorSync: %v, Bruno: %v, Berlin: %v, YOLO v3: %v, CatalystBlock: %v, London: %v, ArrowGlacier: %v, MergeFork:%v, Euler: %v, Gibbs: %v, Nano: %v, Moran: %v, Planck: %v,Luban: %v, Plato: %v, Hertz: %v, Hertzfix: %v, ShanghaiTime: %v, KeplerTime: %v, FeynmanTime: %v, FeynmanFixTime: %v, CancunTime: %v, HaberTime: %v, HaberFixTime: %v, BohrTime: %v, Engine: %v}",
 		c.ChainID,
 		c.HomesteadBlock,
 		c.DAOForkBlock,
@@ -689,7 +677,6 @@ func (c *ChainConfig) String() string {
 		HaberTime,
 		HaberFixTime,
 		BohrTime,
-		PascalTime,
 		engine,
 	)
 }
@@ -990,20 +977,6 @@ func (c *ChainConfig) IsOnBohr(currentBlockNumber *big.Int, lastBlockTime uint64
 	return !c.IsBohr(lastBlockNumber, lastBlockTime) && c.IsBohr(currentBlockNumber, currentBlockTime)
 }
 
-// IsPascal returns whether time is either equal to the Pascal fork time or greater.
-func (c *ChainConfig) IsPascal(num *big.Int, time uint64) bool {
-	return c.IsLondon(num) && isTimestampForked(c.PascalTime, time)
-}
-
-// IsOnPascal returns whether currentBlockTime is either equal to the Pascal fork time or greater firstly.
-func (c *ChainConfig) IsOnPascal(currentBlockNumber *big.Int, lastBlockTime uint64, currentBlockTime uint64) bool {
-	lastBlockNumber := new(big.Int)
-	if currentBlockNumber.Cmp(big.NewInt(1)) >= 0 {
-		lastBlockNumber.Sub(currentBlockNumber, big.NewInt(1))
-	}
-	return !c.IsPascal(lastBlockNumber, lastBlockTime) && c.IsPascal(currentBlockNumber, currentBlockTime)
-}
-
 // IsPrague returns whether num is either equal to the Prague fork time or greater.
 func (c *ChainConfig) IsPrague(num *big.Int, time uint64) bool {
 	return c.IsLondon(num) && isTimestampForked(c.PragueTime, time)
@@ -1070,7 +1043,6 @@ func (c *ChainConfig) CheckConfigForkOrder() error {
 		{name: "haberTime", timestamp: c.HaberTime},
 		{name: "haberFixTime", timestamp: c.HaberFixTime},
 		{name: "bohrTime", timestamp: c.BohrTime},
-		{name: "pascalTime", timestamp: c.PascalTime},
 		{name: "pragueTime", timestamp: c.PragueTime, optional: true},
 		{name: "verkleTime", timestamp: c.VerkleTime, optional: true},
 	} {
@@ -1227,9 +1199,6 @@ func (c *ChainConfig) checkCompatible(newcfg *ChainConfig, headNumber *big.Int,
 	if isForkTimestampIncompatible(c.BohrTime, newcfg.BohrTime, headTimestamp) {
 		return newTimestampCompatError("Bohr fork timestamp", c.BohrTime, newcfg.BohrTime)
 	}
-	if isForkTimestampIncompatible(c.PascalTime, newcfg.PascalTime, headTimestamp) {
-		return newTimestampCompatError("Pascal fork timestamp", c.PascalTime, newcfg.PascalTime)
-	}
 	if isForkTimestampIncompatible(c.PragueTime, newcfg.PragueTime, headTimestamp) {
 		return newTimestampCompatError("Prague fork timestamp", c.PragueTime, newcfg.PragueTime)
 	}