Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Thegaram
Thegaram committed Oct 5, 2023
1 parent 8d49a74 commit d02331f
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions cmd/utils/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1789,14 +1789,14 @@ func SetEthConfig(ctx *cli.Context, stack *node.Node, cfg *ethconfig.Config) {
cfg.NoPrefetch = true
case ctx.GlobalBool(ScrollFlag.Name):
if !ctx.GlobalIsSet(NetworkIdFlag.Name) {
cfg.NetworkId = 53435222222 // TODO
cfg.NetworkId = 53435222223 // TODO
}
cfg.Genesis = core.DefaultScrollMainnetGenesisBlock()
// forced for mainnet
log.Info("Setting flag", "--l1.confirmations", "finalized")
stack.Config().L1Confirmations = rpc.FinalizedBlockNumber
log.Info("Setting flag", "--l1.sync.startblock", "18221690")
stack.Config().L1DeploymentBlock = 18221690 // TODO
log.Info("Setting flag", "--l1.sync.startblock", "18286420")
stack.Config().L1DeploymentBlock = 18286420 // TODO
// disable pruning
if ctx.GlobalString(GCModeFlag.Name) != GCModeArchive {
log.Crit("Must use --gcmode=archive")
Expand Down
6 changes: 3 additions & 3 deletions core/genesis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -464,9 +464,9 @@ func DefaultScrollSepoliaGenesisBlock() *Genesis {
func DefaultScrollMainnetGenesisBlock() *Genesis {
return &Genesis{
Config: params.ScrollMainnetChainConfig,
Timestamp: 0x6513fa42,
ExtraData: hexutil.MustDecode("0x000000000000000000000000000000000000000000000000000000000000000069b800387f915A5fc6397f4C0e679F11360cFb880000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"), // TODO
GasLimit: 8000000, // TODO
Timestamp: 0x651fb778,
ExtraData: hexutil.MustDecode("0x48656c6c6f2c20776f726c64210000000000000000000000000000000000000015f197050e7A1681C70078fa4FAaB1683E54316E0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"), // TODO
GasLimit: 10000000, // TODO
Difficulty: big.NewInt(1),
Alloc: decodePrealloc(scrollMainnetAllocData), // TODO
}
Expand Down
2 changes: 1 addition & 1 deletion core/genesis_alloc.go
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions params/bootnodes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,11 +93,11 @@ var ScrollSepoliaBootnodes = []string{
// ScrollMainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on the Scroll mainnet.
// TODO
var ScrollMainnetBootnodes = []string{
"enode://0266832ec9bf7d99ad14021733dbe1605f5a9fba4120c9134a4352ee8771acfe6f70b4d45db5d0b10f893512f649a4572a190e8593acac9f9746dd87261b29ea@54.186.123.248:30303",
"enode://12530ec316670bb96f31b90edb31aa8318ed7811d9b4d980ecd5a7b24d55df93e363da6bc2c455c2947641b95e1b6e26225f833cfa598eda620017821b75ffcb@44.227.91.206:30303",
"enode://7a836c8f6cdec771f7bbed49781c625b6dea86502e6e8194f24912e529b61cea8fad759a3592f2a4449adda35430931643da6388697d89953158359e4559735c@44.237.194.52:30303",
"enode://47854542163cabf6fdc86eb063306e43b57be4e368329613933875bba519da6bae6f5180cc8825ba2e04ba839703035c555e70f90c9e17135203a5b24000e2ea@52.35.203.107:30303",
"enode://a4c51001f947606510f18c73937780b1276131009839f03702fe0b2b78ec2fb210f6eee6b3818c1dcafc87ea4630f9364d767f4e7a93e5ffba345b9763491d9d@54.70.236.187:30303",
"enode://da61edc50894f5d387d8d518eaf404c88f7f312e471ac26943fca57ad5d57efe0ede3556b1b2645994f0f3d47ca0db5f6cbe86dfd0021882fb8b6e2fcd96225c@54.186.123.248:30303",
"enode://86967098134a1a425dee28b736852a982f109a53b46f34299ac53f650bf7994731f0e1826a951db4465deccb645d8617f57dd0aba16210a57a42672db977fc6e@44.227.91.206:30303",
"enode://399ea5e73688817aedb8bcedcc69a7743fbf85e4469bb89a1fa575c096c4b10140817f4188a745fd0f2e2ef2c7924e2376a41cffa8c116b34412ec8a5faabd7f@44.237.194.52:30303",
"enode://5e841e359d5bdab833c2e2de1140d6784c2b4dbb808c9d3d9121de927cb0c2188fef2165db6c16635cd0fc42f77cc6631e3c0d678ed4ca7de2d60f2d2f7299de@52.35.203.107:30303",
"enode://53f5d73d3521d28f43e0651ffa3e0750a67211bd4fc41a86d65e24098b2079966107f1d0c6ef9e291e34c5b677566bd6b1ff09dfccc0fb566f26c59743204c96@54.70.236.187:30303",
}

var V5Bootnodes = []string{
Expand Down
6 changes: 3 additions & 3 deletions params/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var (
GoerliGenesisHash = common.HexToHash("0xbf7e331f7f7c1dd2e05159666b3bf8bc7a8a3a9eb1d518969eab529dd9b88c1a")
ScrollAlphaGenesisHash = common.HexToHash("0xa4fc62b9b0643e345bdcebe457b3ae898bef59c7203c3db269200055e037afda")
ScrollSepoliaGenesisHash = common.HexToHash("0xaa62d1a8b2bffa9e5d2368b63aae0d98d54928bd713125e3fd9e5c896c68592c")
ScrollMainnetGenesisHash = common.HexToHash("0x6fe824d0b25fbd1e81414e085779491a13a9dfdf919506dec52ae444e5eb4ed9") // TODO
ScrollMainnetGenesisHash = common.HexToHash("0xe90bbeffeec4575e7f31a58bc37d6304ef4e8f45dc22a897609dd0563114b90c") // TODO
)

// TrustedCheckpoints associates each known checkpoint with the genesis hash of
Expand Down Expand Up @@ -337,7 +337,7 @@ var (

// TODO update
ScrollMainnetChainConfig = &ChainConfig{
ChainID: big.NewInt(53435222222), // TODO
ChainID: big.NewInt(53435222223), // TODO
HomesteadBlock: big.NewInt(0),
DAOForkBlock: nil,
DAOForkSupport: true,
Expand Down Expand Up @@ -367,7 +367,7 @@ var (
EnableEIP1559: false,
L1Config: &L1Config{
L1ChainId: 1,
L1MessageQueueAddress: common.HexToAddress("0x10c250C5357a84e42DB8F36F6242D49c8f01bd53"), // TODO
L1MessageQueueAddress: common.HexToAddress("0x82d6132dcCb0d92D883e36F02c190F7F0a0b6075"), // TODO
NumL1MessagesPerBlock: 10,
},
},
Expand Down

0 comments on commit d02331f

Please sign in to comment.