Skip to content

Commit

Permalink
Merge pull request #2460 from bnb-chain/develop
Browse files Browse the repository at this point in the history
merge some PRs for v1.4.7(2nd)
  • Loading branch information
buddh0 authored May 14, 2024
2 parents f2ec3cc + d436f9e commit c577ce3
Show file tree
Hide file tree
Showing 32 changed files with 194 additions and 240 deletions.
8 changes: 0 additions & 8 deletions cmd/geth/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,6 @@ func makeFullNode(ctx *cli.Context) (*node.Node, ethapi.Backend) {
v := ctx.Uint64(utils.OverrideVerkle.Name)
cfg.Eth.OverrideVerkle = &v
}
if ctx.IsSet(utils.OverrideFeynman.Name) {
v := ctx.Uint64(utils.OverrideFeynman.Name)
cfg.Eth.OverrideFeynman = &v
}
if ctx.IsSet(utils.OverrideFeynmanFix.Name) {
v := ctx.Uint64(utils.OverrideFeynmanFix.Name)
cfg.Eth.OverrideFeynmanFix = &v
}
if ctx.IsSet(utils.OverrideFullImmutabilityThreshold.Name) {
params.FullImmutabilityThreshold = ctx.Uint64(utils.OverrideFullImmutabilityThreshold.Name)
downloader.FullMaxForkAncestry = ctx.Uint64(utils.OverrideFullImmutabilityThreshold.Name)
Expand Down
2 changes: 0 additions & 2 deletions cmd/geth/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@ var (
utils.RialtoHash,
utils.OverrideCancun,
utils.OverrideVerkle,
utils.OverrideFeynman,
utils.OverrideFeynmanFix,
utils.OverrideFullImmutabilityThreshold,
utils.OverrideMinBlocksForBlobRequests,
utils.OverrideDefaultExtraReserveForBlobRequests,
Expand Down
9 changes: 0 additions & 9 deletions cmd/utils/flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -315,15 +315,6 @@ var (
Usage: "Manually specify the Verkle fork timestamp, overriding the bundled setting",
Category: flags.EthCategory,
}
OverrideFeynman = &cli.Uint64Flag{
Name: "override.feynman",
Usage: "Manually specify the Feynman fork timestamp, overriding the bundled setting",
Category: flags.EthCategory,
}
OverrideFeynmanFix = &cli.Uint64Flag{
Name: "override.feynmanfix",
Usage: "Manually specify the FeynmanFix fork timestamp, overriding the bundled setting",
}
OverrideFullImmutabilityThreshold = &cli.Uint64Flag{
Name: "override.immutabilitythreshold",
Usage: "It is the number of blocks after which a chain segment is considered immutable, only for testing purpose",
Expand Down
12 changes: 2 additions & 10 deletions core/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -216,10 +216,8 @@ func (e *GenesisMismatchError) Error() string {
// ChainOverrides contains the changes to chain config
// Typically, these modifications involve hardforks that are not enabled on the BSC mainnet, intended for testing purposes.
type ChainOverrides struct {
OverrideCancun *uint64
OverrideVerkle *uint64
OverrideFeynman *uint64
OverrideFeynmanFix *uint64
OverrideCancun *uint64
OverrideVerkle *uint64
}

// SetupGenesisBlock writes or updates the genesis block in db.
Expand Down Expand Up @@ -251,12 +249,6 @@ func SetupGenesisBlockWithOverride(db ethdb.Database, triedb *triedb.Database, g
if overrides != nil && overrides.OverrideVerkle != nil {
config.VerkleTime = overrides.OverrideVerkle
}
if overrides != nil && overrides.OverrideFeynman != nil {
config.FeynmanTime = overrides.OverrideFeynman
}
if overrides != nil && overrides.OverrideFeynmanFix != nil {
config.FeynmanFixTime = overrides.OverrideFeynmanFix
}
}
}
// Just commit the new block if there is no stored genesis block.
Expand Down
1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/CrossChainContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/GovHubContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/GovTokenContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/GovernorContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/SlashContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/StakeCreditContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/StakeHubContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/StakingContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/TimelockContract

This file was deleted.

1 change: 0 additions & 1 deletion core/systemcontracts/feynman/rialto/TokenHubContract

This file was deleted.

Loading

0 comments on commit c577ce3

Please sign in to comment.