forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tests

Browse source
This commit is contained in:
jagdeep sidhu 2024-10-07 12:15:04 -07:00
parent eb5f11a911
commit c6262351eb
3 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/utils/flags.go
View file

@ -1327,8 +1327,6 @@ func setEtherbase(ctx *cli.Context, cfg *ethconfig.Config) {
log.Warn("Option --miner.etherbase is deprecated")
}
if !ctx.IsSet(MinerPendingFeeRecipientFlag.Name) {
// SYSCOIN
log.Warn("Option --miner.pending.feeRecipient is missing")
return
}
addr := ctx.String(MinerPendingFeeRecipientFlag.Name)

23
consensus/beacon/consensus.go
View file

@ -38,7 +38,7 @@ import (
// Proof-of-stake protocol constants.
var (
beaconDifficulty = common.Big1 // The default block difficulty in the beacon consensus
beaconDifficulty = common.Big0 // The default block difficulty in the beacon consensus
beaconNonce = types.EncodeNonce(0) // The default block nonce in the beacon consensus
// SYSCOIN
SyscoinBlockReward, _ = new(big.Int).SetString("10550000000000000000", 10) // 10.55 Block reward for successfully mining a block upward from Syscoin
@ -253,17 +253,28 @@ func (beacon *Beacon) verifyHeader(chain consensus.ChainHeaderReader, header, pa
return consensus.ErrFutureBlock
}
if !chain.HasNEVMMapping(header.Hash()) {
return errors.New("Block not found in NEVM mapping")
return errors.New("block not found in NEVM mapping")
}
// Verify the block's difficulty to ensure it's the default constant
if !chain.Config().IsNexus(header.Number) {
if beaconDifficulty.Cmp(new(big.Int).SetInt64(1)) != 0 {
return fmt.Errorf("invalid difficulty: have %v, want %v", header.Difficulty, new(big.Int).SetInt64(1))
}
} else {
if beaconDifficulty.Cmp(header.Difficulty) != 0 {
return fmt.Errorf("invalid difficulty: have %v, want %v", header.Difficulty, beaconDifficulty)
}
}
} else {
if beaconDifficulty.Cmp(header.Difficulty) != 0 {
return fmt.Errorf("invalid difficulty: have %v, want %v", header.Difficulty, beaconDifficulty)
}
}
// Verify the timestamp
if header.Time <= parent.Time {
return errInvalidTimestamp
}
// Verify the block's difficulty to ensure it's the default constant
if beaconDifficulty.Cmp(header.Difficulty) != 0 {
return fmt.Errorf("invalid difficulty: have %v, want %v", header.Difficulty, beaconDifficulty)
}
// Verify that the gas limit is <= 2^63-1
if header.GasLimit > params.MaxGasLimit {
return fmt.Errorf("invalid gasLimit: have %v, max %v", header.GasLimit, params.MaxGasLimit)

2
eth/backend.go
View file

@ -114,7 +114,6 @@ type Ethereum struct {
// SYSCOIN
wgNEVM sync.WaitGroup
zmqRep *ZMQRep
node *node.Node
timeLastBlock int64
}
@ -291,7 +290,6 @@ func New(stack *node.Node, config *ethconfig.Config) (*Ethereum, error) {
// Successful startup; push a marker and check previous unclean shutdowns.
eth.shutdownTracker.MarkStartup()
// SYSCOIN
eth.node = stack
createBlock := func(eth *Ethereum) *types.Block {
eth.wgNEVM.Add(1)
defer eth.wgNEVM.Done()