Skip to content
This repository has been archived by the owner on Apr 19, 2020. It is now read-only.

HF7 @ 36050 #24

Merged
merged 1 commit into from
Jun 6, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 16 additions & 8 deletions params/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,19 @@ var (
4: big.NewInt(21800), // HF4
5: big.NewInt(22800), // HF5 argonated (argon2id)
6: big.NewInt(36000), // HF6 divisor increase
7: big.NewInt(36050), // eip 155, 158
}

// Testnet now is HF6, avoiding the block #3 (HF3) difficulty bomb
TestnetHF = ForkMap{
0: big.NewInt(0), // hf0 had no changes
1: big.NewInt(1), // increase min difficulty to the next multiple of 2048
2: big.NewInt(2), // use simple difficulty algo (240 seconds)
3: big.NewInt(3), // increase min difficulty for anticipation of gpu mining
4: big.NewInt(4), // HF4
5: big.NewInt(5), // HF5
6: big.NewInt(6), // noop in testnet
0: big.NewInt(0), // hf0 had no changes
1: big.NewInt(1), // increase min difficulty to the next multiple of 2048
2: big.NewInt(2), // use simple difficulty algo (240 seconds)
3: big.NewInt(3), // increase min difficulty for anticipation of gpu mining
4: big.NewInt(4), // HF4
5: big.NewInt(5), // HF5
6: big.NewInt(6), // noop in testnet
7: big.NewInt(25), // eip 155, 158
}
)
var (
Expand All @@ -56,15 +58,21 @@ var (
ChainId: big.NewInt(61717561),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
EIP155Block: AquachainHF[7],
EIP158Block: AquachainHF[7],
ByzantiumBlock: AquachainHF[7],
Aquahash: new(AquahashConfig),
HF: AquachainHF,
}

// TestnetChainConfig contains the chain parameters to run a node on the Ropsten test network.
// TestnetChainConfig contains the chain parameters to run a node on the Aquachain test network.
TestnetChainConfig = &ChainConfig{
ChainId: big.NewInt(3),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
EIP155Block: TestnetHF[7],
EIP158Block: TestnetHF[7],
ByzantiumBlock: TestnetHF[7],
Aquahash: new(AquahashConfig),
HF: TestnetHF,
}
Expand Down
8 changes: 4 additions & 4 deletions params/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import (
)

const (
VersionMajor = 1 // Major version component of the current release
VersionMinor = 6 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "HF6" // Version metadata to append to the version string
VersionMajor = 1 // Major version component of the current release
VersionMinor = 7 // Minor version component of the current release
VersionPatch = 0 // Patch version component of the current release
VersionMeta = "unstable" // Version metadata to append to the version string
)

// Version holds the textual version string.
Expand Down