Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add required barnet fork configuration #23

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

feat: add required barnet fork configuration #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
813ee1b
feat: add required barnet fork configuration
cbermudez97 Apr 16, 2024
d3a5b18
feat: add cancun test step to test barnet functionality
cbermudez97 Apr 16, 2024
3414d18
fix: add missing barnet fork config
cbermudez97 Apr 17, 2024
9d9102e
fix: nil reference error
cbermudez97 Apr 17, 2024
51ab339
feat: add test for current post cancun behavior of blobs fee
cbermudez97 Apr 18, 2024
3aa9abc
fix: barnet fee collector checks not executing
cbermudez97 Apr 18, 2024
5ec7b1c
feat: add set timestamp method for test specs
cbermudez97 Apr 19, 2024
ba94400
fix: edge case for shapella genesis test cases with blobs transactions
cbermudez97 Apr 29, 2024
37ade19
feat: rework genesis timestamp set methods
cbermudez97 Apr 29, 2024
4ed3465
fix: invalid pointer usage
cbermudez97 Apr 29, 2024
edcae6b
fix: wrong usage of methods from composed base spec
cbermudez97 Apr 30, 2024
6db0b47
fix: issue when adding old test cases
cbermudez97 May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ hiveview
# build output for rust simulators files
simulators/**/Cargo.lock
simulators/**/target

# simulations outputs
runs
63 changes: 46 additions & 17 deletions simulators/ethereum/engine/client/core.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"time"

