Check availability of preverified.toml contents

cl/clparams/config.go

@@ -1056,19 +1056,19 @@ func GetConfigsByNetwork(net NetworkType) (*NetworkConfig, *BeaconChainConfig) {
 
 func GetConfigsByNetworkName(net string) (*NetworkConfig, *BeaconChainConfig, NetworkType, error) {
  switch net {
- case networkname.MainnetChainName:
+ case networkname.Mainnet:
  networkCfg, beaconCfg := GetConfigsByNetwork(MainnetNetwork)
  return networkCfg, beaconCfg, MainnetNetwork, nil
- case networkname.SepoliaChainName:
+ case networkname.Sepolia:
  networkCfg, beaconCfg := GetConfigsByNetwork(SepoliaNetwork)
  return networkCfg, beaconCfg, SepoliaNetwork, nil
- case networkname.GnosisChainName:
+ case networkname.Gnosis:
  networkCfg, beaconCfg := GetConfigsByNetwork(GnosisNetwork)
  return networkCfg, beaconCfg, GnosisNetwork, nil
- case networkname.ChiadoChainName:
+ case networkname.Chiado:
  networkCfg, beaconCfg := GetConfigsByNetwork(ChiadoNetwork)
  return networkCfg, beaconCfg, ChiadoNetwork, nil
- case networkname.HoleskyChainName:
+ case networkname.Holesky:
  networkCfg, beaconCfg := GetConfigsByNetwork(HoleskyNetwork)
  return networkCfg, beaconCfg, HoleskyNetwork, nil
  default:

cmd/devnet/args/node_args.go

@@ -167,15 +167,15 @@ func (m *BlockProducer) Configure(baseNode NodeArgs, nodeNumber int) error {
  }
 
  switch m.Chain {
- case networkname.DevChainName:
+ case networkname.Dev:
  if m.DevPeriod == 0 {
  m.DevPeriod = 30
  }
  m.account = accounts.NewAccount(m.GetName() + "-etherbase")
  core.DevnetEtherbase = m.account.Address
  core.DevnetSignPrivateKey = m.account.SigKey()
 
- case networkname.BorDevnetChainName:
+ case networkname.BorDevnet:
  m.account = accounts.NewAccount(m.GetName() + "-etherbase")
 
  if len(m.HttpApi) == 0 {

cmd/devnet/contracts/steps/l1l2transfers.go

@@ -52,7 +52,7 @@ func init() {
 
 func GenerateSyncEvents(ctx context.Context, senderName string, numberOfTransfers int, minTransfer int, maxTransfer int) error {
  sender := accounts.GetAccount(senderName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.DevChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.Dev)
 
  auth, err := contracts.TransactOpts(ctx, sender.Address)
 
@@ -170,7 +170,7 @@ func GenerateSyncEvents(ctx context.Context, senderName string, numberOfTransfer
 
 func DeployRootChainSender(ctx context.Context, deployerName string) (context.Context, error) {
  deployer := accounts.GetAccount(deployerName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.DevChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.Dev)
 
  auth, backend, err := contracts.DeploymentTransactor(ctx, deployer.Address)
 
@@ -197,15 +197,15 @@ func DeployRootChainSender(ctx context.Context, deployerName string) (context.Co
  return nil, err
  }
 
- devnet.Logger(ctx).Info("RootSender deployed", "chain", networkname.DevChainName, "block", block.Number, "addr", address)
+ devnet.Logger(ctx).Info("RootSender deployed", "chain", networkname.Dev, "block", block.Number, "addr", address)
 
  return scenarios.WithParam(ctx, "rootSenderAddress", address).
  WithParam("rootSender", contract), nil
 }
 
 func DeployChildChainReceiver(ctx context.Context, deployerName string) (context.Context, error) {
  deployer := accounts.GetAccount(deployerName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.BorDevnetChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.BorDevnet)
 
  waiter, cancel := blocks.BlockWaiter(ctx, contracts.DeploymentChecker)
  defer cancel()
@@ -222,15 +222,15 @@ func DeployChildChainReceiver(ctx context.Context, deployerName string) (context
  return nil, err
  }
 
- devnet.Logger(ctx).Info("ChildReceiver deployed", "chain", networkname.BorDevnetChainName, "block", block.Number, "addr", address)
+ devnet.Logger(ctx).Info("ChildReceiver deployed", "chain", networkname.BorDevnet, "block", block.Number, "addr", address)
 
  return scenarios.WithParam(ctx, "childReceiverAddress", address).
  WithParam("childReceiver", contract), nil
 }
 
 func ProcessRootTransfers(ctx context.Context, sourceName string, numberOfTransfers int, minTransfer int, maxTransfer int) error {
  source := accounts.GetAccount(sourceName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.DevChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.Dev)
 
  auth, err := contracts.TransactOpts(ctx, source.Address)
 
@@ -380,7 +380,7 @@ func ProcessRootTransfers(ctx context.Context, sourceName string, numberOfTransf
 
 func BatchProcessRootTransfers(ctx context.Context, sourceName string, batches int, transfersPerBatch, minTransfer int, maxTransfer int) error {
  source := accounts.GetAccount(sourceName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.DevChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.Dev)
 
  auth, err := contracts.TransactOpts(ctx, source.Address)
 

cmd/devnet/contracts/steps/l2l1transfers.go

@@ -47,7 +47,7 @@ func init() {
 
 func DeployChildChainSender(ctx context.Context, deployerName string) (context.Context, error) {
  deployer := accounts.GetAccount(deployerName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.BorDevnetChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.BorDevnet)
 
  auth, backend, err := contracts.DeploymentTransactor(ctx, deployer.Address)
 
@@ -72,15 +72,15 @@ func DeployChildChainSender(ctx context.Context, deployerName string) (context.C
  return nil, err
  }
 
- devnet.Logger(ctx).Info("ChildSender deployed", "chain", networkname.BorDevnetChainName, "block", block.Number, "addr", address)
+ devnet.Logger(ctx).Info("ChildSender deployed", "chain", networkname.BorDevnet, "block", block.Number, "addr", address)
 
  return scenarios.WithParam(ctx, "childSenderAddress", address).
  WithParam("childSender", contract), nil
 }
 
 func DeployRootChainReceiver(ctx context.Context, deployerName string) (context.Context, error) {
  deployer := accounts.GetAccount(deployerName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.DevChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.Dev)
 
  auth, backend, err := contracts.DeploymentTransactor(ctx, deployer.Address)
 
@@ -105,15 +105,15 @@ func DeployRootChainReceiver(ctx context.Context, deployerName string) (context.
  return nil, err
  }
 
- devnet.Logger(ctx).Info("RootReceiver deployed", "chain", networkname.BorDevnetChainName, "block", block.Number, "addr", address)
+ devnet.Logger(ctx).Info("RootReceiver deployed", "chain", networkname.BorDevnet, "block", block.Number, "addr", address)
 
  return scenarios.WithParam(ctx, "rootReceiverAddress", address).
  WithParam("rootReceiver", contract), nil
 }
 
 func ProcessChildTransfers(ctx context.Context, sourceName string, numberOfTransfers int, minTransfer int, maxTransfer int) error {
  source := accounts.GetAccount(sourceName)
- ctx = devnet.WithCurrentNetwork(ctx, networkname.DevChainName)
+ ctx = devnet.WithCurrentNetwork(ctx, networkname.Dev)
 
  auth, err := contracts.TransactOpts(ctx, source.Address)
 

cmd/devnet/devnet/node.go

@@ -176,7 +176,11 @@ func (n *devnetNode) run(ctx *cli.Context) error {
 
  logger.Info("Build info", "git_branch", params.GitBranch, "git_tag", params.GitTag, "git_commit", params.GitCommit)
 
- n.nodeCfg = enode.NewNodConfigUrfave(ctx, logger)
+ nodeConf, err := enode.NewNodConfigUrfave(ctx, logger)
+ if err != nil {
+ return err
+ }
+ n.nodeCfg = nodeConf
  n.ethCfg = enode.NewEthConfigUrfave(ctx, n.nodeCfg, logger)
 
  // These are set to prevent disk and page size churn which can be excessive

cmd/devnet/main.go

@@ -61,7 +61,7 @@ var (
  ChainFlag = cli.StringFlag{
  Name: "chain",
  Usage: "The devnet chain to run (dev,bor-devnet)",
- Value: networkname.DevChainName,
+ Value: networkname.Dev,
  }
 
  ScenariosFlag = cli.StringFlag{
@@ -332,8 +332,8 @@ func allScenarios(cliCtx *cli.Context, runCtx devnet.Context) scenarios.Scenario
  "state-sync": {
  Steps: []*scenarios.Step{
  {Text: "InitSubscriptions", Args: []any{[]requests.SubMethod{requests.Methods.ETHNewHeads}}},
- {Text: "CreateAccountWithFunds", Args: []any{networkname.DevChainName, "root-funder", 200.0}},
- {Text: "CreateAccountWithFunds", Args: []any{networkname.BorDevnetChainName, "child-funder", 200.0}},
+ {Text: "CreateAccountWithFunds", Args: []any{networkname.Dev, "root-funder", 200.0}},
+ {Text: "CreateAccountWithFunds", Args: []any{networkname.BorDevnet, "child-funder", 200.0}},
  {Text: "DeployChildChainReceiver", Args: []any{"child-funder"}},
  {Text: "DeployRootChainSender", Args: []any{"root-funder"}},
  {Text: "GenerateSyncEvents", Args: []any{"root-funder", 10, 2, 2}},
@@ -343,8 +343,8 @@ func allScenarios(cliCtx *cli.Context, runCtx devnet.Context) scenarios.Scenario
  },
  "child-chain-exit": {
  Steps: []*scenarios.Step{
- {Text: "CreateAccountWithFunds", Args: []any{networkname.DevChainName, "root-funder", 200.0}},
- {Text: "CreateAccountWithFunds", Args: []any{networkname.BorDevnetChainName, "child-funder", 200.0}},
+ {Text: "CreateAccountWithFunds", Args: []any{networkname.Dev, "root-funder", 200.0}},
+ {Text: "CreateAccountWithFunds", Args: []any{networkname.BorDevnet, "child-funder", 200.0}},
  {Text: "DeployRootChainReceiver", Args: []any{"root-funder"}},
  {Text: "DeployChildChainSender", Args: []any{"child-funder"}},
  {Text: "ProcessChildTransfers", Args: []any{"child-funder", 1, 2, 2}},
@@ -420,7 +420,7 @@ func initDevnet(ctx *cli.Context, logger log.Logger) (devnet.Devnet, error) {
  }
 
  switch chainName {
- case networkname.BorDevnetChainName:
+ case networkname.BorDevnet:
  if ctx.Bool(WithoutHeimdallFlag.Name) {
  return networks.NewBorDevnetWithoutHeimdall(dataDir, baseRpcHost, baseRpcPort, gasLimit, logger, consoleLogLevel, dirLogLevel), nil
  } else if ctx.Bool(LocalHeimdallFlag.Name) {
@@ -431,7 +431,7 @@ func initDevnet(ctx *cli.Context, logger log.Logger) (devnet.Devnet, error) {
  return networks.NewBorDevnetWithRemoteHeimdall(dataDir, baseRpcHost, baseRpcPort, producerCount, gasLimit, logger, consoleLogLevel, dirLogLevel), nil
  }
 
- case networkname.DevChainName:
+ case networkname.Dev:
  return networks.NewDevDevnet(dataDir, baseRpcHost, baseRpcPort, producerCount, gasLimit, logger, consoleLogLevel, dirLogLevel), nil
 
  default:

cmd/devnet/networks/devnet_bor.go

@@ -47,7 +47,7 @@ func NewBorDevnetWithoutHeimdall(
 
  network := devnet.Network{
  DataDir: dataDir,
- Chain: networkname.BorDevnetChainName,
+ Chain: networkname.BorDevnet,
  Logger: logger,
  BasePort: 40303,
  BasePrivateApiAddr: "localhost:10090",
@@ -61,7 +61,7 @@ func NewBorDevnetWithoutHeimdall(
  GasLimit: gasLimit,
  },
  Services: []devnet.Service{
- account_services.NewFaucet(networkname.BorDevnetChainName, faucetSource),
+ account_services.NewFaucet(networkname.BorDevnet, faucetSource),
  },
  Nodes: []devnet.Node{
  &args.BlockProducer{
@@ -125,15 +125,15 @@ func NewBorDevnetWithHeimdall(
 
  borNetwork := devnet.Network{
  DataDir: dataDir,
- Chain: networkname.BorDevnetChainName,
+ Chain: networkname.BorDevnet,
  Logger: logger,
  BasePort: 40303,
  BasePrivateApiAddr: "localhost:10090",
  BaseRPCHost: baseRpcHost,
  BaseRPCPort: baseRpcPort,
  BorStateSyncDelay: 5 * time.Second,
  BorWithMilestones: &withMilestones,
- Services: append(services, account_services.NewFaucet(networkname.BorDevnetChainName, faucetSource)),
+ Services: append(services, account_services.NewFaucet(networkname.BorDevnet, faucetSource)),
  Genesis: &types.Genesis{
  Alloc: types.GenesisAlloc{
  faucetSource.Address: {Balance: accounts.EtherAmount(200_000)},
@@ -152,13 +152,13 @@ func NewBorDevnetWithHeimdall(
 
  devNetwork := devnet.Network{
  DataDir: dataDir,
- Chain: networkname.DevChainName,
+ Chain: networkname.Dev,
  Logger: logger,
  BasePort: 30403,
  BasePrivateApiAddr: "localhost:10190",
  BaseRPCHost: baseRpcHost,
  BaseRPCPort: baseRpcPort + 1000,
- Services: append(services, account_services.NewFaucet(networkname.DevChainName, faucetSource)),
+ Services: append(services, account_services.NewFaucet(networkname.Dev, faucetSource)),
  Genesis: &types.Genesis{
  Alloc: types.GenesisAlloc{
  faucetSource.Address: {Balance: accounts.EtherAmount(200_000)},

cmd/devnet/networks/devnet_dev.go

@@ -58,7 +58,7 @@ func NewDevDevnet(
 
  network := devnet.Network{
  DataDir: dataDir,
- Chain: networkname.DevChainName,
+ Chain: networkname.Dev,
  Logger: logger,
  BasePrivateApiAddr: "localhost:10090",
  BaseRPCHost: baseRpcHost,
@@ -70,7 +70,7 @@ func NewDevDevnet(
  GasLimit: gasLimit,
  },
  Services: []devnet.Service{
- account_services.NewFaucet(networkname.DevChainName, faucetSource),
+ account_services.NewFaucet(networkname.Dev, faucetSource),
  },
  MaxNumberOfEmptyBlockChecks: 30,
  Nodes: append(nodes,

cmd/devnet/services/polygon/checkpoint.go

@@ -393,7 +393,7 @@ func (h *Heimdall) getRootHash(ctx context.Context, start uint64, end uint64) (l
  return libcommon.Hash{}, errors.New("number of headers requested exceeds")
  }
 
- return devnet.SelectBlockProducer(devnet.WithCurrentNetwork(ctx, networkname.BorDevnetChainName)).GetRootHash(ctx, start, end)
+ return devnet.SelectBlockProducer(devnet.WithCurrentNetwork(ctx, networkname.BorDevnet)).GetRootHash(ctx, start, end)
 }
 
 func (h *Heimdall) shouldSendCheckpoint(start uint64, end uint64) (bool, error) {

cmd/devnet/services/polygon/proofgenerator.go

@@ -117,7 +117,7 @@ func (pg *ProofGenerator) GenerateExitPayload(ctx context.Context, burnTxHash li
 }
 
 func (pg *ProofGenerator) getChainBlockInfo(ctx context.Context, burnTxHash libcommon.Hash) (uint64, uint64, error) {
- childNode := devnet.SelectBlockProducer(devnet.WithCurrentNetwork(ctx, networkname.BorDevnetChainName))
+ childNode := devnet.SelectBlockProducer(devnet.WithCurrentNetwork(ctx, networkname.BorDevnet))
 
  var wg sync.WaitGroup
 

cmd/devnet/tests/bor_devnet_test.go

@@ -34,19 +34,19 @@ import (
 func TestStateSync(t *testing.T) {
  t.Skip()
 
- runCtx, err := ContextStart(t, networkname.BorDevnetChainName)
+ runCtx, err := ContextStart(t, networkname.BorDevnet)
  require.Nil(t, err)
  var ctx context.Context = runCtx
 
  t.Run("InitSubscriptions", func(t *testing.T) {
  services.InitSubscriptions(ctx, []requests.SubMethod{requests.Methods.ETHNewHeads})
  })
  t.Run("CreateAccountWithFunds", func(t *testing.T) {
- _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.DevChainName, "root-funder", 200.0)
+ _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.Dev, "root-funder", 200.0)
  require.Nil(t, err)
  })
  t.Run("CreateAccountWithFunds", func(t *testing.T) {
- _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.BorDevnetChainName, "child-funder", 200.0)
+ _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.BorDevnet, "child-funder", 200.0)
  require.Nil(t, err)
  })
  t.Run("DeployChildChainReceiver", func(t *testing.T) {
@@ -73,16 +73,16 @@ func TestStateSync(t *testing.T) {
 func TestChildChainExit(t *testing.T) {
  t.Skip("FIXME: step CreateAccountWithFunds fails: Failed to get transfer tx: failed to search reserves for hashes: no block heads subscription")
 
- runCtx, err := ContextStart(t, networkname.BorDevnetChainName)
+ runCtx, err := ContextStart(t, networkname.BorDevnet)
  require.Nil(t, err)
  var ctx context.Context = runCtx
 
  t.Run("CreateAccountWithFunds", func(t *testing.T) {
- _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.DevChainName, "root-funder", 200.0)
+ _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.Dev, "root-funder", 200.0)
  require.Nil(t, err)
  })
  t.Run("CreateAccountWithFunds", func(t *testing.T) {
- _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.BorDevnetChainName, "child-funder", 200.0)
+ _, err := accounts_steps.CreateAccountWithFunds(ctx, networkname.BorDevnet, "child-funder", 200.0)
  require.Nil(t, err)
  })
  t.Run("DeployRootChainReceiver", func(t *testing.T) {

cmd/devnet/tests/context.go

@@ -38,18 +38,18 @@ func initDevnet(chainName string, dataDir string, producerCount int, gasLimit ui
  const baseRpcPort = 9545
 
  switch chainName {
- case networkname.BorDevnetChainName:
+ case networkname.BorDevnet:
  heimdallURL := polygon.HeimdallURLDefault
  const sprintSize uint64 = 0
  return networks.NewBorDevnetWithLocalHeimdall(dataDir, baseRpcHost, baseRpcPort, heimdallURL, sprintSize, producerCount, gasLimit, logger, consoleLogLevel, dirLogLevel), nil
 
- case networkname.DevChainName:
+ case networkname.Dev:
  return networks.NewDevDevnet(dataDir, baseRpcHost, baseRpcPort, producerCount, gasLimit, logger, consoleLogLevel, dirLogLevel), nil
 
  case "":
  envChainName, _ := os.LookupEnv("DEVNET_CHAIN")
  if envChainName == "" {
- envChainName = networkname.DevChainName
+ envChainName = networkname.Dev
  }
  return initDevnet(envChainName, dataDir, producerCount, gasLimit, logger, consoleLogLevel, dirLogLevel)
 

cmd/downloader/main.go

@@ -240,9 +240,12 @@ func Downloader(ctx context.Context, logger log.Logger) error {
  webseedsList = append(webseedsList, known...)
  }
  if seedbox {
- snapcfg.LoadRemotePreverified()
+ _, err = downloadercfg.LoadSnapshotsHashes(ctx, dirs, chain)
+ if err != nil {
+ return err
+ }
  }
- cfg, err := downloadercfg.New(dirs, version, torrentLogLevel, downloadRate, uploadRate, torrentPort, torrentConnsPerFile, torrentDownloadSlots, staticPeers, webseedsList, chain, true, dbWritemap)
+ cfg, err := downloadercfg.New(ctx, dirs, version, torrentLogLevel, downloadRate, uploadRate, torrentPort, torrentConnsPerFile, torrentDownloadSlots, staticPeers, webseedsList, chain, true, dbWritemap)
  if err != nil {
  return err
  }

cmd/erigon/main.go

@@ -85,7 +85,10 @@ func runErigon(cliCtx *cli.Context) error {
  erigonInfoGauge := metrics.GetOrCreateGauge(fmt.Sprintf(`erigon_info{version="%s",commit="%s"}`, params.Version, params.GitCommit))
  erigonInfoGauge.Set(1)
 
- nodeCfg := node.NewNodConfigUrfave(cliCtx, logger)
+ nodeCfg, err := node.NewNodConfigUrfave(cliCtx, logger)
+ if err != nil {
+ return err
+ }
  if err := datadir.ApplyMigrations(nodeCfg.Dirs); err != nil {
  return err
  }