Skip to content

params: activate agharta on classic 9573000 #75

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

Merged
meowsbits merged 3 commits into from
Dec 15, 2019
Merged

params: activate agharta on classic 9573000 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f2bd73
params: activate agharta on classic 9573000
soc1c Dec 12, 2019
405f57b
Enable Constantinople and Petersburg on Ethereum Classic
sorpaas Dec 13, 2019
aedaa13
core/forkid: update forkid test to include etc 9573000 fork
meowsbits Dec 15, 2019
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
33 changes: 16 additions & 17 deletions consensus/ethash/consensus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,27 +561,26 @@ var (
// reward. The total reward consists of the static block reward and rewards for
// included uncles. The coinbase of each uncle block is also rewarded.
func accumulateRewards(config *params.ChainConfig, state *state.StateDB, header *types.Header, uncles []*types.Header) {
// Select the correct block reward based on chain progression
blockReward := FrontierBlockReward
if config.IsEIP649F(header.Number) {
blockReward = EIP649FBlockReward
}
if config.IsEIP1234F(header.Number) {
blockReward = EIP1234FBlockReward
}
if config.IsSocial(header.Number) {
blockReward = params.SocialBlockReward
}
if config.IsEthersocial(header.Number) {
blockReward = params.EthersocialBlockReward
}
if config.IsMCIP0(header.Number) {
musicoinBlockReward(config, state, header, uncles)
return
}
if config.IsECIP1017F(header.Number) {
} else if config.IsECIP1017F(header.Number) {
ecip1017BlockReward(config, state, header, uncles)
} else {
// Select the correct block reward based on chain progression
blockReward := FrontierBlockReward
if config.IsEIP649F(header.Number) {
blockReward = EIP649FBlockReward
}
if config.IsEIP1234F(header.Number) {
blockReward = EIP1234FBlockReward
}
if config.IsSocial(header.Number) {
blockReward = params.SocialBlockReward
}
if config.IsEthersocial(header.Number) {
blockReward = params.EthersocialBlockReward
}

// Accumulate the rewards for the miner and any included uncles
reward := new(big.Int).Set(blockReward)
r := new(big.Int)
Expand Down
2 changes: 1 addition & 1 deletion core/forkid/forkid_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func TestGatherForks(t *testing.T) {
}{
{
params.ClassicChainConfig,
[]uint64{1150000, 1920000, 2500000, 3000000, 5000000, 5900000, 8772000},
[]uint64{1150000, 1920000, 2500000, 3000000, 5000000, 5900000, 8772000, 9573000},
},
}
sliceContains := func (sl []uint64, u uint64) bool {
Expand Down
3 changes: 2 additions & 1 deletion params/config_classic.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ var (
DisposalBlock: big.NewInt(5900000),
SocialBlock: nil,
EthersocialBlock: nil,
ConstantinopleBlock: nil,
ConstantinopleBlock: big.NewInt(9573000),
PetersburgBlock: big.NewInt(9573000),
ECIP1017FBlock: big.NewInt(5000000),
ECIP1017EraRounds: big.NewInt(5000000),
EIP160FBlock: big.NewInt(3000000),
Expand Down