"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/hive/simulators/ethereum/engine/config"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types"
Expand Down Expand Up @@ -41,7 +42,7 @@ type Genesis interface {
Nonce() uint64
SetNonce(nonce uint64)
Timestamp() uint64
SetTimestamp(timestamp int64, cancun bool)
SetTimestamp(timestamp int64, fork config.Fork)
ExtraData() []byte
SetExtraData(data []byte)
GasLimit() uint64
Expand Down Expand Up @@ -175,6 +176,7 @@ type NethermindParams struct {
Eip1153TransitionTimestamp string `json:"eip1153TransitionTimestamp,omitempty"`
Eip5656TransitionTimestamp string `json:"eip5656TransitionTimestamp,omitempty"`
Eip6780TransitionTimestamp string `json:"eip6780TransitionTimestamp,omitempty"`
GipXYZTransitionTimestamp string `json:"gipxyzTransitionTimestamp,omitempty"`
Eip4844BlobGasPriceUpdateFraction string `json:"eip4844BlobGasPriceUpdateFraction"`
Eip4844MaxBlobGasPerBlock string `json:"eip4844MaxBlobGasPerBlock"`
Eip4844MinBlobGasPrice string `json:"eip4844MinBlobGasPrice"`
Expand Down Expand Up @@ -307,20 +309,42 @@ func (n *NethermindChainSpec) Timestamp() uint64 {
panic("implement me")
}

func (n *NethermindChainSpec) SetTimestamp(timestamp int64, cancun bool) {
func (n *NethermindChainSpec) SetTimestamp(timestamp int64, fork config.Fork) {
//n.Params.TerminalTotalDifficulty = fmt.Sprintf("%v", timestamp)
n.Params.Eip3651TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip4895TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip3855TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip3651TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip3860TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
if cancun {
shangaiTimestamp := int64(0)
cancunTimestamp := int64(0)
barnetTimestamp := int64(0)
if fork == config.Shanghai {
shangaiTimestamp = timestamp
} else if fork == config.Cancun {
shangaiTimestamp = timestamp
cancunTimestamp = timestamp
} else if fork == config.Barnet {
shangaiTimestamp = timestamp
cancunTimestamp = timestamp
barnetTimestamp = timestamp
}

// Set Shangai timestamps
if shangaiTimestamp != 0 {
n.Params.Eip3651TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip4895TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip3855TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip3651TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip3860TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
}
// Set Cancun timestamps
if cancunTimestamp != 0 {
n.Params.Eip4844TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip4788TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip1153TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip5656TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
n.Params.Eip6780TransitionTimestamp = fmt.Sprintf("%#x", timestamp)
}
// Set Barnet timestamps
if barnetTimestamp != 0 {
n.Params.GipXYZTransitionTimestamp = fmt.Sprintf("%#x", timestamp)
}
}

func (n *NethermindChainSpec) ExtraData() []byte {
Expand Down Expand Up @@ -470,8 +494,9 @@ type ErigonConfig struct {
Eip1559FeeCollector string `json:"eip1559FeeCollector"`
TerminalTotalDifficulty *big.Int `json:"terminalTotalDifficulty"`
TerminalTotalDifficultyPassed bool `json:"terminalTotalDifficultyPassed"`
ShanghaiTimestamp *big.Int `json:"shanghaiTime"`
ShanghaiTime *big.Int `json:"shanghaiTime"`
CancunTime *big.Int `json:"cancunTime"`
BarnetTime *big.Int `json:"barnetTime"`
MinBlobGasPrice int `json:"minBlobGasPrice"`
MaxBlobGasPerBlock int `json:"maxBlobGasPerBlock"`
TargetBlobGasPerBlock int `json:"targetBlobGasPerBlock"`
Expand Down Expand Up @@ -512,8 +537,8 @@ func (v *ErigonGenesis) SetExcessBlobGas(u *uint64) {
func (v *ErigonGenesis) Config() *params.ChainConfig {
chainID := big.NewInt(int64(v.ErigonConfig.ChainID))
ttd := big.NewInt(0).SetBytes(common.Hex2Bytes(v.ErigonDifficulty))
shangai := v.ErigonConfig.ShanghaiTimestamp.Uint64() //big.NewInt(v.ErigonConfig.ShanghaiTimestamp
cancun := v.ErigonConfig.CancunTime.Uint64() //big.NewInt(v.ErigonConfig.ShanghaiTimestamp
shangai := v.ErigonConfig.ShanghaiTime.Uint64() //big.NewInt(v.ErigonConfig.ShanghaiTime
cancun := v.ErigonConfig.CancunTime.Uint64() //big.NewInt(v.ErigonConfig.ShanghaiTime
return &params.ChainConfig{
ChainID: chainID,
TerminalTotalDifficulty: ttd,
Expand Down Expand Up @@ -542,12 +567,16 @@ func (v *ErigonGenesis) Timestamp() uint64 {
panic("implement me")
}

func (v *ErigonGenesis) SetTimestamp(timestamp int64, cancun bool) {
v.ErigonConfig.ShanghaiTimestamp = big.NewInt(timestamp)
if cancun {
func (v *ErigonGenesis) SetTimestamp(timestamp int64, fork config.Fork) {
if fork == config.Shanghai {
v.ErigonConfig.ShanghaiTime = big.NewInt(timestamp)
} else if fork == config.Cancun {
v.ErigonConfig.ShanghaiTime = big.NewInt(timestamp)
v.ErigonConfig.CancunTime = big.NewInt(timestamp)
} else if fork == config.Barnet {
v.ErigonConfig.ShanghaiTime = big.NewInt(timestamp)
v.ErigonConfig.CancunTime = big.NewInt(timestamp)
} else {
v.ErigonConfig.CancunTime = big.NewInt(timestamp+12000000)
v.ErigonConfig.BarnetTime = big.NewInt(timestamp)
}
}

Expand Down Expand Up @@ -637,7 +666,7 @@ func (v *ErigonGenesis) ToBlock() *types.Block {
alloc := make(core.GenesisAlloc)
for address, account := range v.ErigonAlloc {
balance := big.NewInt(0)
code := make([]byte, 0)
var code []byte
val := account.Balance
if val != "" {
bytesBalance := common.Hex2Bytes(val)
Expand Down
Loading
Loading