diff --git a/cmd/devnet/main.go b/cmd/devnet/main.go index e57c4e8967f..453ac9115f6 100644 --- a/cmd/devnet/main.go +++ b/cmd/devnet/main.go @@ -29,28 +29,6 @@ import ( "github.com/urfave/cli/v2" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - _ "github.com/ledgerwatch/erigon/cmd/devnet/accounts/steps" - _ "github.com/ledgerwatch/erigon/cmd/devnet/admin" - _ "github.com/ledgerwatch/erigon/cmd/devnet/contracts/steps" - "github.com/ledgerwatch/erigon/cmd/utils" - - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" - "github.com/ledgerwatch/erigon/cmd/devnet/networks" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" - "github.com/ledgerwatch/erigon/cmd/devnet/services" - "github.com/ledgerwatch/erigon/cmd/devnet/services/polygon" - "github.com/ledgerwatch/erigon/cmd/utils/flags" - "github.com/ledgerwatch/erigon/params" - erigon_app "github.com/ledgerwatch/erigon/turbo/app" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" -======= "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/erigon-lib/chain/networkname" @@ -71,7 +49,6 @@ import ( erigon_app "github.com/erigontech/erigon/turbo/app" "github.com/erigontech/erigon/turbo/debug" "github.com/erigontech/erigon/turbo/logging" ->>>>>>> v3.0.0-alpha1 ) var ( diff --git a/cmd/devnet/services/polygon/proofgenerator_test.go b/cmd/devnet/services/polygon/proofgenerator_test.go index 8df6ff5dc10..0b93bc392f4 100644 --- a/cmd/devnet/services/polygon/proofgenerator_test.go +++ b/cmd/devnet/services/polygon/proofgenerator_test.go @@ -121,15 +121,9 @@ func (rg *requestGenerator) GetBlockByNumber(ctx context.Context, blockNum rpc.B transactions := make([]*jsonrpc.RPCTransaction, len(block.Transactions())) -<<<<<<< HEAD - for i, tx := range block.Transactions() { - rg.txBlockMap[tx.Hash()] = block - transactions[i] = jsonrpc.NewRPCTransaction(tx, block.Hash(), blockNum.Uint64(), uint64(i), block.BaseFee(), nil) -======= for i, txn := range block.Transactions() { rg.txBlockMap[txn.Hash()] = block - transactions[i] = jsonrpc.NewRPCTransaction(txn, block.Hash(), blockNum.Uint64(), uint64(i), block.BaseFee()) ->>>>>>> v3.0.0-alpha1 + transactions[i] = jsonrpc.NewRPCTransaction(txn, block.Hash(), blockNum.Uint64(), uint64(i), block.BaseFee(), nil) } return &requests.Block{ diff --git a/cmd/diag/db/db.go b/cmd/diag/db/db.go index 2c94c8eae13..6962ab64247 100644 --- a/cmd/diag/db/db.go +++ b/cmd/diag/db/db.go @@ -22,12 +22,6 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/ledgerwatch/erigon/cmd/diag/util" -======= ->>>>>>> v3.0.0-alpha1 "github.com/urfave/cli/v2" "github.com/erigontech/erigon-lib/common" diff --git a/cmd/diag/downloader/diag_downloader.go b/cmd/diag/downloader/diag_downloader.go index 8571d0172ef..8158877d067 100644 --- a/cmd/diag/downloader/diag_downloader.go +++ b/cmd/diag/downloader/diag_downloader.go @@ -22,13 +22,6 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/ledgerwatch/erigon/cmd/diag/util" -======= ->>>>>>> v3.0.0-alpha1 "github.com/urfave/cli/v2" "github.com/erigontech/erigon-lib/common" diff --git a/cmd/diag/main.go b/cmd/diag/main.go index 54fc9bdb3aa..fab1ad3e178 100644 --- a/cmd/diag/main.go +++ b/cmd/diag/main.go @@ -26,17 +26,6 @@ import ( "github.com/urfave/cli/v2" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon/cmd/diag/db" - "github.com/ledgerwatch/erigon/cmd/diag/downloader" - "github.com/ledgerwatch/erigon/cmd/diag/stages" - "github.com/ledgerwatch/erigon/cmd/diag/ui" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/logging" - "github.com/ledgerwatch/log/v3" -======= "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/erigon/cmd/diag/db" @@ -47,7 +36,6 @@ import ( "github.com/erigontech/erigon/cmd/utils" "github.com/erigontech/erigon/params" "github.com/erigontech/erigon/turbo/logging" ->>>>>>> v3.0.0-alpha1 ) func main() { diff --git a/cmd/diag/readme.md b/cmd/diag/readme.md index ceaa956071e..34f5bba8bda 100644 --- a/cmd/diag/readme.md +++ b/cmd/diag/readme.md @@ -7,11 +7,7 @@ Diagnostics command is implemented to retrieve information from the Erigon node ### Diagnostics command local connection diagram ![overview](./_images/local_connection.png) -<<<<<<< HEAD -[Compare with remote connection](https://github.com/ledgerwatch/diagnostics?tab=readme-ov-file#diagnostics-architecture-diagram) -======= [Compare with remote connection](https://github.com/erigontech/diagnostics?tab=readme-ov-file#diagnostics-architecture-diagram) ->>>>>>> v3.0.0-alpha1 ## Available commands | | | @@ -97,8 +93,4 @@ Serve diagnostics ui locally |ui.addr|`127.0.0.1:6060`|string|URL to serve UI web application.| |||| -<<<<<<< HEAD -After running this command, it enables you to navigate through all available diagnostics data using a web application. You can see what is currently [available](https://github.com/ledgerwatch/diagnostics?tab=readme-ov-file#currently-implemented-diagnostics). This command allows you to skip the session setup to connect to your node as it automatically connects to a running node. -======= After running this command, it enables you to navigate through all available diagnostics data using a web application. You can see what is currently [available](https://github.com/erigontech/diagnostics?tab=readme-ov-file#currently-implemented-diagnostics). This command allows you to skip the session setup to connect to your node as it automatically connects to a running node. ->>>>>>> v3.0.0-alpha1 diff --git a/cmd/diag/stages/stages.go b/cmd/diag/stages/stages.go index 6ea13673a3f..dccb4377b1f 100644 --- a/cmd/diag/stages/stages.go +++ b/cmd/diag/stages/stages.go @@ -17,21 +17,12 @@ package stages import ( -<<<<<<< HEAD -======= "strconv" "strings" ->>>>>>> v3.0.0-alpha1 "sync" "time" "github.com/jedib0t/go-pretty/v6/table" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/ledgerwatch/erigon/cmd/diag/util" -======= ->>>>>>> v3.0.0-alpha1 "github.com/urfave/cli/v2" "github.com/erigontech/erigon-lib/diagnostics" @@ -219,8 +210,6 @@ func createStageRowFromStage(stage diagnostics.SyncStage) table.Row { } func createSubStageRowFromSubstageStage(substage diagnostics.SyncSubStage) table.Row { -<<<<<<< HEAD -======= progress := substage.Stats.Progress if substage.State == diagnostics.Completed { @@ -236,17 +225,11 @@ func createSubStageRowFromSubstageStage(substage diagnostics.SyncSubStage) table } } ->>>>>>> v3.0.0-alpha1 return table.Row{ "", substage.ID, substage.State.String(), substage.Stats.TimeElapsed, -<<<<<<< HEAD - substage.Stats.Progress, - } -} -======= progress, } } @@ -256,4 +239,3 @@ func convertProgress(progress string) int { progressInt, _ := strconv.Atoi(progress) return progressInt } ->>>>>>> v3.0.0-alpha1 diff --git a/cmd/diag/ui/ui.go b/cmd/diag/ui/ui.go index 8df7ff3f6c9..e8c7532f781 100644 --- a/cmd/diag/ui/ui.go +++ b/cmd/diag/ui/ui.go @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= // Copyright 2024 The Erigon Authors // This file is part of Erigon. // @@ -16,7 +14,6 @@ // You should have received a copy of the GNU Lesser General Public License // along with Erigon. If not, see . ->>>>>>> v3.0.0-alpha1 package ui import ( @@ -27,25 +24,15 @@ import ( "sync" "time" -<<<<<<< HEAD - "github.com/ledgerwatch/erigonwatch" - -======= ->>>>>>> v3.0.0-alpha1 "github.com/go-chi/chi/v5" "github.com/go-chi/chi/v5/middleware" "github.com/go-chi/cors" "github.com/jedib0t/go-pretty/v6/text" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/urfave/cli/v2" -======= "github.com/urfave/cli/v2" "github.com/erigontech/erigonwatch" "github.com/erigontech/erigon/cmd/diag/flags" ->>>>>>> v3.0.0-alpha1 ) var ( diff --git a/cmd/downloader/main.go b/cmd/downloader/main.go index 25d664d5634..2dcacd61cf0 100644 --- a/cmd/downloader/main.go +++ b/cmd/downloader/main.go @@ -29,34 +29,14 @@ import ( "strings" "time" -<<<<<<< HEAD - _ "github.com/ledgerwatch/erigon/core/snaptype" //hack - _ "github.com/ledgerwatch/erigon/polygon/bor/snaptype" //hack -======= "github.com/erigontech/erigon-lib/common/dbg" _ "github.com/erigontech/erigon/core/snaptype" //hack _ "github.com/erigontech/erigon/polygon/bor/snaptype" //hack ->>>>>>> v3.0.0-alpha1 "github.com/anacrolix/torrent/metainfo" "github.com/c2h5oh/datasize" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/log/v3" -======= ->>>>>>> v3.0.0-alpha1 "github.com/pelletier/go-toml/v2" "github.com/spf13/cobra" "google.golang.org/grpc" diff --git a/cmd/integration/commands/stages.go b/cmd/integration/commands/stages.go index 7e3c3f74d15..df493a806c7 100644 --- a/cmd/integration/commands/stages.go +++ b/cmd/integration/commands/stages.go @@ -1490,11 +1490,6 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig, stagedsync.MiningStages(ctx, stagedsync.StageMiningCreateBlockCfg(db, miner, *chainConfig, engine, nil, nil, dirs.Tmp, blockReader), stagedsync.StageBorHeimdallCfg(db, snapDb, miner, *chainConfig, heimdallClient, blockReader, nil, nil, nil, recents, signatures, false, unwindTypes), -<<<<<<< HEAD - stagedsync.StageMiningExecCfg(db, miner, events, *chainConfig, engine, &vm.Config{}, dirs.Tmp, nil, 0, nil, nil, false, blockReader), - stagedsync.StageHashStateCfg(db, dirs, historyV3), - stagedsync.StageTrieCfg(db, false, true, false, dirs.Tmp, blockReader, nil, historyV3, agg), -======= stagedsync.StageExecuteBlocksCfg( db, cfg.Prune, @@ -1514,8 +1509,7 @@ func newSync(ctx context.Context, db kv.RwDB, miningConfig *params.MiningConfig, nil, ), stagedsync.StageSendersCfg(db, sentryControlServer.ChainConfig, cfg.Sync, false, dirs.Tmp, cfg.Prune, blockReader, sentryControlServer.Hd, nil), - stagedsync.StageMiningExecCfg(db, miner, events, *chainConfig, engine, &vm.Config{}, dirs.Tmp, nil, 0, nil, nil, blockReader), ->>>>>>> v3.0.0-alpha1 + stagedsync.StageMiningExecCfg(db, miner, events, *chainConfig, engine, &vm.Config{}, dirs.Tmp, nil, 0, nil, nil, false, blockReader), stagedsync.StageMiningFinishCfg(db, *chainConfig, engine, miner, miningCancel, blockReader, builder.NewLatestBlockBuiltStore()), ), stagedsync.MiningUnwindOrder, diff --git a/cmd/integration/main.go b/cmd/integration/main.go index d7b9ad6f0a9..ec0156e072e 100644 --- a/cmd/integration/main.go +++ b/cmd/integration/main.go @@ -20,19 +20,11 @@ import ( "fmt" "os" -<<<<<<< HEAD - _ "github.com/ledgerwatch/erigon/core/snaptype" //hack - _ "github.com/ledgerwatch/erigon/polygon/bor/snaptype" //hack - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/integration/commands" -======= _ "github.com/erigontech/erigon/core/snaptype" //hack _ "github.com/erigontech/erigon/polygon/bor/snaptype" //hack "github.com/erigontech/erigon-lib/common" "github.com/erigontech/erigon/cmd/integration/commands" ->>>>>>> v3.0.0-alpha1 ) func main() { diff --git a/cmd/rpcdaemon/main.go b/cmd/rpcdaemon/main.go index dcbdb7df6ae..65e601d3b53 100644 --- a/cmd/rpcdaemon/main.go +++ b/cmd/rpcdaemon/main.go @@ -30,13 +30,8 @@ import ( "github.com/erigontech/erigon/turbo/jsonrpc" "github.com/spf13/cobra" -<<<<<<< HEAD - _ "github.com/ledgerwatch/erigon/core/snaptype" //hack - _ "github.com/ledgerwatch/erigon/polygon/bor/snaptype" //hack -======= _ "github.com/erigontech/erigon/core/snaptype" //hack _ "github.com/erigontech/erigon/polygon/bor/snaptype" //hack ->>>>>>> v3.0.0-alpha1 ) func main() { @@ -55,7 +50,6 @@ func main() { defer db.Close() defer engine.Close() -<<<<<<< HEAD var seqRPCService *rpc.Client var historicalRPCService *rpc.Client @@ -81,11 +75,7 @@ func main() { historicalRPCService = client } - // TODO: Replace with correct consensus Engine - apiList := jsonrpc.APIList(db, backend, txPool, mining, ff, stateCache, blockReader, agg, cfg, engine, seqRPCService, historicalRPCService, logger) -======= - apiList := jsonrpc.APIList(db, backend, txPool, mining, ff, stateCache, blockReader, cfg, engine, logger) ->>>>>>> v3.0.0-alpha1 + apiList := jsonrpc.APIList(db, backend, txPool, mining, ff, stateCache, blockReader, cfg, engine, seqRPCService, historicalRPCService, logger) rpc.PreAllocateRPCMetricLabels(apiList) if err := cli.StartRpcServer(ctx, cfg, apiList, logger); err != nil { logger.Error(err.Error()) diff --git a/cmd/snapshots/manifest/manifest.go b/cmd/snapshots/manifest/manifest.go index f6a432eb472..2e84d0c892d 100644 --- a/cmd/snapshots/manifest/manifest.go +++ b/cmd/snapshots/manifest/manifest.go @@ -30,19 +30,11 @@ import ( "github.com/urfave/cli/v2" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/turbo/logging" -======= "github.com/erigontech/erigon-lib/downloader" "github.com/erigontech/erigon-lib/downloader/snaptype" "github.com/erigontech/erigon/cmd/snapshots/sync" "github.com/erigontech/erigon/cmd/utils" "github.com/erigontech/erigon/turbo/logging" ->>>>>>> v3.0.0-alpha1 ) var ( diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index ed6339f7ebc..266a414a07e 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -24,19 +24,6 @@ import ( "github.com/erigontech/erigon-lib/log/v3" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon/cmd/state/exec22" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/log/v3" -======= "github.com/erigontech/erigon-lib/common/datadir" "github.com/erigontech/erigon/eth/consensuschain" @@ -52,7 +39,6 @@ import ( "github.com/erigontech/erigon/core/vm/evmtypes" "github.com/erigontech/erigon/turbo/services" "github.com/erigontech/erigon/turbo/shards" ->>>>>>> v3.0.0-alpha1 ) type Worker struct { diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go index 15b5f16311e..85dd09250b4 100644 --- a/cmd/state/exec3/state_recon.go +++ b/cmd/state/exec3/state_recon.go @@ -23,19 +23,9 @@ import ( "sync" "github.com/RoaringBitmap/roaring/roaring64" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/log/v3" -======= "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/erigon/eth/consensuschain" ->>>>>>> v3.0.0-alpha1 "github.com/erigontech/erigon-lib/chain" libcommon "github.com/erigontech/erigon-lib/common" diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index bedfb4a1d5d..34710114f5e 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -41,28 +41,6 @@ import ( "github.com/erigontech/erigon-lib/log/v3" -<<<<<<< HEAD - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cmd/downloader/downloadernat" - "github.com/ledgerwatch/erigon/cmd/utils/flags" - common2 "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/p2p/netutil" - "github.com/ledgerwatch/erigon/params" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/logging" -======= "github.com/erigontech/erigon-lib/chain/networkname" "github.com/erigontech/erigon-lib/chain/snapcfg" libcommon "github.com/erigontech/erigon-lib/common" @@ -92,7 +70,6 @@ import ( borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" "github.com/erigontech/erigon/rpc/rpccfg" "github.com/erigontech/erigon/turbo/logging" ->>>>>>> v3.0.0-alpha1 ) // These are all the command line flags we support. @@ -1889,14 +1866,12 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C cfg.NetworkID = params.NetworkIDByChainName(chain) } -<<<<<<< HEAD + // FIXME: V3_MERGE cfg.Sync.UseSnapshots = ethconfig.UseSnapshotsByChainName(GetChainNameFromFlag(ctx)) if ctx.IsSet(SnapshotFlag.Name) { //force override default by cli cfg.Sync.UseSnapshots = ctx.Bool(SnapshotFlag.Name) } -======= ->>>>>>> v3.0.0-alpha1 cfg.Dirs = nodeConfig.Dirs cfg.Snapshot.KeepBlocks = ctx.Bool(SnapKeepBlocksFlag.Name) cfg.Snapshot.ProduceE2 = !ctx.Bool(SnapStopFlag.Name) @@ -1924,16 +1899,11 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C if known, ok := snapcfg.KnownWebseeds[chain]; ok { webseedsList = append(webseedsList, known...) } -<<<<<<< HEAD - cfg.Downloader, err = downloadercfg2.New(cfg.Dirs, version, lvl, downloadRate, uploadRate, ctx.Int(TorrentPortFlag.Name), ctx.Int(TorrentConnsPerFileFlag.Name), ctx.Int(TorrentDownloadSlotsFlag.Name), libcommon.CliString2Array(ctx.String(TorrentStaticPeersFlag.Name)), webseedsList, chain, true) - -======= cfg.Downloader, err = downloadercfg2.New(cfg.Dirs, version, lvl, downloadRate, uploadRate, ctx.Int(TorrentPortFlag.Name), ctx.Int(TorrentConnsPerFileFlag.Name), ctx.Int(TorrentDownloadSlotsFlag.Name), libcommon.CliString2Array(ctx.String(TorrentStaticPeersFlag.Name)), webseedsList, chain, true, ctx.Bool(DbWriteMapFlag.Name), ) ->>>>>>> v3.0.0-alpha1 if err != nil { panic(err) } @@ -2044,7 +2014,7 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C cfg.OverridePragueTime = flags.GlobalBig(ctx, OverridePragueFlag.Name) cfg.TxPool.OverridePragueTime = cfg.OverridePragueTime } -<<<<<<< HEAD + if ctx.IsSet(OverrideShanghaiTime.Name) { cfg.OverrideShanghaiTime = flags.GlobalBig(ctx, OverrideShanghaiTime.Name) cfg.TxPool.OverrideShanghaiTime = cfg.OverrideShanghaiTime @@ -2080,13 +2050,9 @@ func SetEthConfig(ctx *cli.Context, nodeConfig *nodecfg.Config, cfg *ethconfig.C if ctx.IsSet(OverrideOptimismFjordFlag.Name) { cfg.OverrideOptimismFjordTime = flags.GlobalBig(ctx, OverrideOptimismFjordFlag.Name) } - if ctx.IsSet(InternalConsensusFlag.Name) && clparams.EmbeddedSupported(cfg.NetworkID) { - cfg.InternalCL = ctx.Bool(InternalConsensusFlag.Name) -======= if clparams.EmbeddedSupported(cfg.NetworkID) { cfg.InternalCL = !ctx.Bool(ExternalConsensusFlag.Name) ->>>>>>> v3.0.0-alpha1 } if ctx.IsSet(TrustedSetupFile.Name) { diff --git a/merge_status.txt b/merge_status.txt index 65e7ef387ac..dc1f35fc378 100644 --- a/merge_status.txt +++ b/merge_status.txt @@ -2293,22 +2293,6 @@ Unmerged paths: both modified: Makefile both modified: accounts/abi/bind/backends/simulated.go both modified: accounts/abi/bind/template.go - both modified: cmd/devnet/main.go - both modified: cmd/devnet/services/polygon/proofgenerator_test.go - both modified: cmd/diag/db/db.go - both modified: cmd/diag/downloader/diag_downloader.go - both modified: cmd/diag/main.go - both added: cmd/diag/readme.md - both modified: cmd/diag/stages/stages.go - both added: cmd/diag/ui/ui.go - both modified: cmd/downloader/main.go - both modified: cmd/integration/commands/stages.go - both modified: cmd/integration/main.go - both modified: cmd/rpcdaemon/main.go - both modified: cmd/snapshots/manifest/manifest.go - both modified: cmd/state/exec3/state.go - both modified: cmd/state/exec3/state_recon.go - both modified: cmd/utils/flags.go both modified: core/genesis_write.go both modified: core/rawdb/accessors_chain.go both modified: core/rawdb/accessors_metadata.go