Skip to content

Commit 6135535

Browse files
authored
Merge pull request #41 from node-real/fix-combo1
chore: remove duplicate configuration
2 parents e7aac03 + bfca348 commit 6135535

File tree

1 file changed

+0
-70
lines changed

1 file changed

+0
-70
lines changed

op-node/chaincfg/chains.go

Lines changed: 0 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -291,76 +291,6 @@ var ComboTestnet = rollup.Config{
291291
EcotoneTime: u64Ptr(1719210600), // June-24-2024 06:30 AM +UTC
292292
}
293293

294-
var ComboMainnet = rollup.Config{
295-
Genesis: rollup.Genesis{
296-
L1: eth.BlockID{
297-
Hash: common.HexToHash("0x7743484e78e047654f5a92c5d66a25828f1c259b2c9a780a39936c001fdcbcf7"),
298-
Number: 33768568,
299-
},
300-
L2: eth.BlockID{
301-
Hash: common.HexToHash("0x92fcf9e91a4cdd7ffc7e67207e77dfba049bacf1ede5c5917a40f9537e05f4bc"),
302-
Number: 0,
303-
},
304-
L2Time: 1700817067,
305-
SystemConfig: eth.SystemConfig{
306-
BatcherAddr: common.HexToAddress("0x6df30535bbe94a533d9f1600e69a642abb3e063f"),
307-
Overhead: eth.Bytes32(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000834")),
308-
Scalar: eth.Bytes32(common.HexToHash("0x00000000000000000000000000000000000000000000000000000000000f4240")),
309-
GasLimit: 100000000,
310-
},
311-
},
312-
BlockTime: 1,
313-
MaxSequencerDrift: 600,
314-
SeqWindowSize: 14400,
315-
ChannelTimeout: 1200,
316-
L1ChainID: big.NewInt(56),
317-
L2ChainID: big.NewInt(9980),
318-
BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000000009980"),
319-
DepositContractAddress: common.HexToAddress("0x419df125e0a712db4b10209ac3055b58b840f1f4"),
320-
L1SystemConfigAddress: common.HexToAddress("0x19d9791f6f5df45fb4ced2ea0904e48a6f9e545c"),
321-
RegolithTime: u64Ptr(0),
322-
Fermat: big.NewInt(0),
323-
SnowTime: u64Ptr(1719813600), // July-01-2024 06:00 AM +UTC
324-
CanyonTime: u64Ptr(1719814200), // July-01-2024 06:10 AM +UTC
325-
DeltaTime: u64Ptr(1719814800), // July-01-2024 06:20 AM +UTC
326-
EcotoneTime: u64Ptr(1719815400), // July-01-2024 06:30 AM +UTC
327-
}
328-
329-
var ComboTestnet = rollup.Config{
330-
Genesis: rollup.Genesis{
331-
L1: eth.BlockID{
332-
Hash: common.HexToHash("0x5c42e35d2cf086cdbf6ad194701a48688f3c1e8d2eecf57168a248e63a33be86"),
333-
Number: 39570635,
334-
},
335-
L2: eth.BlockID{
336-
Hash: common.HexToHash("0x51d565869cb1c6d7e577848ccd1f93918b99427c1cc3fed9dca628d0cffcefbb"),
337-
Number: 0,
338-
},
339-
L2Time: 1713424951,
340-
SystemConfig: eth.SystemConfig{
341-
BatcherAddr: common.HexToAddress("0x013fce36695321d32251e58bff33292c685da696"),
342-
Overhead: eth.Bytes32(common.HexToHash("0x0000000000000000000000000000000000000000000000000000000000000834")),
343-
Scalar: eth.Bytes32(common.HexToHash("0x00000000000000000000000000000000000000000000000000000000000f4240")),
344-
GasLimit: 100000000,
345-
},
346-
},
347-
BlockTime: 1,
348-
MaxSequencerDrift: 600,
349-
SeqWindowSize: 14400,
350-
ChannelTimeout: 1200,
351-
L1ChainID: big.NewInt(97),
352-
L2ChainID: big.NewInt(1715),
353-
BatchInboxAddress: common.HexToAddress("0xff00000000000000000000000000000000001715"),
354-
DepositContractAddress: common.HexToAddress("0x6357aeea63f9bea16a9264fad26fdfddbec559e6"),
355-
L1SystemConfigAddress: common.HexToAddress("0x3a472819b60885f1f11ee173f56e43961460c391"),
356-
RegolithTime: u64Ptr(0),
357-
Fermat: big.NewInt(0),
358-
SnowTime: u64Ptr(1719208800), // June-24-2024 06:00 AM +UTC
359-
CanyonTime: u64Ptr(1719209400), // June-24-2024 06:10 AM +UTC
360-
DeltaTime: u64Ptr(1719210000), // June-24-2024 06:20 AM +UTC
361-
EcotoneTime: u64Ptr(1719210600), // June-24-2024 06:30 AM +UTC
362-
}
363-
364294
func u64Ptr(v uint64) *uint64 {
365295
return &v
366296
}

0 commit comments

Comments
 (0)