Skip to content

Commit 5873c01

Browse files
karalabekaralabe
authored
Merge pull request #19807 from karalabe/cht
params: bump all CHTs, deploy all checkpoint oracles
2 parents 16e3136 + 1bed5af commit 5873c01

File tree

2 files changed

+60
-19
lines changed

2 files changed

+60
-19
lines changed

‎params/bootnodes.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package params
1919
// MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on
2020
// the main Ethereum network.
2121
var MainnetBootnodes = []string{
22-
2322
// Ethereum Foundation Go Bootnodes
2423
"enode://d860a01f9722d78051619d1e2351aba3f43f943f6f00718d1b9baa4101932a1f5011f16bb2b1bb35db20d6fe28fa0bf09636d26a87d31de9ec6203eeedb1f666@18.138.108.67:30303", // bootnode-aws-ap-southeast-1-001
2524
"enode://22a8232c3abc76a16ae9d6c3b164f98775fe226f0917b0ca871128a74a8e9630b458460865bab457221f1d448dd9791d24c4e5d88786180ac185df813a68d4de@3.209.45.79:30303", // bootnode-aws-us-east-1-001
@@ -61,7 +60,7 @@ var RinkebyBootnodes = []string{
6160
// GoerliBootnodes are the enode URLs of the P2P bootstrap nodes running on the
6261
// Görli test network.
6362
var GoerliBootnodes = []string{
64-
// Upstrem bootnodes
63+
// Upstream bootnodes
6564
"enode://011f758e6552d105183b1761c5e2dea0111bc20fd5f6422bc7f91e0fabbec9a6595caf6239b37feb773dddd3f87240d99d859431891e4a642cf2a0a9e6cbb98a@51.141.78.53:30303",
6665
"enode://176b9417f511d05b6b2cf3e34b756cf0a7096b3094572a8f6ef4cdcb9d1f9d00683bf0f83347eebdf3b81c3521c2332086d9592802230bf528eaf606a1d9677b@13.93.54.137:30303",
6766
"enode://46add44b9f13965f7b9875ac6b85f016f341012d84f975377573800a863526f4da19ae2c620ec73d11591fa9510e992ecc03ad0751f53cc02f7c7ed6d55c7291@94.237.54.114:30313",

‎params/config.go‎

Lines changed: 59 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,10 @@ var TrustedCheckpoints = map[common.Hash]*TrustedCheckpoint{
4545
// CheckpointOracles associates each known checkpoint oracles with the genesis hash of
4646
// the chain it belongs to.
4747
var CheckpointOracles = map[common.Hash]*CheckpointOracleConfig{
48+
MainnetGenesisHash: MainnetCheckpointOracle,
49+
TestnetGenesisHash: TestnetCheckpointOracle,
4850
RinkebyGenesisHash: RinkebyCheckpointOracle,
51+
GoerliGenesisHash: GoerliCheckpointOracle,
4952
}
5053

5154
var (
@@ -67,10 +70,23 @@ var (
6770

6871
// MainnetTrustedCheckpoint contains the light client trusted checkpoint for the main network.
6972
MainnetTrustedCheckpoint = &TrustedCheckpoint{
70-
SectionIndex: 227,
71-
SectionHead: common.HexToHash("0xa2e0b25d72c2fc6e35a7f853cdacb193b4b4f95c606accf7f8fa8415283582c7"),
72-
CHTRoot: common.HexToHash("0xf69bdd4053b95b61a27b106a0e86103d791edd8574950dc96aa351ab9b9f1aa0"),
73-
BloomRoot: common.HexToHash("0xec1b454d4c6322c78ccedf76ac922a8698c3cac4d98748a84af4995b7bd3d744"),
73+
SectionIndex: 246,
74+
SectionHead: common.HexToHash("0xb86fbe8a2b1f3c576d06fe1721cd976f98ac1cbf1823da16ef74811e85fd44ac"),
75+
CHTRoot: common.HexToHash("0xe99b397f908a391d0d6bd41d1c19cea4bf5051a9695c94d58de44c538d7a1037"),
76+
BloomRoot: common.HexToHash("0xa1c1e064ccc16690c5fbabf600c4c7ebb2d8e8fcc674e59365087a77fb391a47"),
77+
}
78+
79+
// MainnetCheckpointOracle contains a set of configs for the main network oracle.
80+
MainnetCheckpointOracle = &CheckpointOracleConfig{
81+
Address: common.HexToAddress("0x9a9070028361F7AAbeB3f2F2Dc07F82C4a98A02a"),
82+
Signers: []common.Address{
83+
common.HexToAddress("0x1b2C260efc720BE89101890E4Db589b44E950527"), // Peter
84+
common.HexToAddress("0x78d1aD571A1A09D60D9BBf25894b44e4C8859595"), // Martin
85+
common.HexToAddress("0x286834935f4A8Cfb4FF4C77D5770C2775aE2b0E7"), // Zsolt
86+
common.HexToAddress("0xb86e2B0Ab5A4B1373e40c51A7C712c70Ba2f9f8E"), // Gary
87+
common.HexToAddress("0x0DF8fa387C602AE62559cC4aFa4972A7045d6707"), // Guillaume
88+
},
89+
Threshold: 2,
7490
}
7591

7692
// TestnetChainConfig contains the chain parameters to run a node on the Ropsten test network.
@@ -91,10 +107,23 @@ var (
91107

92108
// TestnetTrustedCheckpoint contains the light client trusted checkpoint for the Ropsten test network.
93109
TestnetTrustedCheckpoint = &TrustedCheckpoint{
94-
SectionIndex: 161,
95-
SectionHead: common.HexToHash("0x5378afa734e1feafb34bcca1534c4d96952b754579b96a4afb23d5301ecececc"),
96-
CHTRoot: common.HexToHash("0x1cf2b071e7443a62914362486b613ff30f60cea0d9c268ed8c545f876a3ee60c"),
97-
BloomRoot: common.HexToHash("0x5ac25c84bd18a9cbe878d4609a80220f57f85037a112644532412ba0d498a31b"),
110+
SectionIndex: 180,
111+
SectionHead: common.HexToHash("0xc5741683f9fcff7b670732deef2ebe6e7ff7a7bb29249401300b13b4eee690a6"),
112+
CHTRoot: common.HexToHash("0xf03ccebbf71a0998833afdf0e7c29095138c2df1cee6ed44ad9da62b5206b8ad"),
113+
BloomRoot: common.HexToHash("0xec46c48cf218891c91ad1139d3b3aec7cf385d4c1100c06711e56b83d8993b23"),
114+
}
115+
116+
// TestnetCheckpointOracle contains a set of configs for the Ropsten test network oracle.
117+
TestnetCheckpointOracle = &CheckpointOracleConfig{
118+
Address: common.HexToAddress("0xEF79475013f154E6A65b54cB2742867791bf0B84"),
119+
Signers: []common.Address{
120+
common.HexToAddress("0x32162F3581E88a5f62e8A61892B42C46E2c18f7b"), // Peter
121+
common.HexToAddress("0x78d1aD571A1A09D60D9BBf25894b44e4C8859595"), // Martin
122+
common.HexToAddress("0x286834935f4A8Cfb4FF4C77D5770C2775aE2b0E7"), // Zsolt
123+
common.HexToAddress("0xb86e2B0Ab5A4B1373e40c51A7C712c70Ba2f9f8E"), // Gary
124+
common.HexToAddress("0x0DF8fa387C602AE62559cC4aFa4972A7045d6707"), // Guillaume
125+
},
126+
Threshold: 2,
98127
}
99128

100129
// RinkebyChainConfig contains the chain parameters to run a node on the Rinkeby test network.
@@ -118,18 +147,18 @@ var (
118147

119148
// RinkebyTrustedCheckpoint contains the light client trusted checkpoint for the Rinkeby test network.
120149
RinkebyTrustedCheckpoint = &TrustedCheckpoint{
121-
SectionIndex: 125,
122-
SectionHead: common.HexToHash("0x8a738386f6bb34add15846f8f49c4c519a2f32519096e792b9f43bcb407c831c"),
123-
CHTRoot: common.HexToHash("0xa1e5720a9bad4dce794f129e4ac6744398197b652868011486a6f89c8ec84a75"),
124-
BloomRoot: common.HexToHash("0xa3048fe8b7e30f77f11bc755a88478363d7d3e71c2bdfe4e8ab9e269cd804ba2"),
150+
SectionIndex: 142,
151+
SectionHead: common.HexToHash("0xf7e3946d54c3040d391edd61a855fec7293f9d0b51445ede88562f2dc2edce3f"),
152+
CHTRoot: common.HexToHash("0xb2beee185e3ecada83eb69f72cbcca3e0978dbc8da5cdb3e34a71b3d597815d0"),
153+
BloomRoot: common.HexToHash("0x3970039fee31eb0542090030d1567cc99b8051572d51899db4d91619ca26f0cb"),
125154
}
126155

127156
// RinkebyCheckpointOracle contains a set of configs for the Rinkeby test network oracle.
128157
RinkebyCheckpointOracle = &CheckpointOracleConfig{
129158
Address: common.HexToAddress("0xebe8eFA441B9302A0d7eaECc277c09d20D684540"),
130159
Signers: []common.Address{
131160
common.HexToAddress("0xd9c9cd5f6779558b6e0ed4e6acf6b1947e7fa1f3"), // Peter
132-
common.HexToAddress("0x78d1ad571a1a09d60d9bbf25894b44e4c8859595"), // Martin
161+
common.HexToAddress("0x78d1aD571A1A09D60D9BBf25894b44e4C8859595"), // Martin
133162
common.HexToAddress("0x286834935f4A8Cfb4FF4C77D5770C2775aE2b0E7"), // Zsolt
134163
common.HexToAddress("0xb86e2B0Ab5A4B1373e40c51A7C712c70Ba2f9f8E"), // Gary
135164
},
@@ -156,10 +185,23 @@ var (
156185

157186
// GoerliTrustedCheckpoint contains the light client trusted checkpoint for the Görli test network.
158187
GoerliTrustedCheckpoint = &TrustedCheckpoint{
159-
SectionIndex: 9,
160-
SectionHead: common.HexToHash("0x8e223d827391eee53b07cb8ee057dbfa11c93e0b45352188c783affd7840a921"),
161-
CHTRoot: common.HexToHash("0xe0a817ac69b36c1e437c5b0cff9e764853f5115702b5f66d451b665d6afb7e78"),
162-
BloomRoot: common.HexToHash("0x50d672aeb655b723284969c7c1201fb6ca003c23ed144bcb9f2d1b30e2971c1b"),
188+
SectionIndex: 26,
189+
SectionHead: common.HexToHash("0xd0c206e064c8efea930d97e56786af95354ea481b35294a20e5a340937e4c2c9"),
190+
CHTRoot: common.HexToHash("0xce7235999aa8d73c4493b8f397474dafc627652a790dec60c4a968e2dfa5d7be"),
191+
BloomRoot: common.HexToHash("0xc1ac19553473ebb07325b5092a09277d62e9ffe159166a1c6fbec614c4dfd885"),
192+
}
193+
194+
// GoerliCheckpointOracle contains a set of configs for the Goerli test network oracle.
195+
GoerliCheckpointOracle = &CheckpointOracleConfig{
196+
Address: common.HexToAddress("0x18CA0E045F0D772a851BC7e48357Bcaab0a0795D"),
197+
Signers: []common.Address{
198+
common.HexToAddress("0x4769bcaD07e3b938B7f43EB7D278Bc7Cb9efFb38"), // Peter
199+
common.HexToAddress("0x78d1aD571A1A09D60D9BBf25894b44e4C8859595"), // Martin
200+
common.HexToAddress("0x286834935f4A8Cfb4FF4C77D5770C2775aE2b0E7"), // Zsolt
201+
common.HexToAddress("0xb86e2B0Ab5A4B1373e40c51A7C712c70Ba2f9f8E"), // Gary
202+
common.HexToAddress("0x0DF8fa387C602AE62559cC4aFa4972A7045d6707"), // Guillaume
203+
},
204+
Threshold: 2,
163205
}
164206

165207
// AllEthashProtocolChanges contains every protocol change (EIPs) introduced

0 commit comments

Comments
 (0)