Commit 66ec96b0 authored by zhiqiangxu's avatar zhiqiangxu Committed by GitHub

only FundDevAccounts when DeployConfig.FundDevAccounts is true (#10432)

parent 101ad1a0
...@@ -57,7 +57,9 @@ func BuildL1DeveloperGenesis(config *DeployConfig, dump *ForgeAllocs, l1Deployme ...@@ -57,7 +57,9 @@ func BuildL1DeveloperGenesis(config *DeployConfig, dump *ForgeAllocs, l1Deployme
} }
// copy, for safety when the dump is reused (like in e2e testing) // copy, for safety when the dump is reused (like in e2e testing)
genesis.Alloc = dump.Copy().Accounts genesis.Alloc = dump.Copy().Accounts
FundDevAccounts(genesis) if config.FundDevAccounts {
FundDevAccounts(genesis)
}
SetPrecompileBalances(genesis) SetPrecompileBalances(genesis)
l1Deployments.ForEach(func(name string, addr common.Address) { l1Deployments.ForEach(func(name string, addr common.Address) {
......
...@@ -125,7 +125,7 @@ func Setup(t require.TestingT, deployParams *DeployParams, alloc *AllocParams) * ...@@ -125,7 +125,7 @@ func Setup(t require.TestingT, deployParams *DeployParams, alloc *AllocParams) *
var allocsMode genesis.L2AllocsMode var allocsMode genesis.L2AllocsMode
allocsMode = genesis.L2AllocsDelta allocsMode = genesis.L2AllocsDelta
if ecotoneTime := deployConf.EcotoneTime(l1Block.Time()); ecotoneTime != nil && *ecotoneTime <= 0 { if ecotoneTime := deployConf.EcotoneTime(l1Block.Time()); ecotoneTime != nil && *ecotoneTime == 0 {
allocsMode = genesis.L2AllocsEcotone allocsMode = genesis.L2AllocsEcotone
} }
l2Allocs := config.L2Allocs(allocsMode) l2Allocs := config.L2Allocs(allocsMode)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment