Resolve all conflicts under cmd/

testinprod-io · Aug 5, 2024 · 527a3d8 · 527a3d8
1 parent f731d1b
commit 527a3d8
Show file tree

Hide file tree

Showing 17 changed files with 5 additions and 224 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <http://www.gnu.org/licenses/>.
 
->>>>>>> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 {