Branch renaming (erigontech#10152)

Changes resulting from the renaming of `devel` to `release/2.60` and of
`e35` to `main`.

.github/CONTRIBUTING.md

@@ -21,7 +21,7 @@ Please make sure your contributions adhere to our coding guidelines:
 (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)).
  * Code must be documented adhering to the official Go 
 [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines.
- * Pull requests need to be based on and opened against the `devel` branch.
+ * Pull requests need to be based on and opened against the `main` branch.
  * Commit messages should be prefixed with the package(s) they modify.
    * E.g. "eth, rpc: make trace configs optional"
 

.github/workflows/check.yml

@@ -3,7 +3,7 @@ name: Check
 on:
   push:
     branches:
-      - devel
+      - main
   workflow_dispatch:
 
 jobs:

.github/workflows/ci.yml

@@ -2,15 +2,11 @@ name: CI
 on:
   push:
     branches:
-      - devel
-      - alpha
-      - e35
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
-      - alpha
-      - e35
+      - main
       - 'release/**'
     types:
       - opened
@@ -122,8 +118,8 @@ jobs:
         run: cd erigon-lib && make test-no-fuzz
 
   docker-build-check:
-    # don't run this on devel - the PR must have run it to be merged and it misleads that this pushes the docker image
-    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/devel' }} && ${{ github.ref != 'refs/heads/e35' }}
+    # don't run this on main - the PR must have run it to be merged and it misleads that this pushes the docker image
+    if: (${{ github.event_name == 'push' || !github.event.pull_request.draft }}) && ${{ github.ref != 'refs/heads/main' }}
     runs-on: ubuntu-22.04
 
     steps:

.github/workflows/manifest.yml

@@ -2,15 +2,13 @@ name: Manifest Check
 on:
   push:
     branches:
-      - devel
-      - e35
+      - main
       - 'release/**'
     paths:
       - 'go.mod'
   pull_request:
     branches:
-      - devel
-      - e35
+      - main
       - 'release/**'
     paths:
       - 'go.mod'

.github/workflows/qa-clean-exit-block-downloading.yml

@@ -6,7 +6,7 @@ on:
       - 'release/**'
   pull_request:
     branches:
-      - devel
+      - main
       - 'release/**'
     types:
       - ready_for_review

.github/workflows/qa-clean-exit-snapshot-downloading.yml

@@ -3,11 +3,11 @@ name: QA - Clean exit (snapshot downloading)
 on:
   push:
     branches:
-      - devel
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
+      - main
       - 'release/**'
     types:
       - ready_for_review

.github/workflows/test-integration-caplin.yml

@@ -2,13 +2,11 @@ name: Consensus specification tests
 on:
   push:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - devel
-      - alpha
+      - main
       - 'release/**'
     types:
       - opened

.github/workflows/test-integration.yml

@@ -2,13 +2,11 @@ name: Integration tests
 on:
   push:
     branches:
-      - devel
-      - alpha
-      - e35
+      - main
       - 'release/**'
   pull_request:
     branches:
-      - e35
+      - main
     types:
       - opened
       - reopened

Makefile

@@ -17,7 +17,7 @@ DOCKER_TAG ?= thorax/erigon:latest
 # Pipe error below to /dev/null since Makefile structure kind of expects
 # Go to be available, but with docker it's not strictly necessary
 CGO_CFLAGS := $(shell $(GO) env CGO_CFLAGS 2>/dev/null) # don't lose default
-CGO_CFLAGS += -DMDBX_FORCE_ASSERTIONS=0 # Enable MDBX's asserts by default in 'devel' branch and disable in releases
+CGO_CFLAGS += -DMDBX_FORCE_ASSERTIONS=0 # Enable MDBX's asserts by default in 'main' branch and disable in releases
 #CGO_CFLAGS += -DMDBX_DISABLE_VALIDATION=1 # This feature is not ready yet
 #CGO_CFLAGS += -DMDBX_ENABLE_PROFGC=0 # Disabled by default, but may be useful for performance debugging
 #CGO_CFLAGS += -DMDBX_ENABLE_PGOP_STAT=0 # Disabled by default, but may be useful for performance debugging

README.md

@@ -97,7 +97,7 @@ For building the bleeding edge development branch:
 ```sh
 git clone --recurse-submodules https://github.com/ledgerwatch/erigon.git
 cd erigon
-git checkout devel
+git checkout main
 make erigon
 ./build/bin/erigon
 ```
@@ -683,7 +683,7 @@ https://github.com/mathMakesArt/Erigon-on-RPi-4
 
 ### How to change db pagesize
 
-[post](https://github.com/ledgerwatch/erigon/blob/devel/cmd/integration/Readme.md#copy-data-to-another-db)
+[post](https://github.com/ledgerwatch/erigon/blob/main/cmd/integration/Readme.md#copy-data-to-another-db)
 
 
 Getting in touch
@@ -762,7 +762,7 @@ XDG_DATA_HOME=/preferred/data/folder DOCKER_BUILDKIT=1 COMPOSE_DOCKER_CLI_BUILD=
 
 ## Erigon3 user's guide
 
-Git branch `e35`. Just start erigon as you usually do.
+Git branch `main`. Just start erigon as you usually do.
 
 RAM requirement is higher: 32gb and better 64gb. We will work on this topic a bit later.
 

cmd/devnet/README.md

@@ -1,7 +1,7 @@
 # Devnet
 
 This is an automated tool run on the devnet that simulates p2p connection between nodes and ultimately tests operations on them.
-See [DEV_CHAIN](https://github.com/ledgerwatch/erigon/blob/devel/DEV_CHAIN.md) for a manual version.
+See [DEV_CHAIN](https://github.com/ledgerwatch/erigon/blob/main/DEV_CHAIN.md) for a manual version.
 
 The devnet code performs 3 main functions:
 

cmd/downloader/torrent_hashes_update.sh

@@ -13,7 +13,7 @@ if [ -z "$network" ]; then
 fi
 
 #git reset --hard
-#git checkout devel
+#git checkout main
 #git pull
 
 # clean

cmd/rpcdaemon/cli/config.go

@@ -14,8 +14,6 @@ import (
 	"strings"
 	"time"
 
-	"github.com/ledgerwatch/erigon-lib/config3"
-	"github.com/ledgerwatch/erigon-lib/kv/temporal"
 	"github.com/ledgerwatch/log/v3"
 	"github.com/spf13/cobra"
 	"golang.org/x/sync/semaphore"
@@ -27,6 +25,7 @@ import (
 	libcommon "github.com/ledgerwatch/erigon-lib/common"
 	"github.com/ledgerwatch/erigon-lib/common/datadir"
 	"github.com/ledgerwatch/erigon-lib/common/hexutility"
+	"github.com/ledgerwatch/erigon-lib/config3"
 	"github.com/ledgerwatch/erigon-lib/direct"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces"
 	"github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil"
@@ -39,7 +38,9 @@ import (
 	"github.com/ledgerwatch/erigon-lib/kv/rawdbv3"
 	"github.com/ledgerwatch/erigon-lib/kv/remotedb"
 	"github.com/ledgerwatch/erigon-lib/kv/remotedbserver"
+	"github.com/ledgerwatch/erigon-lib/kv/temporal"
 	libstate "github.com/ledgerwatch/erigon-lib/state"
+
 	"github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg"
 	"github.com/ledgerwatch/erigon/cmd/rpcdaemon/graphql"
 	"github.com/ledgerwatch/erigon/cmd/rpcdaemon/health"
@@ -66,6 +67,7 @@ import (
 	"github.com/ledgerwatch/erigon/turbo/services"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks"
 	"github.com/ledgerwatch/erigon/turbo/snapshotsync/snap"
+
 	// Force-load native and js packages, to trigger registration
 	_ "github.com/ledgerwatch/erigon/eth/tracers/js"
 	_ "github.com/ledgerwatch/erigon/eth/tracers/native"
@@ -108,7 +110,7 @@ func RootCommand() (*cobra.Command, *httpcfg.HttpCfg) {
 	rootCmd.PersistentFlags().StringVar(&cfg.TLSKeyFile, "tls.key", "", "key file for client side TLS handshake for GRPC")
 	rootCmd.PersistentFlags().StringVar(&cfg.TLSCACert, "tls.cacert", "", "CA certificate for client side TLS handshake for GRPC")
 
-	rootCmd.PersistentFlags().StringSliceVar(&cfg.API, "http.api", []string{"eth", "erigon"}, "API's offered over the RPC interface: eth,erigon,web3,net,debug,trace,txpool,db. Supported methods: https://github.com/ledgerwatch/erigon/tree/devel/cmd/rpcdaemon")
+	rootCmd.PersistentFlags().StringSliceVar(&cfg.API, "http.api", []string{"eth", "erigon"}, "API's offered over the RPC interface: eth,erigon,web3,net,debug,trace,txpool,db. Supported methods: https://github.com/ledgerwatch/erigon/tree/main/cmd/rpcdaemon")
 
 	rootCmd.PersistentFlags().BoolVar(&cfg.HttpServerEnabled, "http.enabled", true, "enable http server")
 	rootCmd.PersistentFlags().StringVar(&cfg.HttpListenAddress, "http.addr", nodecfg.DefaultHTTPHost, "HTTP server listening interface")

erigon-lib/etl/README.md

@@ -1,5 +1,5 @@
 # ETL
-ETL framework is most commonly used in [staged sync](https://github.com/ledgerwatch/erigon/blob/devel/eth/stagedsync/README.md).
+ETL framework is most commonly used in [staged sync](https://github.com/ledgerwatch/erigon/blob/main/eth/stagedsync/README.md).
 
 It implements a pattern where we extract some data from a database, transform it,
 then put it into temp files and insert back to the database in sorted order.

erigon-lib/kv/Readme.md

@@ -86,7 +86,7 @@ if err != nil {
 - Methods .Bucket() and .Cursor(), can’t return nil, can't return error.
 - Bucket and Cursor - are interfaces - means different classes can satisfy it: for example `MdbxCursor`
   and `MdbxDupSortCursor` classes satisfy it.
-  If your are not familiar with "DupSort" concept, please read [dupsort.md](https://github.com/ledgerwatch/erigon/blob/devel/docs/programmers_guide/dupsort.md)
+  If your are not familiar with "DupSort" concept, please read [dupsort.md](https://github.com/ledgerwatch/erigon/blob/main/docs/programmers_guide/dupsort.md)