From a8f40e21de7038de89fc8d3bae24119f72c7893c Mon Sep 17 00:00:00 2001 From: ttblack Date: Fri, 2 Jul 2021 16:55:05 +0800 Subject: [PATCH] delete rinkby checkpoint --- core/forkid/forkid_test.go | 18 +++++++++--------- params/config.go | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index 671b3a70..1250743d 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -77,15 +77,15 @@ func TestCreation(t *testing.T) { params.RinkebyChainConfig, params.RinkebyGenesisHash, []testcase{ - {0, ID{Hash: checksumToBytes(0xc070dcd1), Next: 1}}, // Unsynced, last Frontier block - {1, ID{Hash: checksumToBytes(0x56c61556), Next: 2}}, // First and last Homestead block - {2, ID{Hash: checksumToBytes(0x5d6130af), Next: 3}}, // First and last Tangerine block - {3, ID{Hash: checksumToBytes(0x240e0924), Next: 4}}, // First and last Spurious block - {4, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // First Byzantium block - {2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // Last Byzantium block - {2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // First Constantinople, and Petersburg block - {2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // Last Petersburg block - {2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // Today Istanbul block + {0, ID{Hash: checksumToBytes(0xca2a645c), Next: 1}}, // Unsynced, last Frontier block + {1, ID{Hash: checksumToBytes(0x6ac7b7aa), Next: 2}}, // First and last Homestead block + {2, ID{Hash: checksumToBytes(0x8a1c75cf), Next: 3}}, // First and last Tangerine block + {3, ID{Hash: checksumToBytes(0x6ebf4e17), Next: 4}}, // First and last Spurious block + {4, ID{Hash: checksumToBytes(0xcd9b45ea), Next: 0}}, // First Byzantium block + {2208899, ID{Hash: checksumToBytes(0xcd9b45ea), Next: 0}}, // Last Byzantium block + //{2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // First Constantinople, and Petersburg block + //{2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // Last Petersburg block + //{2208899, ID{Hash: checksumToBytes(0x84a0dabb), Next: 0}}, // Today Istanbul block //{10000000, ID{Hash: checksumToBytes(0x879d6e30), Next: 0}}, // Future Istanbul block }, }, diff --git a/params/config.go b/params/config.go index 93d6130d..40e60fdc 100644 --- a/params/config.go +++ b/params/config.go @@ -29,7 +29,7 @@ import ( var ( MainnetGenesisHash = common.HexToHash("0x7d0702054ad68913eff9137dfa0b0b6ff701d55062359deacad14859561f5567") TestnetGenesisHash = common.HexToHash("0x3d0f9da9320556f6d58129419e041de28cf515eedc6b59f8dae49df98e3f943c") - RinkebyGenesisHash = common.HexToHash("0x14970cef05d63c9dd563ad99a581bcbce98a29257a97580e1daa7a9371a61e47") + RinkebyGenesisHash = common.HexToHash("0x1d2222712714d2419a27ea972e5a1e4b6ace05719a07f8aa75710780eff0280b") GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a") ) @@ -38,8 +38,8 @@ var ( var TrustedCheckpoints = map[common.Hash]*TrustedCheckpoint{ MainnetGenesisHash: MainnetTrustedCheckpoint, //TestnetGenesisHash: TestnetTrustedCheckpoint, - RinkebyGenesisHash: RinkebyTrustedCheckpoint, - GoerliGenesisHash: GoerliTrustedCheckpoint, + //RinkebyGenesisHash: RinkebyTrustedCheckpoint, + //GoerliGenesisHash: GoerliTrustedCheckpoint, } // CheckpointOracles associates each known checkpoint oracles with the genesis hash of