diff --git a/builder/files/genesis-mainnet-v1.json b/builder/files/genesis-mainnet-v1.json index a5b96140ca..d3f0d02206 100644 --- a/builder/files/genesis-mainnet-v1.json +++ b/builder/files/genesis-mainnet-v1.json @@ -15,17 +15,14 @@ "londonBlock": 23850000, "bor": { "jaipurBlock": 23850000, - "delhiBlock": 36499456, "period": { "0": 2 }, "producerDelay": { - "0": 6, - "36499456": 4 + "0": 6 }, "sprint": { - "0": 64, - "36499456": 16 + "0": 64 }, "backupMultiplier": { "0": 2 diff --git a/builder/files/genesis-testnet-v4.json b/builder/files/genesis-testnet-v4.json index 41c6b072d1..8a0af45088 100644 --- a/builder/files/genesis-testnet-v4.json +++ b/builder/files/genesis-testnet-v4.json @@ -15,24 +15,19 @@ "londonBlock": 22640000, "bor": { "jaipurBlock": 22770000, - "delhiBlock": 29389056, "period": { "0": 2, - "25275000": 5, - "29389056": 2 + "25275000": 5 }, "producerDelay": { - "0": 6, - "29389056": 4 + "0": 6 }, "sprint": { - "0": 64, - "29389056": 16 + "0": 64 }, "backupMultiplier": { "0": 2, - "25275000": 5, - "29389056": 2 + "25275000": 5 }, "validatorContract": "0x0000000000000000000000000000000000001000", "stateReceiverContract": "0x0000000000000000000000000000000000001001", diff --git a/internal/cli/server/chains/mainnet.go b/internal/cli/server/chains/mainnet.go index 8b75039f1a..7aee9cd606 100644 --- a/internal/cli/server/chains/mainnet.go +++ b/internal/cli/server/chains/mainnet.go @@ -30,17 +30,14 @@ var mainnetBor = &Chain{ LondonBlock: big.NewInt(23850000), Bor: ¶ms.BorConfig{ JaipurBlock: big.NewInt(23850000), - DelhiBlock: big.NewInt(36499456), Period: map[string]uint64{ "0": 2, }, ProducerDelay: map[string]uint64{ - "0": 6, - "36499456": 4, + "0": 6, }, Sprint: map[string]uint64{ - "0": 64, - "36499456": 16, + "0": 64, }, BackupMultiplier: map[string]uint64{ "0": 2, diff --git a/internal/cli/server/chains/mumbai.go b/internal/cli/server/chains/mumbai.go index daa4a2bea7..3858ad68d6 100644 --- a/internal/cli/server/chains/mumbai.go +++ b/internal/cli/server/chains/mumbai.go @@ -30,24 +30,19 @@ var mumbaiTestnet = &Chain{ LondonBlock: big.NewInt(22640000), Bor: ¶ms.BorConfig{ JaipurBlock: big.NewInt(22770000), - DelhiBlock: big.NewInt(29389056), Period: map[string]uint64{ "0": 2, "25275000": 5, - "29389056": 2, }, ProducerDelay: map[string]uint64{ - "0": 6, - "29389056": 4, + "0": 6, }, Sprint: map[string]uint64{ - "0": 64, - "29389056": 16, + "0": 64, }, BackupMultiplier: map[string]uint64{ "0": 2, "25275000": 5, - "29389056": 2, }, ValidatorContract: "0x0000000000000000000000000000000000001000", StateReceiverContract: "0x0000000000000000000000000000000000001001", diff --git a/internal/cli/server/chains/test_files/chain_legacy_test.json b/internal/cli/server/chains/test_files/chain_legacy_test.json index 785c8cf855..7adf825b0e 100644 --- a/internal/cli/server/chains/test_files/chain_legacy_test.json +++ b/internal/cli/server/chains/test_files/chain_legacy_test.json @@ -17,21 +17,17 @@ "bor": { "period": { "0": 2, - "25275000": 5, - "29389056": 2 + "25275000": 5 }, "producerDelay": { - "0": 6, - "29389056": 4 + "0": 6 }, "sprint": { - "0": 64, - "29389056": 16 + "0": 64 }, "backupMultiplier": { "0": 2, - "25275000": 5, - "29389056": 2 + "25275000": 5 }, "validatorContract": "0x0000000000000000000000000000000000001000", "stateReceiverContract": "0x0000000000000000000000000000000000001001", @@ -47,8 +43,7 @@ "burntContract": { "22640000": "0x70bcA57F4579f58670aB2d18Ef16e02C17553C38" }, - "jaipurBlock": 22770000, - "delhiBlock": 29389056 + "jaipurBlock": 22770000 } }, "nonce": "0x0", diff --git a/internal/cli/server/chains/test_files/chain_test.json b/internal/cli/server/chains/test_files/chain_test.json index 37b0131fbf..9dc949e6f2 100644 --- a/internal/cli/server/chains/test_files/chain_test.json +++ b/internal/cli/server/chains/test_files/chain_test.json @@ -19,21 +19,17 @@ "bor":{ "period":{ "0":2, - "25275000": 5, - "29389056": 2 + "25275000": 5 }, "producerDelay":{ - "0": 6, - "29389056": 4 + "0": 6 }, "sprint":{ - "0": 64, - "29389056": 16 + "0": 64 }, "backupMultiplier":{ "0": 2, - "25275000": 5, - "29389056": 2 + "25275000": 5 }, "validatorContract":"0x0000000000000000000000000000000000001000", "stateReceiverContract":"0x0000000000000000000000000000000000001001", @@ -49,8 +45,7 @@ "burntContract":{ "22640000":"0x70bcA57F4579f58670aB2d18Ef16e02C17553C38" }, - "jaipurBlock":22770000, - "delhiBlock": 29389056 + "jaipurBlock":22770000 } }, "nonce":"0x0", diff --git a/params/config.go b/params/config.go index 92473b1146..a480218e22 100644 --- a/params/config.go +++ b/params/config.go @@ -350,24 +350,19 @@ var ( LondonBlock: big.NewInt(22640000), Bor: &BorConfig{ JaipurBlock: big.NewInt(22770000), - DelhiBlock: big.NewInt(29389056), Period: map[string]uint64{ "0": 2, "25275000": 5, - "29389056": 2, }, ProducerDelay: map[string]uint64{ - "0": 6, - "29389056": 4, + "0": 6, }, Sprint: map[string]uint64{ - "0": 64, - "29389056": 16, + "0": 64, }, BackupMultiplier: map[string]uint64{ "0": 2, "25275000": 5, - "29389056": 2, }, ValidatorContract: "0x0000000000000000000000000000000000001000", StateReceiverContract: "0x0000000000000000000000000000000000001001", @@ -404,17 +399,14 @@ var ( LondonBlock: big.NewInt(23850000), Bor: &BorConfig{ JaipurBlock: big.NewInt(23850000), - DelhiBlock: big.NewInt(36499456), Period: map[string]uint64{ "0": 2, }, ProducerDelay: map[string]uint64{ - "0": 6, - "36499456": 4, + "0": 6, }, Sprint: map[string]uint64{ - "0": 64, - "36499456": 16, + "0": 64, }, BackupMultiplier: map[string]uint64{ "0": 2,