Upstream erigon V3.0.0-alpha1

.buildkite/pipeline.yml

@@ -3,4 +3,4 @@ steps:
   - command: './nightly.sh'
     label: 'build & run geth'
     env:
-      BUILDKITE_GOLANG_IMPORT_PATH: "github.com/ledgerwatch/erigon"
+      BUILDKITE_GOLANG_IMPORT_PATH: "github.com/erigontech/erigon"

.github/CONTRIBUTING.md

@@ -7,7 +7,7 @@ smallest of fixes!
 If you'd like to contribute to Erigon, please fork, fix, commit and send a 
 pull request for the maintainers to review and merge into the main code base. If
 you wish to submit more complex changes though, please check up with the core 
-devs first on [Discord server](https://github.com/ledgerwatch/erigon#erigon-discord-server) to 
+devs first on [Discord server](https://github.com/erigontech/erigon#erigon-discord-server) to 
 ensure those changes are in line with the general philosophy of the project 
 and/or get some early feedback which can make both your efforts much lighter as
 well as our review and merge procedures quick and simple.
@@ -30,11 +30,11 @@ Please make sure your contributions adhere to our coding guidelines:
 Before you submit a feature request, please check and make sure that it isn't 
 possible through some other means. The JavaScript-enabled console is a powerful 
 feature in the right hands. Please check our 
-[Wiki page](https://github.com/ledgerwatch/erigon/wiki) for more info
+[Wiki page](https://github.com/erigontech/erigon/wiki) for more info
 and help.
 
 ## Configuration, dependencies, and tests
 
-Please see the [Readme](https://github.com/ledgerwatch/erigon#readme) file
+Please see the [Readme](https://github.com/erigontech/erigon#readme) file
 for more details on configuring your environment, managing project dependencies
 and testing procedures.

.github/ISSUE_TEMPLATE/question.md

@@ -6,4 +6,4 @@ labels: 'type:docs'
 assignees: ''
 ---
 
-This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Erigon's discord](https://github.com/ledgerwatch/erigon#erigon-discord-server).
+This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [Erigon's discord](https://github.com/erigontech/erigon#erigon-discord-server).

.github/workflows/docker-tags.yml

@@ -33,7 +33,7 @@ jobs:
           make release-dry-run
           docker images
         #          docker image push --all-tags thorax/erigon
-        #          docker image push --all-tags ghcr.io/ledgerwatch/erigon
+        #          docker image push --all-tags ghcr.io/erigontech/erigon
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${GITHUB_REF#refs/tags/}

.github/workflows/manifest.yml

@@ -30,9 +30,9 @@ jobs:
   #        with:
   #          fetch-depth: 2 # Ensures we fetch enough history to compare
   #
-  #      - name: Is ledgerwatch/erigon-snapshot updated in go.mod # if not, pipeline should exit beacuse grep exit code >0 when no match
+  #      - name: Is erigontech/erigon-snapshot updated in go.mod # if not, pipeline should exit because grep exit code >0 when no match
   #        run: |
-  #          git diff HEAD~1 HEAD -- go.mod | grep 'github.com/ledgerwatch/erigon-snapshot'
+  #          git diff HEAD~1 HEAD -- go.mod | grep 'github.com/erigontech/erigon-snapshot'
 
   ManifestCheck:
     #    needs: check-snap-modifications

.github/workflows/qa-sync-from-scratch-minimal-node.yml

@@ -8,12 +8,12 @@ on:
 jobs:
   minimal-node-sync-from-scratch-test:
     runs-on: self-hosted
-    timeout-minutes: 800
+    timeout-minutes: 1500 # 25 hours
     env:
       ERIGON_DATA_DIR: ${{ github.workspace }}/erigon_data
       ERIGON_QA_PATH: /home/qarunner/erigon-qa
       TRACKING_TIME_SECONDS: 7200 # 2 hours
-      TOTAL_TIME_SECONDS: 43200 # 12 hours
+      TOTAL_TIME_SECONDS: 86400 # 24 hours
       CHAIN: mainnet
 
     steps:

.github/workflows/qa-sync-from-scratch.yml

@@ -97,7 +97,7 @@ jobs:
       if: steps.test_step.outputs.test_executed == 'true'
       uses: actions/upload-artifact@v4
       with:
-        name: test-results
+        name: test-results-${{ env.CHAIN }}
         path: ${{ github.workspace }}/result-${{ env.CHAIN }}.json
 
     - name: Action for Success

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Maximize build space
-        uses: AdityaGarg8/remove-unwanted-software@v1
+        uses: AdityaGarg8/remove-unwanted-software@v4
         with:
           remove-dotnet: 'true'
           remove-android: 'true'
@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: ghcr-login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -45,11 +45,11 @@ jobs:
           echo "tag_name=${TAG}" >> $GITHUB_OUTPUT
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - run: echo ${{ steps.prepare.outputs.tag_name }}
 
-      - name: Run GoReleaser
+      - name: Release
         run: |
           make release
         env:

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

@@ -18,7 +18,7 @@ jobs:
   tests:
     strategy:
       matrix:
-        #        disable macos-11 until https://github.com/ledgerwatch/erigon/issues/8789
+        #        disable macos-11 until https://github.com/erigontech/erigon/issues/8789
         os: [ ubuntu-22.04 ] # list of os: https://github.com/actions/virtual-environments
     runs-on: ${{ matrix.os }}
 

.golangci.yml

@@ -12,7 +12,7 @@ linters:
     - unused
     - performance
   disable:
-    - gosec # enable it after 1-2 weeks. it failing CI withoutt enough info to fix: https://github.com/ledgerwatch/erigon/actions/runs/5928644129/job/16074701625
+    - gosec # enable it after 1-2 weeks. it failing CI withoutt enough info to fix: https://github.com/erigontech/erigon/actions/runs/5928644129/job/16074701625
     - exhaustive
     - musttag
     - contextcheck

DEV_CHAIN.md

@@ -5,7 +5,7 @@ Steps to setup and run Erigon dev chain. This tutorial is made for macOS.
 Open terminal 1 and type the following command
 
 ```bash 
-git clone --recurse-submodules -j8 https://github.com/ledgerwatch/erigon.git
+git clone --recurse-submodules -j8 https://github.com/erigontech/erigon.git
 cd erigon
 make erigon
 ```

Dockerfile

@@ -102,7 +102,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       org.label-schema.url="https://torquem.ch" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/ledgerwatch/erigon.git" \
+      org.label-schema.vcs-url="https://github.com/erigontech/erigon.git" \
       org.label-schema.vendor="Torquem" \
       org.label-schema.version=$VERSION
 

Dockerfile.debian

@@ -97,7 +97,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.schema-version="1.0" \
       org.label-schema.url="https://torquem.ch" \
       org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/ledgerwatch/erigon.git" \
+      org.label-schema.vcs-url="https://github.com/erigontech/erigon.git" \
       org.label-schema.vendor="Torquem" \
       org.label-schema.version=$VERSION
 

Makefile

@@ -23,10 +23,21 @@ CGO_CFLAGS += -DMDBX_DISABLE_VALIDATION=0 # Can disable it on CI by separated PR
 #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
 CGO_CFLAGS += -DMDBX_ENV_CHECKPID=0 # Erigon doesn't do fork() syscall
-CGO_CFLAGS += -D__BLST_PORTABLE__
-CGO_CFLAGS += -Wno-unknown-warning-option -Wno-enum-int-mismatch -Wno-strict-prototypes -Wno-unused-but-set-variable
+
+# If it is arm64 or aarch64, then we need to use portable version of blst. use or with stringw "arm64" and "aarch64" to support both
+ifeq ($(shell uname -m), arm64)
+	CGO_CFLAGS += -D__BLST_PORTABLE__
+endif
+ifeq ($(shell uname -m), aarch64)
+	CGO_CFLAGS += -D__BLST_PORTABLE__
+endif
+
+
+CGO_CFLAGS += -Wno-unknown-warning-option -Wno-enum-int-mismatch -Wno-strict-prototypes -Wno-unused-but-set-variable -O3
 
 CGO_LDFLAGS := $(shell $(GO) env CGO_LDFLAGS 2> /dev/null)
+CGO_LDFLAGS += -O3 -g
+
 ifeq ($(shell uname -s), Darwin)
 	ifeq ($(filter-out 13.%,$(shell sw_vers --productVersion)),)
 		CGO_LDFLAGS += -mmacosx-version-min=13.3
@@ -44,7 +55,7 @@ GOPRIVATE = github.com/erigontech/silkworm-go
 
 PACKAGE = github.com/node-real/bsc-erigon
 
-GO_FLAGS += -trimpath -tags $(BUILD_TAGS) -buildvcs=false
+GO_FLAGS += -trimpath -tags $(BUILD_TAGS) -buildvcs=false 
 GO_FLAGS += -ldflags "-X ${PACKAGE}/params.GitCommit=${GIT_COMMIT} -X ${PACKAGE}/params.GitBranch=${GIT_BRANCH} -X ${PACKAGE}/params.GitTag=${GIT_TAG}"
 
 GOBUILD = CGO_CFLAGS="$(CGO_CFLAGS)" CGO_LDFLAGS="$(CGO_LDFLAGS)" GOPRIVATE="$(GOPRIVATE)" $(GO) build $(GO_FLAGS)
@@ -281,7 +292,7 @@ release-dry-run: git-submodules
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
 		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
-		--clean --skip-validate --skip-publish
+		--clean --skip=validate --skip=publish
 
 .PHONY: release
 release: git-submodules
@@ -294,8 +305,7 @@ release: git-submodules
 		-v `pwd`:/go/src/$(PACKAGE_NAME) \
 		-w /go/src/$(PACKAGE_NAME) \
 		ghcr.io/goreleaser/goreleaser-cross:${GOLANG_CROSS_VERSION} \
-		--clean --skip-validate
-
+		--clean --skip=validate
 
 # since DOCKER_UID, DOCKER_GID are default initialized to the current user uid/gid,
 # we need separate envvars to facilitate creation of the erigon user on the host OS.

README.md

@@ -8,7 +8,7 @@ An accessible and complete version of the documentation is available at **[erigo
 **.
 <br>
 
-![Build status](https://github.com/ledgerwatch/erigon/actions/workflows/ci.yml/badge.svg) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=ledgerwatch_erigon&metric=coverage)](https://sonarcloud.io/summary/new_code?id=ledgerwatch_erigon)
+![Build status](https://github.com/erigontech/erigon/actions/workflows/ci.yml/badge.svg) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=erigontech_erigon&metric=coverage)](https://sonarcloud.io/summary/new_code?id=erigontech_erigon)
 
 <!--ts-->
 
@@ -19,7 +19,7 @@ An accessible and complete version of the documentation is available at **[erigo
     + [Testnets](#testnets)
     + [Block Production](#block-production-pow-miner-or-pos-validator)
     + [Windows](#windows)
-    + [GoDoc](https://godoc.org/github.com/ledgerwatch/erigon)
+    + [GoDoc](https://godoc.org/github.com/erigontech/erigon)
     + [Beacon Chain](#beacon-chain-consensus-layer)
     + [Dev Chain](#dev-chain)
     + [Caplin (Internal Consensus Layer)](#caplin)
@@ -86,18 +86,18 @@ Building erigon requires both a Go (version 1.21 or later) and a C compiler (GCC
 For building the latest release (this will be suitable for most users just wanting to run a node):
 
 ```sh
-git clone --branch release/<x.xx> --single-branch https://github.com/ledgerwatch/erigon.git
+git clone --branch release/<x.xx> --single-branch https://github.com/erigontech/erigon.git
 cd erigon
 make erigon
 ./build/bin/erigon
 ```
 
-You can check [the list of releases](https://github.com/ledgerwatch/erigon/releases) for release notes.
+You can check [the list of releases](https://github.com/erigontech/erigon/releases) for release notes.
 
 For building the bleeding edge development branch:
 
 ```sh
-git clone --recurse-submodules https://github.com/ledgerwatch/erigon.git
+git clone --recurse-submodules https://github.com/erigontech/erigon.git
 cd erigon
 git checkout main
 make erigon
@@ -181,7 +181,7 @@ If you would like to give Erigon a try, but do not have spare 2TB on your drive,
 of the public testnets, Sepolia. It syncs much quicker, and does not take so much disk space:
 
 ```sh
-git clone --recurse-submodules -j8 https://github.com/ledgerwatch/erigon.git
+git clone --recurse-submodules -j8 https://github.com/erigontech/erigon.git
 cd erigon
 make erigon
 ./build/bin/erigon --datadir=<your_datadir> --chain=sepolia
@@ -363,7 +363,7 @@ Key features
 ============
 
 <code>🔬 See more
-detailed [overview of functionality and current limitations](https://ledgerwatch.github.io/turbo_geth_release.html). It
+detailed [overview of functionality and current limitations](https://erigontech.github.io/turbo_geth_release.html). It
 is being updated on recurring basis.</code>
 
 ### More Efficient State Storage
@@ -375,7 +375,7 @@ is being updated on recurring basis.</code>
 **Preprocessing**. For some operations, Erigon uses temporary files to preprocess data before inserting it into the main
 DB. That reduces write amplification and DB inserts are orders of magnitude quicker.
 
-<code> 🔬 See our detailed ETL explanation [here](https://github.com/ledgerwatch/erigon-lib/blob/main/etl/README.md).</code>
+<code> 🔬 See our detailed ETL explanation [here](https://github.com/erigontech/erigon-lib/blob/main/etl/README.md).</code>
 
 **Plain state**.
 
@@ -522,7 +522,7 @@ sudo -u ${ERIGON_USER} DOCKER_UID=$(id -u ${ERIGON_USER}) DOCKER_GID=$(id -g ${E
 
 Makefile creates the initial directories for erigon, prometheus and grafana. The PID namespace is shared between erigon
 and rpcdaemon which is required to open Erigon's DB from another process (RPCDaemon local-mode).
-See: https://github.com/ledgerwatch/erigon/pull/2392/files
+See: https://github.com/erigontech/erigon/pull/2392/files
 
 If your docker installation requires the docker daemon to run as root (which is by default), you will need to prefix
 the command above with `sudo`. However, it is sometimes recommended running docker (and therefore its containers) as a
@@ -689,7 +689,7 @@ https://github.com/mathMakesArt/Erigon-on-RPi-4
 
 ### How to change db pagesize
 
-[post](https://github.com/ledgerwatch/erigon/blob/main/cmd/integration/Readme.md#copy-data-to-another-db)
+[post](https://github.com/erigontech/erigon/blob/main/cmd/integration/Readme.md#copy-data-to-another-db)
 
 
 Getting in touch
@@ -744,7 +744,7 @@ Next tools show correct memory usage of Erigon:
 
 ### Blocks Execution is slow on cloud-network-drives
 
-Please read https://github.com/ledgerwatch/erigon/issues/1516#issuecomment-811958891
+Please read https://github.com/erigontech/erigon/issues/1516#issuecomment-811958891
 In short: network-disks are bad for blocks execution - because blocks execution reading data from db non-parallel
 non-batched way.
 
@@ -786,18 +786,17 @@ Supported networks: all (except Mumbai).
 - E3 can execute 1 historical transaction - without executing it's block - because history/indices have
   transaction-granularity, instead of block-granularity.
 - E3 doesn't store Logs (aka Receipts) - it always re-executing historical txn (but it's cheaper then in E2 - see point
-  above). Known perf issues: https://github.com/ledgerwatch/erigon/issues/10747
+  above). Known perf issues: https://github.com/erigontech/erigon/issues/10747
 - `--sync.loop.block.limit` is enabled by default. (Default: `5_000`.
-  Set `--sync.loop.block.limit=10_000 --batchSize=1g` to increase sync speed on good hardware).
+  Set `--sync.loop.block.limit=10_000 --batchSize=2g` to increase sync speed on good hardware).
 - datadir/chaindata is small now - to prevent it's grow: we recommend set `--batchSize <= 2G`. And it's fine
   to `rm -rf chaindata`
 - can symlink/mount latest state to fast drive and history to cheap drive
-- ArchiveNode is default. FullNode same as in E2: --prune=hrtc
+- Archive Node is default. Full Node: `--prune.mode=full`, Minimal Node (EIP-4444): `--prune.mode=minimal`
 
 ### Known Problems of E3:
 
-- don't `rm -rf downloader` - it will cause re-downloading of files: https://github.com/ledgerwatch/erigon/issues/10976
-- `eth_getLogs` fields `index` always 0: https://github.com/ledgerwatch/erigon/issues/10324
+- don't `rm -rf downloader` - it will cause re-downloading of files: https://github.com/erigontech/erigon/issues/10976
 
 ### E3 datadir structure
 

TESTING.md

@@ -135,7 +135,7 @@ ERROR[03-24|13:49:53.343] Ethereum peer removal failed             peer=bfa4a38e
 ```
 
 The second error happens during the unwinding the `TxPool` stage. It has been reported in this
-issue: https://github.com/ledgerwatch/erigon/issues/848
+issue: https://github.com/erigontech/erigon/issues/848
 
 ```
 ERROR[08-01|14:30:38.297] Demoting invalidated transaction         hash="6ee8a8…92bf22"

accounts/abi/abi.go

@@ -27,9 +27,9 @@ import (
 	"fmt"
 	"io"
 
-	libcommon "github.com/ledgerwatch/erigon-lib/common"
+	libcommon "github.com/erigontech/erigon-lib/common"
 
-	"github.com/ledgerwatch/erigon/crypto"
+	"github.com/erigontech/erigon/crypto"
 )
 
 // The ABI holds information about a contract's context and available

accounts/abi/abi_test.go

@@ -30,11 +30,11 @@ import (
 	"strings"
 	"testing"
 
-	libcommon "github.com/ledgerwatch/erigon-lib/common"
+	libcommon "github.com/erigontech/erigon-lib/common"
 
-	"github.com/ledgerwatch/erigon/common"
-	"github.com/ledgerwatch/erigon/common/math"
-	"github.com/ledgerwatch/erigon/crypto"
+	"github.com/erigontech/erigon/common"
+	"github.com/erigontech/erigon/common/math"
+	"github.com/erigontech/erigon/crypto"
 )
 
 const jsondata = `

accounts/abi/bind/auth.go

@@ -24,10 +24,10 @@ import (
 	"errors"
 	"math/big"
 
-	libcommon "github.com/ledgerwatch/erigon-lib/common"
+	libcommon "github.com/erigontech/erigon-lib/common"
 
-	"github.com/ledgerwatch/erigon/core/types"
-	"github.com/ledgerwatch/erigon/crypto"
+	"github.com/erigontech/erigon/core/types"
+	"github.com/erigontech/erigon/crypto"
 )
 
 // ErrNoChainID is returned whenever the user failed to specify a chain id.

accounts/abi/bind/backend.go

@@ -24,10 +24,10 @@ import (
 	"errors"
 	"math/big"
 
-	libcommon "github.com/ledgerwatch/erigon-lib/common"
+	libcommon "github.com/erigontech/erigon-lib/common"
 
-	ethereum "github.com/ledgerwatch/erigon"
-	"github.com/ledgerwatch/erigon/core/types"
+	ethereum "github.com/erigontech/erigon"
+	"github.com/erigontech/erigon/core/types"
 )
 
 var (