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

Changes for the orchard testnet restart #2518

Merged
merged 3 commits into from
Feb 5, 2025
Merged

Changes for the orchard testnet restart #2518

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
692442e
Update the Orchard params for testing
gameofpointers Feb 5, 2025
3d68e76
Updated the genesis alloc hash and added poison addresses
gameofpointers Feb 5, 2025
cc2e936
Updated the orchard difficulty and updated the genesis hash
gameofpointers Feb 5, 2025
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
2 changes: 1 addition & 1 deletion cmd/genallocs/genesis_alloc.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion consensus/misc/statefee_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func TestCalcStateLimit(t *testing.T) {
emptyWo := types.EmptyWorkObject(common.ZONE_CTX)

blockNumbers := []uint64{0, 10, params.TimeToStartTx, params.BlocksPerWeek, params.BlocksPerMonth, 2 * params.BlocksPerMonth, 3 * params.BlocksPerMonth / 2, 4 * params.BlocksPerMonth}
expectedStateLimit := []uint64{0, 0, 12500000, 0, 25000000, 50000000, 37500000, 50000000}
expectedStateLimit := []uint64{0, 0, 12000000, 12000000, 25000000, 50000000, 37500000, 50000000}

for i := 0; i < len(blockNumbers); i++ {
emptyWo.Header().SetStateLimit(params.MinGasLimit(blockNumbers[i]))
Expand Down
2 changes: 1 addition & 1 deletion core/block_validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func TestCalcGasLimit(t *testing.T) {
emptyWo := types.EmptyWorkObject(common.ZONE_CTX)

blockNumbers := []uint64{0, 10, params.TimeToStartTx, params.BlocksPerWeek, params.BlocksPerMonth, 2 * params.BlocksPerMonth, 3 * params.BlocksPerMonth / 2, 4 * params.BlocksPerMonth}
expectedGasLimit := []uint64{0, 0, 12500000, 0, 25000000, 50000000, 37500000, 50000000}
expectedGasLimit := []uint64{0, 0, 12000000, 12000000, 25000000, 50000000, 37500000, 50000000}

for i := 0; i < len(blockNumbers); i++ {
emptyWo.Header().SetGasLimit(params.MinGasLimit(blockNumbers[i]))
Expand Down
2 changes: 1 addition & 1 deletion core/genesis.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func DefaultOrchardGenesisBlock(consensusEngine string, nonce uint64, extra []by
Nonce: nonce,
ExtraData: extra,
GasLimit: 12000000,
Difficulty: big.NewInt(50000000001),
Difficulty: big.NewInt(500000000),
}
if consensusEngine == "blake3" {
genesis.Config = params.Blake3PowOrchardChainConfig
Expand Down
4 changes: 2 additions & 2 deletions params/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var (
// Progpow GenesisHashes
ProgpowColosseumGenesisHash = common.HexToHash("0xac81c28f1a72591b87b5f16c9793cdc0e87c45c6d426d1a364c3b8f6386b5b8b")
ProgpowGardenGenesisHash = common.HexToHash("0xe6d0f9327aae915db55ab0cf9da7841c64e4ae39baa251c17586d8d25b59afbc")
ProgpowOrchardGenesisHash = common.HexToHash("0x12c80fbe68b732139343da9d7a97d06862b29a962b8749f2b977b83364612c96")
ProgpowOrchardGenesisHash = common.HexToHash("0x7c10e30ca616616411ac84fce6c4121d8fce6a24bff725c30a1eaccb8f85920e")
ProgpowLighthouseGenesisHash = common.HexToHash("0xf86f23baa7818c62b0d4bd5f2100230eab65392e0b115b91f446b299fddf38d8")
ProgpowLocalGenesisHash = common.HexToHash("0x445186cbbd8d387806aeeb089c1763ccf21a299ac8ae37d07bb283f5b6ada572")

Expand All @@ -39,7 +39,7 @@ var (
Blake3PowLighthouseGenesisHash = common.HexToHash("0x7006882c75e8f445b754947f623d619716bac1cf8ab24005e396369d0d0a65e3")
Blake3PowLocalGenesisHash = common.HexToHash("0x2facaeb87e9770b76880a2dcb2554013626aa937a2f089fa2c18bd55e7ba9354")

AllocHash = common.HexToHash("0xa1f3f565b62c83fcc0e61dfd219409fb06526570934a5d94b5db5afdad13f1da")
AllocHash = common.HexToHash("0x9bbe29fd621de6817cbc92ff37e47bce280926cfa1b7bc36f015c658d8140601")
)

// Different Network names
Expand Down
6 changes: 3 additions & 3 deletions params/protocol_params.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ var (
OrchardDurationLimit = big.NewInt(5) // The decision boundary on the blocktime duration used to determine whether difficulty should go up or not.
LighthouseDurationLimit = big.NewInt(5) // The decision boundary on the blocktime duration used to determine whether difficulty should go up or not.
LocalDurationLimit = big.NewInt(1) // The decision boundary on the blocktime duration used to determine whether difficulty should go up or not.
TimeToStartTx uint64 = 15 * BlocksPerDay
TimeToStartTx uint64 = 100
BlocksPerDay uint64 = new(big.Int).Div(big.NewInt(86400), DurationLimit).Uint64() // BlocksPerDay is the number of blocks per day assuming 5 second block time
BlocksPerWeek uint64 = 7 * BlocksPerDay
BlocksPerMonth uint64 = 30 * BlocksPerDay
Expand Down Expand Up @@ -208,8 +208,8 @@ var (
OneOverBaseFeeControllerAlpha = big.NewInt(100)
BaseFeeMultiplier = big.NewInt(50)

ConversionLockPeriod uint64 = 2 * BlocksPerWeek
CoinbaseEpochBlocks uint64 = 50000
ConversionLockPeriod uint64 = 100
CoinbaseEpochBlocks uint64 = 100

StartingKQuaiDiscount = big.NewInt(100)
StartingConversionFlowAmount = new(big.Int).Mul(big.NewInt(10000), big.NewInt(Ether)) // Starting conversion flow amount in Quai
Expand Down
Loading