diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6811ebe0ce9..51c157e307a 100644 --- a/.buildkite/pipeline.yml +++ b/.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" diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 55d051b2b79..a77104170a9 100644 --- a/.github/CONTRIBUTING.md +++ b/.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. diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 0debc5dbe3a..5eea41f107c 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.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). diff --git a/.github/workflows/docker-tags.yml b/.github/workflows/docker-tags.yml index 8cc6ef2f24a..a74dd476551 100644 --- a/.github/workflows/docker-tags.yml +++ b/.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/} diff --git a/.github/workflows/test-integration-caplin.yml b/.github/workflows/test-integration-caplin.yml index 8ec01ac325b..4660d15c080 100644 --- a/.github/workflows/test-integration-caplin.yml +++ b/.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 }} diff --git a/.golangci.yml b/.golangci.yml index 37a9a8b1af5..e17536c91ab 100644 --- a/.golangci.yml +++ b/.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 diff --git a/.goreleaser.yml b/.goreleaser.yml index 47f44d303a1..3c3ff0f20eb 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -68,7 +68,7 @@ snapshot: dockers: - image_templates: - thorax/{{ .ProjectName }}:{{ .Version }}-amd64 - - ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }}-amd64 + - ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }}-amd64 dockerfile: Dockerfile.release use: buildx skip_push: true @@ -80,7 +80,7 @@ dockers: - image_templates: - thorax/{{ .ProjectName }}:{{ .Version }}-arm64 - - ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }}-arm64 + - ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }}-arm64 dockerfile: Dockerfile.release skip_push: true use: buildx @@ -97,11 +97,11 @@ docker_manifests: - thorax/{{ .ProjectName }}:{{ .Version }}-amd64 - thorax/{{ .ProjectName }}:{{ .Version }}-arm64 - - name_template: ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }} + - name_template: ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }} skip_push: true image_templates: - - ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }}-amd64 - - ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }}-arm64 + - ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }}-amd64 + - ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }}-arm64 - name_template: thorax/{{ .ProjectName }}:latest skip_push: true @@ -109,11 +109,11 @@ docker_manifests: - thorax/{{ .ProjectName }}:{{ .Version }}-amd64 - thorax/{{ .ProjectName }}:{{ .Version }}-arm64 - - name_template: ghcr.io/ledgerwatch/{{ .ProjectName }}:latest + - name_template: ghcr.io/erigontech/{{ .ProjectName }}:latest skip_push: true image_templates: - - ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }}-amd64 - - ghcr.io/ledgerwatch/{{ .ProjectName }}:{{ .Version }}-arm64 + - ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }}-amd64 + - ghcr.io/erigontech/{{ .ProjectName }}:{{ .Version }}-arm64 announce: slack: diff --git a/DEV_CHAIN.md b/DEV_CHAIN.md index b77ece8e456..59cea01152c 100644 --- a/DEV_CHAIN.md +++ b/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 ``` diff --git a/Dockerfile b/Dockerfile index cf202503087..8b69ef3062d 100644 --- a/Dockerfile +++ b/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 diff --git a/Dockerfile.debian b/Dockerfile.debian index 397d6e3a827..4f4841def0d 100644 --- a/Dockerfile.debian +++ b/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 diff --git a/Makefile b/Makefile index 30751ab1ff1..6752f600da0 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ endif GOPRIVATE = github.com/erigontech/silkworm-go -PACKAGE = github.com/ledgerwatch/erigon +PACKAGE = github.com/erigontech/erigon 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}" @@ -276,7 +276,7 @@ install: @echo "Copied files to $(DIST):" @ls -al "$(DIST)" -PACKAGE_NAME := github.com/ledgerwatch/erigon +PACKAGE_NAME := github.com/erigontech/erigon GOLANG_CROSS_VERSION ?= v1.22.4 .PHONY: release-dry-run @@ -310,7 +310,7 @@ release: git-submodules --clean --skip-validate @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 # 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. diff --git a/README.md b/README.md index 4349c02b7d6..e01005c194c 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ An accessible and complete version of the documentation is available at **[erigo **.
-![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) @@ -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) @@ -85,18 +85,18 @@ Usage For building the latest release (this will be suitable for most users just wanting to run a node): ```sh -git clone --branch release/ --single-branch https://github.com/ledgerwatch/erigon.git +git clone --branch release/ --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 @@ -180,7 +180,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= --chain=sepolia @@ -374,7 +374,7 @@ is being updated on recurring basis. **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. - 🔬 See our detailed ETL explanation [here](https://github.com/ledgerwatch/erigon-lib/blob/main/etl/README.md). + 🔬 See our detailed ETL explanation [here](https://github.com/erigontech/erigon-lib/blob/main/etl/README.md). **Plain state**. @@ -521,7 +521,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 @@ -688,7 +688,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 @@ -743,7 +743,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. @@ -785,7 +785,7 @@ 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). - datadir/chaindata is small now - to prevent it's grow: we recommend set `--batchSize <= 2G`. And it's fine @@ -795,8 +795,8 @@ Supported networks: all (except Mumbai). ### 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 +- `eth_getLogs` fields `index` always 0: https://github.com/erigontech/erigon/issues/10324 ### E3 datadir structure diff --git a/TESTING.md b/TESTING.md index 9302b7772d1..24f0dce13a9 100644 --- a/TESTING.md +++ b/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" diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index 8a039e91141..3184d93ae1f 100644 --- a/accounts/abi/abi.go +++ b/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 diff --git a/accounts/abi/abi_test.go b/accounts/abi/abi_test.go index 88d7e0e37ba..8acc633a9ec 100644 --- a/accounts/abi/abi_test.go +++ b/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 = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 081b648b0c9..7aafcee08d0 100644 --- a/accounts/abi/bind/auth.go +++ b/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. diff --git a/accounts/abi/bind/backend.go b/accounts/abi/bind/backend.go index 37a2fac452b..fbf6c483dfc 100644 --- a/accounts/abi/bind/backend.go +++ b/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 ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 6ddd5f31165..2ad4c13bb2a 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -30,33 +30,33 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - state2 "github.com/ledgerwatch/erigon-lib/state" - types2 "github.com/ledgerwatch/erigon-lib/types" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/event" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + state2 "github.com/erigontech/erigon-lib/state" + types2 "github.com/erigontech/erigon-lib/types" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/event" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" ) // This nil assignment ensures at compile time that SimulatedBackend implements bind.ContractBackend. diff --git a/accounts/abi/bind/backends/simulated_test.go b/accounts/abi/bind/backends/simulated_test.go index 84bd902be43..6b34001a0e0 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -31,18 +31,19 @@ import ( "time" "github.com/holiman/uint256" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" "github.com/stretchr/testify/require" + + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) func TestSimulatedBackend(t *testing.T) { diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index 425b6997f7e..cee0a0c59b6 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -26,13 +26,14 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/event" ) // SignerFn is a signer function callback when a contract requires a method to diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index 256ae94a4c2..be0563dd6da 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -26,16 +26,16 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) type mockCaller struct { diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 65cf957df12..b51a75b88e3 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -20,7 +20,7 @@ // Package bind generates Ethereum contract Go bindings. // // Detailed usage document and tutorial available on the go-ethereum Wiki page: -// https://github.com/ledgerwatch/erigon/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/erigontech/erigon/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -33,9 +33,9 @@ import ( "text/template" "unicode" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi" ) // Lang is a target programming language selector to generate bindings for. diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go index f78003d0d61..b574c9b20e0 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/dir" ) var bindTests = []struct { @@ -50,7 +50,7 @@ var bindTests = []struct { `contract NilContract {}`, []string{`606060405260068060106000396000f3606060405200`}, []string{`[]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/erigontech/erigon-lib/common"`, ` if b, err := NewEmpty(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -73,7 +73,7 @@ var bindTests = []struct { `https://ethereum.org/token`, []string{`60606040526040516107fd3803806107fd83398101604052805160805160a05160c051929391820192909101600160a060020a0333166000908152600360209081526040822086905581548551838052601f6002600019610100600186161502019093169290920482018390047f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56390810193919290918801908390106100e857805160ff19168380011785555b506101189291505b8082111561017157600081556001016100b4565b50506002805460ff19168317905550505050610658806101a56000396000f35b828001600101855582156100ac579182015b828111156100ac5782518260005055916020019190600101906100fa565b50508060016000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017557805160ff19168380011785555b506100c89291506100b4565b5090565b82800160010185558215610165579182015b8281111561016557825182600050559160200191906001019061018756606060405236156100775760e060020a600035046306fdde03811461007f57806323b872dd146100dc578063313ce5671461010e57806370a082311461011a57806395d89b4114610132578063a9059cbb1461018e578063cae9ca51146101bd578063dc3080f21461031c578063dd62ed3e14610341575b610365610002565b61036760008054602060026001831615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b6103d5600435602435604435600160a060020a038316600090815260036020526040812054829010156104f357610002565b6103e760025460ff1681565b6103d560043560036020526000908152604090205481565b610367600180546020600282841615610100026000190190921691909104601f810182900490910260809081016040526060828152929190828280156104eb5780601f106104c0576101008083540402835291602001916104eb565b610365600435602435600160a060020a033316600090815260036020526040902054819010156103f157610002565b60806020604435600481810135601f8101849004909302840160405260608381526103d5948235946024803595606494939101919081908382808284375094965050505050505060006000836004600050600033600160a060020a03168152602001908152602001600020600050600087600160a060020a031681526020019081526020016000206000508190555084905080600160a060020a0316638f4ffcb1338630876040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156102f25780820380516001836020036101000a031916815260200191505b50955050505050506000604051808303816000876161da5a03f11561000257505050509392505050565b6005602090815260043560009081526040808220909252602435815220546103d59081565b60046020818152903560009081526040808220909252602435815220546103d59081565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156103c75780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b60408051918252519081900360200190f35b6060908152602090f35b600160a060020a03821660009081526040902054808201101561041357610002565b806003600050600033600160a060020a03168152602001908152602001600020600082828250540392505081905550806003600050600084600160a060020a0316815260200190815260200160002060008282825054019250508190555081600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b820191906000526020600020905b8154815290600101906020018083116104ce57829003601f168201915b505050505081565b600160a060020a03831681526040812054808301101561051257610002565b600160a060020a0380851680835260046020908152604080852033949094168086529382528085205492855260058252808520938552929052908220548301111561055c57610002565b816003600050600086600160a060020a03168152602001908152602001600020600082828250540392505081905550816003600050600085600160a060020a03168152602001908152602001600020600082828250540192505081905550816005600050600086600160a060020a03168152602001908152602001600020600050600033600160a060020a0316815260200190815260200160002060008282825054019250508190555082600160a060020a031633600160a060020a03167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef846040518082815260200191505060405180910390a3939250505056`}, []string{`[{"constant":true,"inputs":[],"name":"name","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_from","type":"address"},{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transferFrom","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[],"name":"decimals","outputs":[{"name":"","type":"uint8"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"symbol","outputs":[{"name":"","type":"string"}],"type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"_spender","type":"address"},{"name":"_value","type":"uint256"},{"name":"_extraData","type":"bytes"}],"name":"approveAndCall","outputs":[{"name":"success","type":"bool"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"spentAllowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"},{"name":"","type":"address"}],"name":"allowance","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"},{"name":"tokenName","type":"string"},{"name":"decimalUnits","type":"uint8"},{"name":"tokenSymbol","type":"string"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":true,"name":"from","type":"address"},{"indexed":true,"name":"to","type":"address"},{"indexed":false,"name":"value","type":"uint256"}],"name":"Transfer","type":"event"}]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/erigontech/erigon-lib/common"`, ` if b, err := NewToken(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -89,7 +89,7 @@ var bindTests = []struct { `https://ethereum.org/crowdsale`, []string{`606060408190526007805460ff1916905560a0806105a883396101006040529051608051915160c05160e05160008054600160a060020a03199081169095178155670de0b6b3a7640000958602600155603c9093024201600355930260045560058054909216909217905561052f90819061007990396000f36060604052361561006c5760e060020a600035046301cb3b20811461008257806329dcb0cf1461014457806338af3eed1461014d5780636e66f6e91461015f5780637a3a0e84146101715780637b3e5e7b1461017a578063a035b1fe14610183578063dc0d3dff1461018c575b61020060075460009060ff161561032357610002565b61020060035460009042106103205760025460015490106103cb576002548154600160a060020a0316908290606082818181858883f150915460025460408051600160a060020a039390931683526020830191909152818101869052517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf6945090819003909201919050a15b60405160008054600160a060020a039081169230909116319082818181858883f150506007805460ff1916600117905550505050565b6103a160035481565b6103ab600054600160a060020a031681565b6103ab600554600160a060020a031681565b6103a160015481565b6103a160025481565b6103a160045481565b6103be60043560068054829081101561000257506000526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f8101547ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d409190910154600160a060020a03919091169082565b005b505050815481101561000257906000526020600020906002020160005060008201518160000160006101000a815481600160a060020a030219169083021790555060208201518160010160005055905050806002600082828250540192505081905550600560009054906101000a9004600160a060020a0316600160a060020a031663a9059cbb3360046000505484046040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506000604051808303816000876161da5a03f11561000257505060408051600160a060020a03331681526020810184905260018183015290517fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf692509081900360600190a15b50565b5060a0604052336060908152346080819052600680546001810180835592939282908280158290116102025760020281600202836000526020600020918201910161020291905b8082111561039d57805473ffffffffffffffffffffffffffffffffffffffff19168155600060019190910190815561036a565b5090565b6060908152602090f35b600160a060020a03166060908152602090f35b6060918252608052604090f35b5b60065481101561010e576006805482908110156100025760009182526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f0190600680549254600160a060020a0316928490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460405190915082818181858883f19350505050507fe842aea7a5f1b01049d752008c53c52890b1a6daf660cf39e8eec506112bbdf660066000508281548110156100025760008290526002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f01548154600160a060020a039190911691908490811015610002576002027ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d40015460408051600160a060020a0394909416845260208401919091526000838201525191829003606001919050a16001016103cc56`}, []string{`[{"constant":false,"inputs":[],"name":"checkGoalReached","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"deadline","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"beneficiary","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"tokenReward","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":true,"inputs":[],"name":"fundingGoal","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"amountRaised","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"price","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"funders","outputs":[{"name":"addr","type":"address"},{"name":"amount","type":"uint256"}],"type":"function"},{"inputs":[{"name":"ifSuccessfulSendTo","type":"address"},{"name":"fundingGoalInEthers","type":"uint256"},{"name":"durationInMinutes","type":"uint256"},{"name":"etherCostOfEachToken","type":"uint256"},{"name":"addressOfTokenUsedAsReward","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"backer","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"isContribution","type":"bool"}],"name":"FundTransfer","type":"event"}]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/erigontech/erigon-lib/common"`, ` if b, err := NewCrowdsale(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -105,7 +105,7 @@ var bindTests = []struct { `https://ethereum.org/dao`, []string{`606060405260405160808061145f833960e06040529051905160a05160c05160008054600160a060020a03191633179055600184815560028490556003839055600780549182018082558280158290116100b8576003028160030283600052602060002091820191016100b891906101c8565b50506060919091015160029190910155600160a060020a0381166000146100a65760008054600160a060020a031916821790555b505050506111f18061026e6000396000f35b505060408051608081018252600080825260208281018290528351908101845281815292820192909252426060820152600780549194509250811015610002579081527fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c6889050815181546020848101517401000000000000000000000000000000000000000002600160a060020a03199290921690921760a060020a60ff021916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f9081018390048201949192919091019083901061023e57805160ff19168380011785555b50610072929150610226565b5050600060028201556001015b8082111561023a578054600160a860020a031916815560018181018054600080835592600290821615610100026000190190911604601f81901061020c57506101bb565b601f0160209004906000526020600020908101906101bb91905b8082111561023a5760008155600101610226565b5090565b828001600101855582156101af579182015b828111156101af57825182600050559160200191906001019061025056606060405236156100b95760e060020a6000350463013cf08b81146100bb578063237e9492146101285780633910682114610281578063400e3949146102995780635daf08ca146102a257806369bd34361461032f5780638160f0b5146103385780638da5cb5b146103415780639644fcbd14610353578063aa02a90f146103be578063b1050da5146103c7578063bcca1fd3146104b5578063d3c0715b146104dc578063eceb29451461058d578063f2fde38b1461067b575b005b61069c6004356004805482908110156100025790600052602060002090600a02016000506005810154815460018301546003840154600485015460068601546007870154600160a060020a03959095169750929560020194919360ff828116946101009093041692919089565b60408051602060248035600481810135601f81018590048502860185019096528585526107759581359591946044949293909201918190840183828082843750949650505050505050600060006004600050848154811015610002575090527f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19e600a8402908101547f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b909101904210806101e65750600481015460ff165b8061026757508060000160009054906101000a9004600160a060020a03168160010160005054846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816007016000505414155b8061027757506001546005820154105b1561109257610002565b61077560043560066020526000908152604090205481565b61077560055481565b61078760043560078054829081101561000257506000526003026000805160206111d18339815191528101547fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c68a820154600160a060020a0382169260a060020a90920460ff16917fa66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c689019084565b61077560025481565b61077560015481565b610830600054600160a060020a031681565b604080516020604435600481810135601f81018490048402850184019095528484526100b9948135946024803595939460649492939101918190840183828082843750949650505050505050600080548190600160a060020a03908116339091161461084d57610002565b61077560035481565b604080516020604435600481810135601f8101849004840285018401909552848452610775948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a019093528282529698976084979196506024909101945090925082915084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806104ab5750604081205460078054909190811015610002579082526003026000805160206111d1833981519152015460a060020a900460ff16155b15610ce557610002565b6100b960043560243560443560005433600160a060020a03908116911614610b1857610002565b604080516020604435600481810135601f810184900484028501840190955284845261077594813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a031660009081526006602052604081205481908114806105835750604081205460078054909190811015610002579082526003026000805160206111d18339815191520181505460a060020a900460ff16155b15610f1d57610002565b604080516020606435600481810135601f81018490048402850184019095528484526107759481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600460005086815481101561000257908252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01815090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005054149150610cdc565b6100b960043560005433600160a060020a03908116911614610f0857610002565b604051808a600160a060020a031681526020018981526020018060200188815260200187815260200186815260200185815260200184815260200183815260200182810382528981815460018160011615610100020316600290048152602001915080546001816001161561010002031660029004801561075e5780601f106107335761010080835404028352916020019161075e565b820191906000526020600020905b81548152906001019060200180831161074157829003601f168201915b50509a505050505050505050505060405180910390f35b60408051918252519081900360200190f35b60408051600160a060020a038616815260208101859052606081018390526080918101828152845460026001821615610100026000190190911604928201839052909160a08301908590801561081e5780601f106107f35761010080835404028352916020019161081e565b820191906000526020600020905b81548152906001019060200180831161080157829003601f168201915b50509550505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b600160a060020a03851660009081526006602052604081205414156108a957604060002060078054918290556001820180825582801582901161095c5760030281600302836000526020600020918201910161095c9190610a4f565b600160a060020a03851660009081526006602052604090205460078054919350908390811015610002575060005250600381026000805160206111d183398151915201805474ff0000000000000000000000000000000000000000191660a060020a85021781555b60408051600160a060020a03871681526020810186905281517f27b022af4a8347100c7a041ce5ccf8e14d644ff05de696315196faae8cd50c9b929181900390910190a15050505050565b505050915081506080604051908101604052808681526020018581526020018481526020014281526020015060076000508381548110156100025790600052602060002090600302016000508151815460208481015160a060020a02600160a060020a03199290921690921774ff00000000000000000000000000000000000000001916178255604083015180516001848101805460008281528690209195600293821615610100026000190190911692909204601f90810183900482019491929190910190839010610ad357805160ff19168380011785555b50610b03929150610abb565b5050600060028201556001015b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610aa15750610a42565b601f016020900490600052602060002090810190610a4291905b80821115610acf5760008155600101610abb565b5090565b82800160010185558215610a36579182015b82811115610a36578251826000505591602001919060010190610ae5565b50506060919091015160029190910155610911565b600183905560028290556003819055604080518481526020810184905280820183905290517fa439d3fa452be5e0e1e24a8145e715f4fd8b9c08c96a42fd82a855a85e5d57de9181900360600190a1505050565b50508585846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160070160005081905550600260005054603c024201816003016000508190555060008160040160006101000a81548160ff0219169083021790555060008160040160016101000a81548160ff02191690830217905550600081600501600050819055507f646fec02522b41e7125cfc859a64fd4f4cefd5dc3b6237ca0abe251ded1fa881828787876040518085815260200184600160a060020a03168152602001838152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015610cc45780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1600182016005555b50949350505050565b6004805460018101808355909190828015829011610d1c57600a0281600a028360005260206000209182019101610d1c9190610db8565b505060048054929450918491508110156100025790600052602060002090600a02016000508054600160a060020a031916871781556001818101879055855160028381018054600082815260209081902096975091959481161561010002600019011691909104601f90810182900484019391890190839010610ed857805160ff19168380011785555b50610b6c929150610abb565b50506001015b80821115610acf578054600160a060020a03191681556000600182810182905560028381018054848255909281161561010002600019011604601f819010610e9c57505b5060006003830181905560048301805461ffff191690556005830181905560068301819055600783018190556008830180548282559082526020909120610db2916002028101905b80821115610acf57805474ffffffffffffffffffffffffffffffffffffffffff1916815560018181018054600080835592600290821615610100026000190190911604601f819010610eba57505b5050600101610e44565b601f016020900490600052602060002090810190610dfc9190610abb565b601f016020900490600052602060002090810190610e929190610abb565b82800160010185558215610da6579182015b82811115610da6578251826000505591602001919060010190610eea565b60008054600160a060020a0319168217905550565b600480548690811015610002576000918252600a027f8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b01905033600160a060020a0316600090815260098201602052604090205490915060ff1660011415610f8457610002565b33600160a060020a031660009081526009820160205260409020805460ff1916600190811790915560058201805490910190558315610fcd576006810180546001019055610fda565b6006810180546000190190555b7fc34f869b7ff431b034b7b9aea9822dac189a685e0b015c7d1be3add3f89128e8858533866040518085815260200184815260200183600160a060020a03168152602001806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f16801561107a5780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a1509392505050565b6006810154600354901315611158578060000160009054906101000a9004600160a060020a0316600160a060020a03168160010160005054670de0b6b3a76400000284604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156111225780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f15050505060048101805460ff191660011761ff00191661010017905561116d565b60048101805460ff191660011761ff00191690555b60068101546005820154600483015460408051888152602081019490945283810192909252610100900460ff166060830152517fd220b7272a8b6d0d7d6bcdace67b936a8f175e6d5c1b3ee438b72256b32ab3af9181900360800190a1509291505056a66cc928b5edb82af9bd49922954155ab7b0942694bea4ce44661d9a8736c688`}, []string{`[{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"proposals","outputs":[{"name":"recipient","type":"address"},{"name":"amount","type":"uint256"},{"name":"description","type":"string"},{"name":"votingDeadline","type":"uint256"},{"name":"executed","type":"bool"},{"name":"proposalPassed","type":"bool"},{"name":"numberOfVotes","type":"uint256"},{"name":"currentResult","type":"int256"},{"name":"proposalHash","type":"bytes32"}],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"executeProposal","outputs":[{"name":"result","type":"int256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"memberId","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"numProposals","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"","type":"uint256"}],"name":"members","outputs":[{"name":"member","type":"address"},{"name":"canVote","type":"bool"},{"name":"name","type":"string"},{"name":"memberSince","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"debatingPeriodInMinutes","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"minimumQuorum","outputs":[{"name":"","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"type":"function"},{"constant":false,"inputs":[{"name":"targetMember","type":"address"},{"name":"canVote","type":"bool"},{"name":"memberName","type":"string"}],"name":"changeMembership","outputs":[],"type":"function"},{"constant":true,"inputs":[],"name":"majorityMargin","outputs":[{"name":"","type":"int256"}],"type":"function"},{"constant":false,"inputs":[{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"JobDescription","type":"string"},{"name":"transactionBytecode","type":"bytes"}],"name":"newProposal","outputs":[{"name":"proposalID","type":"uint256"}],"type":"function"},{"constant":false,"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"}],"name":"changeVotingRules","outputs":[],"type":"function"},{"constant":false,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"supportsProposal","type":"bool"},{"name":"justificationText","type":"string"}],"name":"vote","outputs":[{"name":"voteID","type":"uint256"}],"type":"function"},{"constant":true,"inputs":[{"name":"proposalNumber","type":"uint256"},{"name":"beneficiary","type":"address"},{"name":"etherAmount","type":"uint256"},{"name":"transactionBytecode","type":"bytes"}],"name":"checkProposalCode","outputs":[{"name":"codeChecksOut","type":"bool"}],"type":"function"},{"constant":false,"inputs":[{"name":"newOwner","type":"address"}],"name":"transferOwnership","outputs":[],"type":"function"},{"inputs":[{"name":"minimumQuorumForProposals","type":"uint256"},{"name":"minutesForDebate","type":"uint256"},{"name":"marginOfVotesForMajority","type":"int256"},{"name":"congressLeader","type":"address"}],"type":"constructor"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"recipient","type":"address"},{"indexed":false,"name":"amount","type":"uint256"},{"indexed":false,"name":"description","type":"string"}],"name":"ProposalAdded","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"position","type":"bool"},{"indexed":false,"name":"voter","type":"address"},{"indexed":false,"name":"justification","type":"string"}],"name":"Voted","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"proposalID","type":"uint256"},{"indexed":false,"name":"result","type":"int256"},{"indexed":false,"name":"quorum","type":"uint256"},{"indexed":false,"name":"active","type":"bool"}],"name":"ProposalTallied","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"member","type":"address"},{"indexed":false,"name":"isMember","type":"bool"}],"name":"MembershipChanged","type":"event"},{"anonymous":false,"inputs":[{"indexed":false,"name":"minimumQuorum","type":"uint256"},{"indexed":false,"name":"debatingPeriodInMinutes","type":"uint256"},{"indexed":false,"name":"majorityMargin","type":"int256"}],"name":"ChangeOfRules","type":"event"}]`}, - `libcommon "github.com/ledgerwatch/erigon-lib/common"`, + `libcommon "github.com/erigontech/erigon-lib/common"`, ` if b, err := NewDAO(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -132,7 +132,7 @@ var bindTests = []struct { ` "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" `, `if b, err := NewInputChecker(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -170,7 +170,7 @@ var bindTests = []struct { ` "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" `, `if b, err := NewOutputChecker(libcommon.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -211,7 +211,7 @@ var bindTests = []struct { "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" `, `if e, err := NewEventChecker(libcommon.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -291,10 +291,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -346,10 +346,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -392,10 +392,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -449,11 +449,11 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -498,10 +498,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -564,10 +564,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -609,10 +609,10 @@ var bindTests = []struct { []string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`}, []string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`}, ` - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -648,10 +648,10 @@ var bindTests = []struct { []string{`6080604052348015600f57600080fd5b5060888061001e6000396000f3fe6080604052348015600f57600080fd5b506004361060285760003560e01c8063d5f6622514602d575b600080fd5b6033604c565b6040805192835260208301919091528051918290030190f35b600a809156fea264697066735822beefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeefbeef64736f6c6343decafe0033`}, []string{`[{"inputs":[],"name":"Struct","outputs":[{"internalType":"uint256","name":"a","type":"uint256"},{"internalType":"uint256","name":"b","type":"uint256"}],"stateMutability":"pure","type":"function"}]`}, ` - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -696,10 +696,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -745,11 +745,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -821,10 +821,10 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -914,11 +914,11 @@ var bindTests = []struct { "math/big" "time" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -1105,10 +1105,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -1240,10 +1240,10 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` @@ -1382,10 +1382,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -1448,10 +1448,10 @@ var bindTests = []struct { "math/big" "time" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Initialize test accounts @@ -1536,10 +1536,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/core" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/core" `, ` // Initialize test accounts @@ -1599,10 +1599,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/core" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/core" `, ` key, _ := crypto.GenerateKey() @@ -1661,10 +1661,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` // Generate a new random account and a funded simulator @@ -1722,10 +1722,10 @@ var bindTests = []struct { "bytes" "math/big" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" `, ` key, _ := crypto.GenerateKey() @@ -1849,7 +1849,7 @@ func TestGolangBindings(t *testing.T) { t.Fatalf("failed to convert binding test to modules: %v\n%s", err, out) } pwd, _ := os.Getwd() - replacer := exec.Command(gocmd, "mod", "edit", "-replace", "github.com/ledgerwatch/erigon="+filepath.Join(pwd, "..", "..", "..")) // Repo root + replacer := exec.Command(gocmd, "mod", "edit", "-replace", "github.com/erigontech/erigon="+filepath.Join(pwd, "..", "..", "..")) // Repo root replacer.Dir = pkg if out, err := replacer.CombinedOutput(); err != nil { t.Fatalf("failed to replace binding test dependency to current source tree: %v\n%s", err, out) diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go index 713bb27fc96..e0470c70735 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -19,7 +19,7 @@ package bind -import "github.com/ledgerwatch/erigon/accounts/abi" +import "github.com/erigontech/erigon/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -96,12 +96,12 @@ import ( "fmt" "reflect" - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounts/abi/bind/util.go b/accounts/abi/bind/util.go index 32f9556fe85..c367313688b 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -24,10 +24,10 @@ import ( "errors" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // WaitMined waits for txn to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index c748a5cc4e6..33e366126cb 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -27,14 +27,14 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/error.go b/accounts/abi/error.go index 3172a222433..fbd26fb50c8 100644 --- a/accounts/abi/error.go +++ b/accounts/abi/error.go @@ -26,9 +26,9 @@ import ( "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) type Error struct { diff --git a/accounts/abi/event.go b/accounts/abi/event.go index 36a73b1438b..1a2a8a52a18 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -23,9 +23,9 @@ import ( "fmt" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) // Event is an event potentially triggered by the EVM's LOG mechanism. The Event diff --git a/accounts/abi/event_test.go b/accounts/abi/event_test.go index 632e81150be..082b74fb1c6 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -28,12 +28,12 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/crypto" ) var jsonEventTransfer = []byte(`{ @@ -358,7 +358,7 @@ func unpackTestEventData(dest interface{}, hexData string, jsonEvent []byte, ass /* Taken from -https://github.com/ledgerwatch/erigon/pull/15568 +https://github.com/erigontech/erigon/pull/15568 */ // TestEventUnpackIndexed verifies that indexed field will be skipped by event decoder. diff --git a/accounts/abi/method.go b/accounts/abi/method.go index b25f1969c2d..069f32d00c8 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -23,7 +23,7 @@ import ( "fmt" "strings" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) // FunctionType represents different types of functions a contract might have. diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index 53c993a0bb5..cffa91337c7 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -25,9 +25,9 @@ import ( "math/big" "reflect" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" ) // packBytesSlice packs the given bytes as [L, V] as the canonical representation diff --git a/accounts/abi/pack_test.go b/accounts/abi/pack_test.go index 19094607b1f..01855e11b7a 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -31,9 +31,9 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) // TestPack tests the general pack/unpack tests in packing_test.go diff --git a/accounts/abi/packing_test.go b/accounts/abi/packing_test.go index 63c916d8042..60d41baf013 100644 --- a/accounts/abi/packing_test.go +++ b/accounts/abi/packing_test.go @@ -22,7 +22,7 @@ package abi import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) type packUnpackTest struct { diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go index e54a0a13d39..233493097cf 100644 --- a/accounts/abi/topics.go +++ b/accounts/abi/topics.go @@ -26,10 +26,10 @@ import ( "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) // MakeTopics converts a filter query argument list into a filter topic set. diff --git a/accounts/abi/topics_test.go b/accounts/abi/topics_test.go index e2e84246039..f04bed47b64 100644 --- a/accounts/abi/topics_test.go +++ b/accounts/abi/topics_test.go @@ -25,9 +25,9 @@ import ( "reflect" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) func TestMakeTopics(t *testing.T) { diff --git a/accounts/abi/type.go b/accounts/abi/type.go index 6ff822472c2..25c9f45c461 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -27,7 +27,7 @@ import ( "strconv" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // Type enumerator diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index 4e043e6ef5a..9a0816d691e 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -25,7 +25,7 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // typeWithoutStringer is a alias for the Type type which simply doesn't implement diff --git a/accounts/abi/unpack.go b/accounts/abi/unpack.go index 5750e382e4a..3753c57bbdd 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -25,7 +25,7 @@ import ( "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index bb89a3c093c..9d0b7825d15 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -30,10 +30,10 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) // TestUnpack tests the general pack/unpack tests in packing_test.go diff --git a/cl/abstract/beacon_state.go b/cl/abstract/beacon_state.go index 56a71a0f928..09cbff5faab 100644 --- a/cl/abstract/beacon_state.go +++ b/cl/abstract/beacon_state.go @@ -17,11 +17,11 @@ package abstract import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type BeaconState interface { diff --git a/cl/abstract/mock_services/beacon_state_mutator_mock.go b/cl/abstract/mock_services/beacon_state_mutator_mock.go index ce2eedf4276..57cf3aaa560 100644 --- a/cl/abstract/mock_services/beacon_state_mutator_mock.go +++ b/cl/abstract/mock_services/beacon_state_mutator_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/abstract (interfaces: BeaconStateMutator) +// Source: github.com/erigontech/erigon/cl/abstract (interfaces: BeaconStateMutator) // // Generated by this command: // @@ -12,10 +12,10 @@ package mock_services import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - clparams "github.com/ledgerwatch/erigon/cl/clparams" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" - solid "github.com/ledgerwatch/erigon/cl/cltypes/solid" + common "github.com/erigontech/erigon-lib/common" + clparams "github.com/erigontech/erigon/cl/clparams" + cltypes "github.com/erigontech/erigon/cl/cltypes" + solid "github.com/erigontech/erigon/cl/cltypes/solid" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/abstract/mock_services/beacon_state_reader_mock.go b/cl/abstract/mock_services/beacon_state_reader_mock.go index 3f92cdb0131..d5a996a6d74 100644 --- a/cl/abstract/mock_services/beacon_state_reader_mock.go +++ b/cl/abstract/mock_services/beacon_state_reader_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/abstract (interfaces: BeaconStateReader) +// Source: github.com/erigontech/erigon/cl/abstract (interfaces: BeaconStateReader) // // Generated by this command: // @@ -12,9 +12,9 @@ package mock_services import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - clparams "github.com/ledgerwatch/erigon/cl/clparams" - solid "github.com/ledgerwatch/erigon/cl/cltypes/solid" + common "github.com/erigontech/erigon-lib/common" + clparams "github.com/erigontech/erigon/cl/clparams" + solid "github.com/erigontech/erigon/cl/cltypes/solid" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/aggregation/mock_services/aggregation_pool_mock.go b/cl/aggregation/mock_services/aggregation_pool_mock.go index 56dce309153..7946cc7d9ec 100644 --- a/cl/aggregation/mock_services/aggregation_pool_mock.go +++ b/cl/aggregation/mock_services/aggregation_pool_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/aggregation (interfaces: AggregationPool) +// Source: github.com/erigontech/erigon/cl/aggregation (interfaces: AggregationPool) // // Generated by this command: // @@ -12,8 +12,8 @@ package mock_services import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - solid "github.com/ledgerwatch/erigon/cl/cltypes/solid" + common "github.com/erigontech/erigon-lib/common" + solid "github.com/erigontech/erigon/cl/cltypes/solid" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/aggregation/pool.go b/cl/aggregation/pool.go index c2ebbc3b4de..e020c5488b1 100644 --- a/cl/aggregation/pool.go +++ b/cl/aggregation/pool.go @@ -17,8 +17,8 @@ package aggregation import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" ) //go:generate mockgen -typed=true -destination=./mock_services/aggregation_pool_mock.go -package=mock_services . AggregationPool diff --git a/cl/aggregation/pool_impl.go b/cl/aggregation/pool_impl.go index 24d4824a82d..5cdef889808 100644 --- a/cl/aggregation/pool_impl.go +++ b/cl/aggregation/pool_impl.go @@ -23,11 +23,11 @@ import ( "time" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) var ErrIsSuperset = fmt.Errorf("attestation is superset of existing attestation") diff --git a/cl/aggregation/pool_test.go b/cl/aggregation/pool_test.go index f4923f940aa..b3ca825f762 100644 --- a/cl/aggregation/pool_test.go +++ b/cl/aggregation/pool_test.go @@ -21,7 +21,7 @@ import ( "log" "testing" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/suite" ) diff --git a/cl/antiquary/antiquary.go b/cl/antiquary/antiquary.go index 7fc345834d0..518c74a185f 100644 --- a/cl/antiquary/antiquary.go +++ b/cl/antiquary/antiquary.go @@ -24,18 +24,18 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader/snaptype" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) const safetyMargin = 2_000 // We retire snapshots 2k blocks after the finalized head diff --git a/cl/antiquary/beacon_states_collector.go b/cl/antiquary/beacon_states_collector.go index 67b345a3e2c..9ad867c2ee9 100644 --- a/cl/antiquary/beacon_states_collector.go +++ b/cl/antiquary/beacon_states_collector.go @@ -23,17 +23,17 @@ import ( "github.com/klauspost/compress/zstd" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/transition/impl/eth2" ) var stateAntiquaryBufSz = etl.BufferOptimalSize / 8 // 18 collectors * 256mb / 8 = 512mb in worst case diff --git a/cl/antiquary/state_antiquary.go b/cl/antiquary/state_antiquary.go index 1528c344395..26c302f032b 100644 --- a/cl/antiquary/state_antiquary.go +++ b/cl/antiquary/state_antiquary.go @@ -25,23 +25,23 @@ import ( "github.com/klauspost/compress/zstd" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/persistence/state/historical_states_reader" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/raw" - "github.com/ledgerwatch/erigon/cl/transition" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/persistence/state/historical_states_reader" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/raw" + "github.com/erigontech/erigon/cl/transition" + "github.com/erigontech/erigon/cl/transition/impl/eth2" ) // pool for buffers diff --git a/cl/antiquary/state_antiquary_test.go b/cl/antiquary/state_antiquary_test.go index d07419e40e7..2213457a8ac 100644 --- a/cl/antiquary/state_antiquary_test.go +++ b/cl/antiquary/state_antiquary_test.go @@ -25,14 +25,14 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func runTest(t *testing.T, blocks []*cltypes.SignedBeaconBlock, preState, postState *state.CachingBeaconState) { diff --git a/cl/antiquary/tests/tests.go b/cl/antiquary/tests/tests.go index 61ee795200b..feacc4c31c1 100644 --- a/cl/antiquary/tests/tests.go +++ b/cl/antiquary/tests/tests.go @@ -23,14 +23,14 @@ import ( "strconv" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/antiquary/utils.go b/cl/antiquary/utils.go index f39fe37158d..446ebff7298 100644 --- a/cl/antiquary/utils.go +++ b/cl/antiquary/utils.go @@ -21,12 +21,12 @@ import ( "encoding/binary" "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" ) func getProposerDutiesValue(s *state.CachingBeaconState) []byte { diff --git a/cl/beacon/beaconevents/emitter_test.go b/cl/beacon/beaconevents/emitter_test.go index 80569a913f8..32a4848c9c9 100644 --- a/cl/beacon/beaconevents/emitter_test.go +++ b/cl/beacon/beaconevents/emitter_test.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "testing" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/beaconevents" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/beaconhttp/api.go b/cl/beacon/beaconhttp/api.go index 888aa71a64d..262f66feb7d 100644 --- a/cl/beacon/beaconhttp/api.go +++ b/cl/beacon/beaconhttp/api.go @@ -25,9 +25,9 @@ import ( "slices" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph" ) var _ error = EndpointError{} diff --git a/cl/beacon/beaconhttp/args.go b/cl/beacon/beaconhttp/args.go index 0898e2caa60..d4ff2c04171 100644 --- a/cl/beacon/beaconhttp/args.go +++ b/cl/beacon/beaconhttp/args.go @@ -24,7 +24,8 @@ import ( "strings" "github.com/go-chi/chi/v5" - "github.com/ledgerwatch/erigon-lib/common" + + "github.com/erigontech/erigon-lib/common" ) type chainTag int diff --git a/cl/beacon/beaconhttp/beacon_response.go b/cl/beacon/beaconhttp/beacon_response.go index 7636c91ae37..4fc054b004b 100644 --- a/cl/beacon/beaconhttp/beacon_response.go +++ b/cl/beacon/beaconhttp/beacon_response.go @@ -20,8 +20,8 @@ import ( "encoding/json" "net/http" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/clparams" ) type BeaconResponse struct { diff --git a/cl/beacon/beacontest/harness_test.go b/cl/beacon/beacontest/harness_test.go index 5ca846611ee..4bad2afad09 100644 --- a/cl/beacon/beacontest/harness_test.go +++ b/cl/beacon/beacontest/harness_test.go @@ -20,7 +20,7 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon/cl/beacon/beacontest" + "github.com/erigontech/erigon/cl/beacon/beacontest" ) //go:embed harness_test_data.yml diff --git a/cl/beacon/builder/client.go b/cl/beacon/builder/client.go index b2a651becfc..8a64d426995 100644 --- a/cl/beacon/builder/client.go +++ b/cl/beacon/builder/client.go @@ -26,11 +26,11 @@ import ( "net/http" "net/url" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" ) var _ BuilderClient = &builderClient{} diff --git a/cl/beacon/builder/client_test.go b/cl/beacon/builder/client_test.go index 7e61f397436..a4414c238f9 100644 --- a/cl/beacon/builder/client_test.go +++ b/cl/beacon/builder/client_test.go @@ -27,10 +27,10 @@ import ( "net/url" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/builder/interface.go b/cl/beacon/builder/interface.go index 03a03c0951a..f65d138ac9b 100644 --- a/cl/beacon/builder/interface.go +++ b/cl/beacon/builder/interface.go @@ -19,9 +19,9 @@ package builder import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" ) //go:generate mockgen -typed=true -destination=./mock_services/builder_client_mock.go -package=mock_services . BuilderClient diff --git a/cl/beacon/builder/mock_services/builder_client_mock.go b/cl/beacon/builder/mock_services/builder_client_mock.go index f388af423d5..0fc8705f3c0 100644 --- a/cl/beacon/builder/mock_services/builder_client_mock.go +++ b/cl/beacon/builder/mock_services/builder_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/beacon/builder (interfaces: BuilderClient) +// Source: github.com/erigontech/erigon/cl/beacon/builder (interfaces: BuilderClient) // // Generated by this command: // @@ -13,10 +13,10 @@ import ( context "context" reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - builder "github.com/ledgerwatch/erigon/cl/beacon/builder" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" - engine_types "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + common "github.com/erigontech/erigon-lib/common" + builder "github.com/erigontech/erigon/cl/beacon/builder" + cltypes "github.com/erigontech/erigon/cl/cltypes" + engine_types "github.com/erigontech/erigon/turbo/engineapi/engine_types" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/beacon/builder/types.go b/cl/beacon/builder/types.go index 3734e8550de..f5765cdf21c 100644 --- a/cl/beacon/builder/types.go +++ b/cl/beacon/builder/types.go @@ -20,10 +20,10 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type ExecutionHeader struct { diff --git a/cl/beacon/building/endpoints.go b/cl/beacon/building/endpoints.go index a254c305573..5143e7d2e31 100644 --- a/cl/beacon/building/endpoints.go +++ b/cl/beacon/building/endpoints.go @@ -17,8 +17,8 @@ package building import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" ) type BeaconCommitteeSubscription struct { diff --git a/cl/beacon/building/state.go b/cl/beacon/building/state.go index 3bb0db0f5ad..e48af84ab65 100644 --- a/cl/beacon/building/state.go +++ b/cl/beacon/building/state.go @@ -19,7 +19,7 @@ package building import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) type State struct { diff --git a/cl/beacon/handler/attestation_rewards.go b/cl/beacon/handler/attestation_rewards.go index 4b03dd81126..a218adf0d74 100644 --- a/cl/beacon/handler/attestation_rewards.go +++ b/cl/beacon/handler/attestation_rewards.go @@ -22,16 +22,16 @@ import ( "io" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2/statechange" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/transition/impl/eth2/statechange" + "github.com/erigontech/erigon/cl/utils" ) type IdealReward struct { diff --git a/cl/beacon/handler/blobs.go b/cl/beacon/handler/blobs.go index c0d5248ded1..fef1bf82660 100644 --- a/cl/beacon/handler/blobs.go +++ b/cl/beacon/handler/blobs.go @@ -21,10 +21,10 @@ import ( "net/http" "strconv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" ) var blobSidecarSSZLenght = (*cltypes.BlobSidecar)(nil).EncodingSizeSSZ() diff --git a/cl/beacon/handler/block_production.go b/cl/beacon/handler/block_production.go index 447f4e088e9..c6b607f8927 100644 --- a/cl/beacon/handler/block_production.go +++ b/cl/beacon/handler/block_production.go @@ -35,28 +35,28 @@ import ( "github.com/go-chi/chi/v5" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/length" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/beacon/builder" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/transition" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" - "github.com/ledgerwatch/erigon/cl/transition/machine" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/length" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/beacon/builder" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/transition" + "github.com/erigontech/erigon/cl/transition/impl/eth2" + "github.com/erigontech/erigon/cl/transition/machine" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" ) type BlockPublishingValidation string diff --git a/cl/beacon/handler/blocks.go b/cl/beacon/handler/blocks.go index 287560fced4..32c1e99d84f 100644 --- a/cl/beacon/handler/blocks.go +++ b/cl/beacon/handler/blocks.go @@ -21,11 +21,11 @@ import ( "fmt" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" ) type headerResponse struct { diff --git a/cl/beacon/handler/builder.go b/cl/beacon/handler/builder.go index d6b1b0a39aa..9f7a6e0e1da 100644 --- a/cl/beacon/handler/builder.go +++ b/cl/beacon/handler/builder.go @@ -21,13 +21,13 @@ import ( "fmt" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func (a *ApiHandler) GetEth1V1BuilderStatesExpectedWithdrawals(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) { diff --git a/cl/beacon/handler/committees.go b/cl/beacon/handler/committees.go index 22188873561..7eb38c20a6e 100644 --- a/cl/beacon/handler/committees.go +++ b/cl/beacon/handler/committees.go @@ -21,10 +21,10 @@ import ( "net/http" "strconv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" ) type committeeResponse struct { diff --git a/cl/beacon/handler/config.go b/cl/beacon/handler/config.go index 5b2e2d58e01..4716f0abaea 100644 --- a/cl/beacon/handler/config.go +++ b/cl/beacon/handler/config.go @@ -21,9 +21,9 @@ import ( "net/http" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" ) func (a *ApiHandler) getSpec(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) { diff --git a/cl/beacon/handler/data_test.go b/cl/beacon/handler/data_test.go index 56e2074bfb8..370ca2532b2 100644 --- a/cl/beacon/handler/data_test.go +++ b/cl/beacon/handler/data_test.go @@ -26,15 +26,15 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beacontest" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/lightclient_utils" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beacontest" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/lightclient_utils" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice" ) //go:embed test_data/* diff --git a/cl/beacon/handler/duties_attester.go b/cl/beacon/handler/duties_attester.go index c704f436cc6..89aac15efbb 100644 --- a/cl/beacon/handler/duties_attester.go +++ b/cl/beacon/handler/duties_attester.go @@ -22,10 +22,10 @@ import ( "net/http" "strconv" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" ) type attesterDutyResponse struct { diff --git a/cl/beacon/handler/duties_proposer.go b/cl/beacon/handler/duties_proposer.go index 3686576724c..e71a5c1fd2b 100644 --- a/cl/beacon/handler/duties_proposer.go +++ b/cl/beacon/handler/duties_proposer.go @@ -23,13 +23,13 @@ import ( "net/http" "sync" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - shuffling2 "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + shuffling2 "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) type proposerDuties struct { diff --git a/cl/beacon/handler/duties_sync.go b/cl/beacon/handler/duties_sync.go index 9bc3308bf61..02db8b35acd 100644 --- a/cl/beacon/handler/duties_sync.go +++ b/cl/beacon/handler/duties_sync.go @@ -23,10 +23,10 @@ import ( "sort" "strconv" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" ) type syncDutyResponse struct { diff --git a/cl/beacon/handler/events.go b/cl/beacon/handler/events.go index 2a4afb7e155..6ca1448ac6b 100644 --- a/cl/beacon/handler/events.go +++ b/cl/beacon/handler/events.go @@ -25,7 +25,7 @@ import ( "github.com/gfx-labs/sse" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var validTopics = map[string]struct{}{ diff --git a/cl/beacon/handler/forkchoice.go b/cl/beacon/handler/forkchoice.go index 45d5cde4a99..e5cbfe34687 100644 --- a/cl/beacon/handler/forkchoice.go +++ b/cl/beacon/handler/forkchoice.go @@ -22,7 +22,7 @@ import ( "net/http" "strconv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" ) func (a *ApiHandler) GetEthV2DebugBeaconHeads(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) { diff --git a/cl/beacon/handler/format.go b/cl/beacon/handler/format.go index fc1210ab946..5031b8ad039 100644 --- a/cl/beacon/handler/format.go +++ b/cl/beacon/handler/format.go @@ -17,7 +17,7 @@ package handler import ( - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" ) func newBeaconResponse(data any) *beaconhttp.BeaconResponse { diff --git a/cl/beacon/handler/genesis.go b/cl/beacon/handler/genesis.go index 78befd74bd7..18cd988958c 100644 --- a/cl/beacon/handler/genesis.go +++ b/cl/beacon/handler/genesis.go @@ -19,10 +19,10 @@ package handler import ( "net/http" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/utils" ) type genesisResponse struct { diff --git a/cl/beacon/handler/handler.go b/cl/beacon/handler/handler.go index 9520dd166bb..ef6cc8fc34f 100644 --- a/cl/beacon/handler/handler.go +++ b/cl/beacon/handler/handler.go @@ -22,32 +22,32 @@ import ( "github.com/go-chi/chi/v5" - "github.com/ledgerwatch/erigon-lib/common" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/aggregation" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/beacon/builder" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/persistence/state/historical_states_reader" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/phase1/network/services" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/attestation_producer" - "github.com/ledgerwatch/erigon/cl/validator/committee_subscription" - "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool" - "github.com/ledgerwatch/erigon/cl/validator/validator_params" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/common" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/aggregation" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/beacon/builder" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/persistence/state/historical_states_reader" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/phase1/network/services" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/attestation_producer" + "github.com/erigontech/erigon/cl/validator/committee_subscription" + "github.com/erigontech/erigon/cl/validator/sync_contribution_pool" + "github.com/erigontech/erigon/cl/validator/validator_params" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) const maxBlobBundleCacheSize = 48 // 8 blocks worth of blobs diff --git a/cl/beacon/handler/harness_test.go b/cl/beacon/handler/harness_test.go index d8c5171e1c9..d232ce988b6 100644 --- a/cl/beacon/handler/harness_test.go +++ b/cl/beacon/handler/harness_test.go @@ -20,8 +20,8 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon/cl/beacon/beacontest" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/beacon/beacontest" + "github.com/erigontech/erigon/cl/clparams" ) func TestHarnessPhase0(t *testing.T) { diff --git a/cl/beacon/handler/headers.go b/cl/beacon/handler/headers.go index bc4da9315bc..069ac5fb94f 100644 --- a/cl/beacon/handler/headers.go +++ b/cl/beacon/handler/headers.go @@ -20,9 +20,9 @@ import ( "fmt" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" ) func (a *ApiHandler) getHeaders(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) { diff --git a/cl/beacon/handler/lightclient.go b/cl/beacon/handler/lightclient.go index 2cf2e68d197..f14a58814b3 100644 --- a/cl/beacon/handler/lightclient.go +++ b/cl/beacon/handler/lightclient.go @@ -21,9 +21,9 @@ import ( "fmt" "net/http" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" ) func (a *ApiHandler) GetEthV1BeaconLightClientBootstrap(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) { diff --git a/cl/beacon/handler/lighthouse.go b/cl/beacon/handler/lighthouse.go index a653e1c0060..c120fcd4f48 100644 --- a/cl/beacon/handler/lighthouse.go +++ b/cl/beacon/handler/lighthouse.go @@ -20,13 +20,13 @@ import ( "fmt" "net/http" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" ) type LighthouseValidatorInclusionGlobal struct { diff --git a/cl/beacon/handler/liveness.go b/cl/beacon/handler/liveness.go index 834991b34eb..f4345e75520 100644 --- a/cl/beacon/handler/liveness.go +++ b/cl/beacon/handler/liveness.go @@ -23,11 +23,11 @@ import ( "sort" "strconv" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type live struct { diff --git a/cl/beacon/handler/node.go b/cl/beacon/handler/node.go index dccc5b36d21..c1f900a66f9 100644 --- a/cl/beacon/handler/node.go +++ b/cl/beacon/handler/node.go @@ -23,8 +23,8 @@ import ( "runtime" "strconv" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" ) /* diff --git a/cl/beacon/handler/pool.go b/cl/beacon/handler/pool.go index d85f4382e35..94300f56b9f 100644 --- a/cl/beacon/handler/pool.go +++ b/cl/beacon/handler/pool.go @@ -22,14 +22,14 @@ import ( "errors" "net/http" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/phase1/network/services" - "github.com/ledgerwatch/erigon/cl/phase1/network/subnets" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/phase1/network/services" + "github.com/erigontech/erigon/cl/phase1/network/subnets" ) func (a *ApiHandler) GetEthV1BeaconPoolVoluntaryExits(w http.ResponseWriter, r *http.Request) (*beaconhttp.BeaconResponse, error) { diff --git a/cl/beacon/handler/pool_test.go b/cl/beacon/handler/pool_test.go index 3fbb87908b6..8bbaf00e5f0 100644 --- a/cl/beacon/handler/pool_test.go +++ b/cl/beacon/handler/pool_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) func TestPoolAttesterSlashings(t *testing.T) { diff --git a/cl/beacon/handler/rewards.go b/cl/beacon/handler/rewards.go index 0478d0e2c4c..01c904d9be0 100644 --- a/cl/beacon/handler/rewards.go +++ b/cl/beacon/handler/rewards.go @@ -23,12 +23,12 @@ import ( "net/http" "sort" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/utils" ) type blockRewardsResponse struct { diff --git a/cl/beacon/handler/rewards_test.go b/cl/beacon/handler/rewards_test.go index 0f3ee2009ae..9c38e2f6664 100644 --- a/cl/beacon/handler/rewards_test.go +++ b/cl/beacon/handler/rewards_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/common" ) func TestGetBlockRewards(t *testing.T) { diff --git a/cl/beacon/handler/states.go b/cl/beacon/handler/states.go index 61be81a9251..2654fb4ee80 100644 --- a/cl/beacon/handler/states.go +++ b/cl/beacon/handler/states.go @@ -22,15 +22,15 @@ import ( "net/http" "strconv" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/utils" ) func (a *ApiHandler) blockRootFromStateId(ctx context.Context, tx kv.Tx, stateId *beaconhttp.SegmentID) (root libcommon.Hash, httpStatusErr int, err error) { diff --git a/cl/beacon/handler/states_test.go b/cl/beacon/handler/states_test.go index 2593e4b68bd..bb0c9d05f78 100644 --- a/cl/beacon/handler/states_test.go +++ b/cl/beacon/handler/states_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/common" ) func TestGetStateFork(t *testing.T) { diff --git a/cl/beacon/handler/subscription.go b/cl/beacon/handler/subscription.go index 2e6f6fc8291..9eb1e5e4fa2 100644 --- a/cl/beacon/handler/subscription.go +++ b/cl/beacon/handler/subscription.go @@ -24,13 +24,13 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/common" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/phase1/network/subnets" + "github.com/erigontech/erigon-lib/common" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/phase1/network/subnets" ) type ValidatorSyncCommitteeSubscriptionsRequest struct { diff --git a/cl/beacon/handler/utils_test.go b/cl/beacon/handler/utils_test.go index 31be92539d7..8b2636ea70c 100644 --- a/cl/beacon/handler/utils_test.go +++ b/cl/beacon/handler/utils_test.go @@ -25,28 +25,28 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/persistence/state/historical_states_reader" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - mock_services2 "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/phase1/network/services/mock_services" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/validator_params" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/persistence/state/historical_states_reader" + "github.com/erigontech/erigon/cl/phase1/core/state" + mock_services2 "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/phase1/network/services/mock_services" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/validator_params" ) func setupTestingHandler(t *testing.T, v clparams.StateVersion, logger log.Logger) (db kv.RwDB, blocks []*cltypes.SignedBeaconBlock, f afero.Fs, preState, postState *state.CachingBeaconState, h *ApiHandler, opPool pool.OperationsPool, syncedData *synced_data.SyncedDataManager, fcu *mock_services2.ForkChoiceStorageMock, vp *validator_params.ValidatorParams) { diff --git a/cl/beacon/handler/validator_registration.go b/cl/beacon/handler/validator_registration.go index 05aeee0b630..89291b8d8ab 100644 --- a/cl/beacon/handler/validator_registration.go +++ b/cl/beacon/handler/validator_registration.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) type ValidatorPreparationPayload struct { diff --git a/cl/beacon/handler/validator_registration_test.go b/cl/beacon/handler/validator_registration_test.go index 55bc634e19f..904ecdb8b20 100644 --- a/cl/beacon/handler/validator_registration_test.go +++ b/cl/beacon/handler/validator_registration_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" ) func TestPostEthV1ValidatorPreparation(t *testing.T) { diff --git a/cl/beacon/handler/validator_test.go b/cl/beacon/handler/validator_test.go index 12f7293c517..5a892090e08 100644 --- a/cl/beacon/handler/validator_test.go +++ b/cl/beacon/handler/validator_test.go @@ -23,12 +23,12 @@ import ( "net/http/httptest" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - mockaggregation "github.com/ledgerwatch/erigon/cl/aggregation/mock_services" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/common" + libcommon "github.com/erigontech/erigon-lib/common" + mockaggregation "github.com/erigontech/erigon/cl/aggregation/mock_services" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/common" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" ) diff --git a/cl/beacon/handler/validators.go b/cl/beacon/handler/validators.go index 0b18987a347..918016972ff 100644 --- a/cl/beacon/handler/validators.go +++ b/cl/beacon/handler/validators.go @@ -30,15 +30,15 @@ import ( "github.com/pkg/errors" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" ) var stringsBuilderPool = sync.Pool{ diff --git a/cl/beacon/router.go b/cl/beacon/router.go index 275c44034fb..4d21fcd28e4 100644 --- a/cl/beacon/router.go +++ b/cl/beacon/router.go @@ -25,9 +25,9 @@ import ( "github.com/go-chi/chi/v5" "github.com/go-chi/cors" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/beacon/handler" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/beacon/handler" ) type LayeredBeaconHandler struct { diff --git a/cl/beacon/synced_data/interface.go b/cl/beacon/synced_data/interface.go index 5482a7bc26f..82e1b31b425 100644 --- a/cl/beacon/synced_data/interface.go +++ b/cl/beacon/synced_data/interface.go @@ -17,8 +17,8 @@ package synced_data import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/phase1/core/state" ) //go:generate mockgen -typed=true -destination=./mock_services/synced_data_mock.go -package=mock_services . SyncedData diff --git a/cl/beacon/synced_data/mock_services/synced_data_mock.go b/cl/beacon/synced_data/mock_services/synced_data_mock.go index 819fb61e280..2d85bccb5be 100644 --- a/cl/beacon/synced_data/mock_services/synced_data_mock.go +++ b/cl/beacon/synced_data/mock_services/synced_data_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/beacon/synced_data (interfaces: SyncedData) +// Source: github.com/erigontech/erigon/cl/beacon/synced_data (interfaces: SyncedData) // // Generated by this command: // @@ -12,8 +12,8 @@ package mock_services import ( reflect "reflect" - abstract "github.com/ledgerwatch/erigon/cl/abstract" - state "github.com/ledgerwatch/erigon/cl/phase1/core/state" + abstract "github.com/erigontech/erigon/cl/abstract" + state "github.com/erigontech/erigon/cl/phase1/core/state" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/beacon/synced_data/synced_data.go b/cl/beacon/synced_data/synced_data.go index 7b766e85d1b..8b4d5cba2fe 100644 --- a/cl/beacon/synced_data/synced_data.go +++ b/cl/beacon/synced_data/synced_data.go @@ -19,9 +19,9 @@ package synced_data import ( "sync/atomic" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" ) type SyncedDataManager struct { diff --git a/cl/clparams/config.go b/cl/clparams/config.go index f8c8ea0f574..357e8f9e47b 100644 --- a/cl/clparams/config.go +++ b/cl/clparams/config.go @@ -28,10 +28,10 @@ import ( "gopkg.in/yaml.v2" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" ) type CaplinConfig struct { diff --git a/cl/clparams/initial_state/initial_state.go b/cl/clparams/initial_state/initial_state.go index c46e96ab074..42a3ed2445b 100644 --- a/cl/clparams/initial_state/initial_state.go +++ b/cl/clparams/initial_state/initial_state.go @@ -19,9 +19,9 @@ package initial_state import ( _ "embed" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams" ) //go:embed mainnet.state.ssz diff --git a/cl/clparams/initial_state/initial_state_test.go b/cl/clparams/initial_state/initial_state_test.go index 53147192636..bc3e4d89c35 100644 --- a/cl/clparams/initial_state/initial_state_test.go +++ b/cl/clparams/initial_state/initial_state_test.go @@ -19,9 +19,9 @@ package initial_state_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" "github.com/stretchr/testify/assert" ) diff --git a/cl/clstages/clstages.go b/cl/clstages/clstages.go index d6e530da5e4..99bc7450467 100644 --- a/cl/clstages/clstages.go +++ b/cl/clstages/clstages.go @@ -22,7 +22,7 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type StageGraph[CONFIG any, ARGUMENTS any] struct { diff --git a/cl/cltypes/aggregate.go b/cl/cltypes/aggregate.go index f3258f24d90..be316654005 100644 --- a/cl/cltypes/aggregate.go +++ b/cl/cltypes/aggregate.go @@ -17,10 +17,10 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) /* diff --git a/cl/cltypes/beacon_block.go b/cl/cltypes/beacon_block.go index 6156c4355ba..aa8a9f8f063 100644 --- a/cl/cltypes/beacon_block.go +++ b/cl/cltypes/beacon_block.go @@ -20,14 +20,14 @@ import ( "encoding/json" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) var ( diff --git a/cl/cltypes/beacon_block_blinded.go b/cl/cltypes/beacon_block_blinded.go index c86955f4154..c9adcbad6e2 100644 --- a/cl/cltypes/beacon_block_blinded.go +++ b/cl/cltypes/beacon_block_blinded.go @@ -19,14 +19,14 @@ package cltypes import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) // make sure that the type implements the interface ssz2.ObjectSSZ diff --git a/cl/cltypes/beacon_block_interface.go b/cl/cltypes/beacon_block_interface.go index d2234c87d5e..4d5bf1e5d78 100644 --- a/cl/cltypes/beacon_block_interface.go +++ b/cl/cltypes/beacon_block_interface.go @@ -1,9 +1,9 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type GenericBeaconBlock interface { diff --git a/cl/cltypes/beacon_block_test.go b/cl/cltypes/beacon_block_test.go index 0583ac7e474..b025c46ca32 100644 --- a/cl/cltypes/beacon_block_test.go +++ b/cl/cltypes/beacon_block_test.go @@ -23,12 +23,13 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/core/types" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/core/types" ) //go:embed testdata/block_test_gnosis_deneb.json diff --git a/cl/cltypes/beacon_header.go b/cl/cltypes/beacon_header.go index 8f5c21bfd9d..69aa39123e2 100644 --- a/cl/cltypes/beacon_header.go +++ b/cl/cltypes/beacon_header.go @@ -17,11 +17,11 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) /* diff --git a/cl/cltypes/beacon_kzgcommitment.go b/cl/cltypes/beacon_kzgcommitment.go index f5b16e8101d..8d28f684fef 100644 --- a/cl/cltypes/beacon_kzgcommitment.go +++ b/cl/cltypes/beacon_kzgcommitment.go @@ -21,11 +21,11 @@ import ( "reflect" gokzg4844 "github.com/crate-crypto/go-kzg-4844" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) var ( diff --git a/cl/cltypes/beacon_kzgcommitment_test.go b/cl/cltypes/beacon_kzgcommitment_test.go index 7a8ae586208..d24d8b20f51 100644 --- a/cl/cltypes/beacon_kzgcommitment_test.go +++ b/cl/cltypes/beacon_kzgcommitment_test.go @@ -19,8 +19,8 @@ package cltypes_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/merkle_tree" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/blob_sidecar.go b/cl/cltypes/blob_sidecar.go index 5c8031f66af..a5d7f436907 100644 --- a/cl/cltypes/blob_sidecar.go +++ b/cl/cltypes/blob_sidecar.go @@ -19,14 +19,14 @@ package cltypes import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/utils" ) const CommitmentBranchSize = 17 diff --git a/cl/cltypes/block_production.go b/cl/cltypes/block_production.go index cbb175308d3..3c55e56b857 100644 --- a/cl/cltypes/block_production.go +++ b/cl/cltypes/block_production.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" ) // BlindOrExecutionBeaconBlock is a union type that can be either a BlindedBeaconBlock or a BeaconBlock, depending on the context. diff --git a/cl/cltypes/bls_to_execution_change.go b/cl/cltypes/bls_to_execution_change.go index 449f9c7e49b..00bd1bb0fe4 100644 --- a/cl/cltypes/bls_to_execution_change.go +++ b/cl/cltypes/bls_to_execution_change.go @@ -19,10 +19,10 @@ package cltypes import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) // Change to EL engine diff --git a/cl/cltypes/bls_to_execution_test.go b/cl/cltypes/bls_to_execution_test.go index 364e2347141..9ba554eb1d3 100644 --- a/cl/cltypes/bls_to_execution_test.go +++ b/cl/cltypes/bls_to_execution_test.go @@ -19,10 +19,10 @@ package cltypes_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/builder.go b/cl/cltypes/builder.go index 99c2e6b2ca4..300e69f4514 100644 --- a/cl/cltypes/builder.go +++ b/cl/cltypes/builder.go @@ -16,7 +16,7 @@ package cltypes -import libcommon "github.com/ledgerwatch/erigon-lib/common" +import libcommon "github.com/erigontech/erigon-lib/common" // ValidatorRegistration is used as request payload for validator registration in builder client. type ValidatorRegistration struct { diff --git a/cl/cltypes/clone.go b/cl/cltypes/clone.go index 4aef610ac80..51adf5cf6fb 100644 --- a/cl/cltypes/clone.go +++ b/cl/cltypes/clone.go @@ -17,7 +17,7 @@ package cltypes import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/clonable" ) func (s *SignedBeaconBlock) Clone() clonable.Clonable { diff --git a/cl/cltypes/contribution.go b/cl/cltypes/contribution.go index c770f5240dc..f1c1244c55d 100644 --- a/cl/cltypes/contribution.go +++ b/cl/cltypes/contribution.go @@ -17,12 +17,12 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) var _ ssz2.SizedObjectSSZ = (*ContributionAndProof)(nil) diff --git a/cl/cltypes/eth1_block.go b/cl/cltypes/eth1_block.go index f7bbb203c32..c2686a3a0e2 100644 --- a/cl/cltypes/eth1_block.go +++ b/cl/cltypes/eth1_block.go @@ -22,16 +22,17 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/core/types" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/core/types" ) // ETH1Block represents a block structure CL-side. diff --git a/cl/cltypes/eth1_data.go b/cl/cltypes/eth1_data.go index d451a3d0fd0..b87c19d3445 100644 --- a/cl/cltypes/eth1_data.go +++ b/cl/cltypes/eth1_data.go @@ -17,11 +17,11 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) type Eth1Data struct { diff --git a/cl/cltypes/eth1_data_test.go b/cl/cltypes/eth1_data_test.go index 2a06d4b673d..8553e468edd 100644 --- a/cl/cltypes/eth1_data_test.go +++ b/cl/cltypes/eth1_data_test.go @@ -19,11 +19,11 @@ package cltypes_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" ) var testEth1Data = &cltypes.Eth1Data{ diff --git a/cl/cltypes/eth1_header.go b/cl/cltypes/eth1_header.go index 07e110dbf8f..b2209e52970 100644 --- a/cl/cltypes/eth1_header.go +++ b/cl/cltypes/eth1_header.go @@ -21,15 +21,16 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/core/types" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/core/types" ) // ETH1Header represents the ethereum 1 header structure CL-side. diff --git a/cl/cltypes/eth1_header_test.go b/cl/cltypes/eth1_header_test.go index 0b5efcafde1..23780cd736b 100644 --- a/cl/cltypes/eth1_header_test.go +++ b/cl/cltypes/eth1_header_test.go @@ -19,10 +19,10 @@ package cltypes import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/core/types" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/fork.go b/cl/cltypes/fork.go index 0c6e3785484..7a00b68280d 100644 --- a/cl/cltypes/fork.go +++ b/cl/cltypes/fork.go @@ -17,9 +17,9 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) // Fork data, contains if we were on bellatrix/alteir/phase0 and transition epoch. diff --git a/cl/cltypes/fork_test.go b/cl/cltypes/fork_test.go index 26e9a1fb2e2..5099ca1984e 100644 --- a/cl/cltypes/fork_test.go +++ b/cl/cltypes/fork_test.go @@ -19,9 +19,9 @@ package cltypes_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/historical_summary.go b/cl/cltypes/historical_summary.go index 4600e38c31e..a49d529d565 100644 --- a/cl/cltypes/historical_summary.go +++ b/cl/cltypes/historical_summary.go @@ -17,11 +17,11 @@ package cltypes import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) type HistoricalSummary struct { diff --git a/cl/cltypes/historical_summary_test.go b/cl/cltypes/historical_summary_test.go index c6cbea57502..7a0b571b106 100644 --- a/cl/cltypes/historical_summary_test.go +++ b/cl/cltypes/historical_summary_test.go @@ -19,10 +19,10 @@ package cltypes_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/indexed_attestation.go b/cl/cltypes/indexed_attestation.go index 5bbfda52880..d9dfc7ae735 100644 --- a/cl/cltypes/indexed_attestation.go +++ b/cl/cltypes/indexed_attestation.go @@ -19,10 +19,10 @@ package cltypes import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) /* diff --git a/cl/cltypes/justification_bits.go b/cl/cltypes/justification_bits.go index e4162f23c92..b167d8e49cd 100644 --- a/cl/cltypes/justification_bits.go +++ b/cl/cltypes/justification_bits.go @@ -19,9 +19,9 @@ package cltypes import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/utils" ) const JustificationBitsLength = 4 diff --git a/cl/cltypes/justification_bits_test.go b/cl/cltypes/justification_bits_test.go index d45119874f6..9a07c5dd688 100644 --- a/cl/cltypes/justification_bits_test.go +++ b/cl/cltypes/justification_bits_test.go @@ -19,7 +19,7 @@ package cltypes_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/light_client.go b/cl/cltypes/light_client.go index 4716510f6fc..bcde90715ec 100644 --- a/cl/cltypes/light_client.go +++ b/cl/cltypes/light_client.go @@ -17,11 +17,11 @@ package cltypes import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) const ( diff --git a/cl/cltypes/lightclient_utils/lightclient.go b/cl/cltypes/lightclient_utils/lightclient.go index 70638accdb5..8aeaca88dfd 100644 --- a/cl/cltypes/lightclient_utils/lightclient.go +++ b/cl/cltypes/lightclient_utils/lightclient.go @@ -19,11 +19,11 @@ package lightclient_utils import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // def create_light_client_update(state: BeaconState, diff --git a/cl/cltypes/network.go b/cl/cltypes/network.go index a8890e1b8e8..d4bcc234d44 100644 --- a/cl/cltypes/network.go +++ b/cl/cltypes/network.go @@ -20,12 +20,12 @@ import ( "encoding/json" "strconv" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) type Metadata struct { diff --git a/cl/cltypes/network_test.go b/cl/cltypes/network_test.go index cd937e37a91..a0f4fca1174 100644 --- a/cl/cltypes/network_test.go +++ b/cl/cltypes/network_test.go @@ -19,12 +19,12 @@ package cltypes_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/ssz" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" ) var testMetadata = &cltypes.Metadata{ diff --git a/cl/cltypes/participation_flags.go b/cl/cltypes/participation_flags.go index 3f495ee4cea..351a992b68d 100644 --- a/cl/cltypes/participation_flags.go +++ b/cl/cltypes/participation_flags.go @@ -17,7 +17,7 @@ package cltypes import ( - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" ) type ParticipationFlags byte diff --git a/cl/cltypes/participation_flags_test.go b/cl/cltypes/participation_flags_test.go index 125a410fb5f..a0608e6050f 100644 --- a/cl/cltypes/participation_flags_test.go +++ b/cl/cltypes/participation_flags_test.go @@ -19,7 +19,7 @@ package cltypes_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/slashings.go b/cl/cltypes/slashings.go index 39840c3d9bf..daf8e8c3547 100644 --- a/cl/cltypes/slashings.go +++ b/cl/cltypes/slashings.go @@ -17,8 +17,8 @@ package cltypes import ( - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) type ProposerSlashing struct { diff --git a/cl/cltypes/slashings_test.go b/cl/cltypes/slashings_test.go index 9f9d22f1c75..27a28c868d2 100644 --- a/cl/cltypes/slashings_test.go +++ b/cl/cltypes/slashings_test.go @@ -19,8 +19,8 @@ package cltypes import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/attestation.go b/cl/cltypes/solid/attestation.go index 8b1411306d6..a21a64f8db5 100644 --- a/cl/cltypes/solid/attestation.go +++ b/cl/cltypes/solid/attestation.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) const ( diff --git a/cl/cltypes/solid/attestation_data.go b/cl/cltypes/solid/attestation_data.go index 36c61db6df6..a2ac144f5a6 100644 --- a/cl/cltypes/solid/attestation_data.go +++ b/cl/cltypes/solid/attestation_data.go @@ -21,11 +21,11 @@ import ( "encoding/binary" "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) // slot: 8 bytes diff --git a/cl/cltypes/solid/attestation_test.go b/cl/cltypes/solid/attestation_test.go index f37ea86f7af..45d6976698c 100644 --- a/cl/cltypes/solid/attestation_test.go +++ b/cl/cltypes/solid/attestation_test.go @@ -19,7 +19,7 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/bitlist.go b/cl/cltypes/solid/bitlist.go index 596d72355f3..ff6ed163169 100644 --- a/cl/cltypes/solid/bitlist.go +++ b/cl/cltypes/solid/bitlist.go @@ -20,10 +20,10 @@ import ( "encoding/json" "math/bits" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/utils" ) // BitList is like a dynamic binary string. It's like a flipbook of 1s and 0s! diff --git a/cl/cltypes/solid/bitlist_test.go b/cl/cltypes/solid/bitlist_test.go index a787b366eec..4d3b8462628 100644 --- a/cl/cltypes/solid/bitlist_test.go +++ b/cl/cltypes/solid/bitlist_test.go @@ -19,7 +19,7 @@ package solid_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/solid/checkpoint.go b/cl/cltypes/solid/checkpoint.go index 0320ad378b9..fd8d4c7704f 100644 --- a/cl/cltypes/solid/checkpoint.go +++ b/cl/cltypes/solid/checkpoint.go @@ -21,11 +21,11 @@ import ( "encoding/binary" "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) // Constants to represent the size and layout of a Checkpoint diff --git a/cl/cltypes/solid/checkpoint_test.go b/cl/cltypes/solid/checkpoint_test.go index f404d15ecb0..b9dea55958c 100644 --- a/cl/cltypes/solid/checkpoint_test.go +++ b/cl/cltypes/solid/checkpoint_test.go @@ -19,11 +19,11 @@ package solid_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes/solid" ) var testCheckpoint = solid.NewCheckpointFromParameters(libcommon.HexToHash("0x3"), 69) diff --git a/cl/cltypes/solid/extra_data.go b/cl/cltypes/solid/extra_data.go index 99494b596db..ee15fd64d21 100644 --- a/cl/cltypes/solid/extra_data.go +++ b/cl/cltypes/solid/extra_data.go @@ -20,11 +20,11 @@ import ( "encoding/binary" "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/merkle_tree" ) // ExtraData type stores data as a byte slice and its length. diff --git a/cl/cltypes/solid/extra_data_test.go b/cl/cltypes/solid/extra_data_test.go index f5844b60240..30c4e8d5403 100644 --- a/cl/cltypes/solid/extra_data_test.go +++ b/cl/cltypes/solid/extra_data_test.go @@ -19,7 +19,7 @@ package solid_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/solid/hash_list.go b/cl/cltypes/solid/hash_list.go index ea949f97c29..cfca7e9bcb0 100644 --- a/cl/cltypes/solid/hash_list.go +++ b/cl/cltypes/solid/hash_list.go @@ -19,13 +19,13 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/utils" ) type hashList struct { diff --git a/cl/cltypes/solid/hash_vector.go b/cl/cltypes/solid/hash_vector.go index 91d580653cc..69113b52614 100644 --- a/cl/cltypes/solid/hash_vector.go +++ b/cl/cltypes/solid/hash_vector.go @@ -19,11 +19,11 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) type hashVector struct { diff --git a/cl/cltypes/solid/hashutil_test.go b/cl/cltypes/solid/hashutil_test.go index 4415bf545ec..e75435073bb 100644 --- a/cl/cltypes/solid/hashutil_test.go +++ b/cl/cltypes/solid/hashutil_test.go @@ -19,7 +19,7 @@ package solid_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/solid/interfaces.go b/cl/cltypes/solid/interfaces.go index 12573740a4d..3b653c79b08 100644 --- a/cl/cltypes/solid/interfaces.go +++ b/cl/cltypes/solid/interfaces.go @@ -19,9 +19,9 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/ssz" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) type IterableSSZ[T any] interface { diff --git a/cl/cltypes/solid/list_ssz.go b/cl/cltypes/solid/list_ssz.go index ea06607f23b..d82ae7bb687 100644 --- a/cl/cltypes/solid/list_ssz.go +++ b/cl/cltypes/solid/list_ssz.go @@ -19,10 +19,10 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) type encodableHashableSSZ interface { diff --git a/cl/cltypes/solid/list_ssz_test.go b/cl/cltypes/solid/list_ssz_test.go index 0590af08e3e..fb310adbf54 100644 --- a/cl/cltypes/solid/list_ssz_test.go +++ b/cl/cltypes/solid/list_ssz_test.go @@ -19,7 +19,7 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/list_test.go b/cl/cltypes/solid/list_test.go index 8471ae420eb..eb31c3740e3 100644 --- a/cl/cltypes/solid/list_test.go +++ b/cl/cltypes/solid/list_test.go @@ -19,8 +19,8 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/pending_attestation.go b/cl/cltypes/solid/pending_attestation.go index 0ee3ab214cf..2168ec9cec4 100644 --- a/cl/cltypes/solid/pending_attestation.go +++ b/cl/cltypes/solid/pending_attestation.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) const ( diff --git a/cl/cltypes/solid/sync_committee.go b/cl/cltypes/solid/sync_committee.go index 0990eaa7d8d..e64d049c8bd 100644 --- a/cl/cltypes/solid/sync_committee.go +++ b/cl/cltypes/solid/sync_committee.go @@ -19,10 +19,10 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) // Whole committee(512) public key and the aggregate public key. diff --git a/cl/cltypes/solid/sync_committee_test.go b/cl/cltypes/solid/sync_committee_test.go index 9b06ebe0aa1..7b960c63923 100644 --- a/cl/cltypes/solid/sync_committee_test.go +++ b/cl/cltypes/solid/sync_committee_test.go @@ -19,8 +19,8 @@ package solid import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/cl/cltypes/solid/transactions.go b/cl/cltypes/solid/transactions.go index 1851a6a8541..6b33e0564da 100644 --- a/cl/cltypes/solid/transactions.go +++ b/cl/cltypes/solid/transactions.go @@ -19,11 +19,11 @@ package solid import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) type TransactionsSSZ struct { diff --git a/cl/cltypes/solid/uint64_list.go b/cl/cltypes/solid/uint64_list.go index ce21611806f..e728c9b5bad 100644 --- a/cl/cltypes/solid/uint64_list.go +++ b/cl/cltypes/solid/uint64_list.go @@ -19,7 +19,7 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/clonable" ) type uint64ListSSZ struct { diff --git a/cl/cltypes/solid/uint64_raw_list.go b/cl/cltypes/solid/uint64_raw_list.go index c61fb850eca..368a8d684d5 100644 --- a/cl/cltypes/solid/uint64_raw_list.go +++ b/cl/cltypes/solid/uint64_raw_list.go @@ -21,11 +21,11 @@ import ( "encoding/json" "strconv" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/utils" ) type RawUint64List struct { diff --git a/cl/cltypes/solid/uint64_vector.go b/cl/cltypes/solid/uint64_vector.go index ea55d5a045c..9422b6ed9a3 100644 --- a/cl/cltypes/solid/uint64_vector.go +++ b/cl/cltypes/solid/uint64_vector.go @@ -19,8 +19,8 @@ package solid import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" ) type uint64VectorSSZ struct { diff --git a/cl/cltypes/solid/uint64slice_byte.go b/cl/cltypes/solid/uint64slice_byte.go index e660c178527..f471e480cbb 100644 --- a/cl/cltypes/solid/uint64slice_byte.go +++ b/cl/cltypes/solid/uint64slice_byte.go @@ -22,11 +22,11 @@ import ( "encoding/json" "strconv" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/utils" ) const treeCacheDepthUint64Slice = 0 diff --git a/cl/cltypes/solid/uint64slice_byte_test.go b/cl/cltypes/solid/uint64slice_byte_test.go index 05466ba8a4a..868a88ba560 100644 --- a/cl/cltypes/solid/uint64slice_byte_test.go +++ b/cl/cltypes/solid/uint64slice_byte_test.go @@ -19,8 +19,8 @@ package solid_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/solid/validator.go b/cl/cltypes/solid/validator.go index 077e2d35ee9..02c578eaf6e 100644 --- a/cl/cltypes/solid/validator.go +++ b/cl/cltypes/solid/validator.go @@ -20,11 +20,11 @@ import ( "encoding/binary" "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" ) // PublicKey 48 diff --git a/cl/cltypes/solid/validator_set.go b/cl/cltypes/solid/validator_set.go index 262eb604494..3a5d5cd3de4 100644 --- a/cl/cltypes/solid/validator_set.go +++ b/cl/cltypes/solid/validator_set.go @@ -20,12 +20,12 @@ import ( "bytes" "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/utils" ) const ( diff --git a/cl/cltypes/solid/validator_test.go b/cl/cltypes/solid/validator_test.go index f0d6fe23024..c0d363be19c 100644 --- a/cl/cltypes/solid/validator_test.go +++ b/cl/cltypes/solid/validator_test.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/sync_aggregator_selection_data.go b/cl/cltypes/sync_aggregator_selection_data.go index d5bae112798..4ea382d5d16 100644 --- a/cl/cltypes/sync_aggregator_selection_data.go +++ b/cl/cltypes/sync_aggregator_selection_data.go @@ -17,9 +17,9 @@ package cltypes import ( - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) // SyncAggregatorSelectionData data, contains if we were on bellatrix/alteir/phase0 and transition epoch. diff --git a/cl/cltypes/validator.go b/cl/cltypes/validator.go index 8b3233b41b1..e4989afd367 100644 --- a/cl/cltypes/validator.go +++ b/cl/cltypes/validator.go @@ -19,13 +19,13 @@ package cltypes import ( "encoding/json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/merkle_tree" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) const ( diff --git a/cl/cltypes/validator_test.go b/cl/cltypes/validator_test.go index 9e008b0dd25..55285e7e05f 100644 --- a/cl/cltypes/validator_test.go +++ b/cl/cltypes/validator_test.go @@ -20,10 +20,10 @@ import ( "encoding/hex" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/cltypes/withdrawal.go b/cl/cltypes/withdrawal.go index 3d23b72a611..827dfdaaf25 100644 --- a/cl/cltypes/withdrawal.go +++ b/cl/cltypes/withdrawal.go @@ -19,11 +19,11 @@ package cltypes import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/core/types" ) type Withdrawal struct { diff --git a/cl/coverage b/cl/coverage index e15ab52882d..7aad072c57b 100644 --- a/cl/coverage +++ b/cl/coverage @@ -1,13 +1,13 @@ #!/bin/bash SKIP_TESTS=( - "github.com\/ledgerwatch\/erigon\/cl\/beacon" - "github.com\/ledgerwatch\/erigon\/cl\/phase1" - "github.com\/ledgerwatch\/erigon\/cl\/phase1\/core" - "github.com\/ledgerwatch\/erigon\/cl\/phase1\/network" - "github.com\/ledgerwatch\/erigon\/cl\/phase1\/stages" - "github.com\/ledgerwatch\/erigon\/cl\/rpc" - "github.com\/ledgerwatch\/erigon\/cl\/spectest\/consensus_tests" + "github.com\/erigontech\/erigon\/cl\/beacon" + "github.com\/erigontech\/erigon\/cl\/phase1" + "github.com\/erigontech\/erigon\/cl\/phase1\/core" + "github.com\/erigontech\/erigon\/cl\/phase1\/network" + "github.com\/erigontech\/erigon\/cl\/phase1\/stages" + "github.com\/erigontech\/erigon\/cl\/rpc" + "github.com\/erigontech\/erigon\/cl\/spectest\/consensus_tests" ) FLAGS=$(printf " -e /%s\\\t/d" "${SKIP_TESTS[@]}") diff --git a/cl/fork/fork.go b/cl/fork/fork.go index 01a451729af..bbc36608606 100644 --- a/cl/fork/fork.go +++ b/cl/fork/fork.go @@ -20,11 +20,11 @@ import ( "errors" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" ) var NO_GENESIS_TIME_ERR error = errors.New("genesis time is not set") diff --git a/cl/merkle_tree/hasher.go b/cl/merkle_tree/hasher.go index d532808a56b..c95cc488191 100644 --- a/cl/merkle_tree/hasher.go +++ b/cl/merkle_tree/hasher.go @@ -19,8 +19,8 @@ package merkle_tree import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/utils" "github.com/prysmaticlabs/gohashtree" ) diff --git a/cl/merkle_tree/list.go b/cl/merkle_tree/list.go index cadfe3e37c3..0c5748d8052 100644 --- a/cl/merkle_tree/list.go +++ b/cl/merkle_tree/list.go @@ -21,11 +21,11 @@ import ( "github.com/prysmaticlabs/gohashtree" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" ) // MerkleizeVector uses our optimized routine to hash a list of 32-byte diff --git a/cl/merkle_tree/merkle_root.go b/cl/merkle_tree/merkle_root.go index 9a45630b068..137f841415b 100644 --- a/cl/merkle_tree/merkle_root.go +++ b/cl/merkle_tree/merkle_root.go @@ -23,10 +23,10 @@ import ( "reflect" "unsafe" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/utils" "github.com/prysmaticlabs/gohashtree" ) diff --git a/cl/merkle_tree/merkle_root_test.go b/cl/merkle_tree/merkle_root_test.go index 5b55c0d5226..658aa23885e 100644 --- a/cl/merkle_tree/merkle_root_test.go +++ b/cl/merkle_tree/merkle_root_test.go @@ -20,11 +20,11 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/merkle_tree/primitives.go b/cl/merkle_tree/primitives.go index 9d469c2b79b..3d1c389fd92 100644 --- a/cl/merkle_tree/primitives.go +++ b/cl/merkle_tree/primitives.go @@ -19,8 +19,8 @@ package merkle_tree import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" ) // Uint64Root retrieves the root hash of a uint64 value by converting it to a byte array and returning it as a hash. diff --git a/cl/persistence/base_encoding/primitives.go b/cl/persistence/base_encoding/primitives.go index 8d0b4c13e2e..94454179a85 100644 --- a/cl/persistence/base_encoding/primitives.go +++ b/cl/persistence/base_encoding/primitives.go @@ -19,7 +19,7 @@ package base_encoding import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func Encode64ToBytes4(x uint64) (out []byte) { diff --git a/cl/persistence/beacon_indicies/indicies.go b/cl/persistence/beacon_indicies/indicies.go index b9ccd5d7957..ef8ace86920 100644 --- a/cl/persistence/beacon_indicies/indicies.go +++ b/cl/persistence/beacon_indicies/indicies.go @@ -23,13 +23,15 @@ import ( "sync" "github.com/klauspost/compress/zstd" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" + _ "modernc.org/sqlite" ) diff --git a/cl/persistence/beacon_indicies/indicies_test.go b/cl/persistence/beacon_indicies/indicies_test.go index 17241cb6b35..622f3637e30 100644 --- a/cl/persistence/beacon_indicies/indicies_test.go +++ b/cl/persistence/beacon_indicies/indicies_test.go @@ -20,11 +20,11 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/blob_storage/blob_db.go b/cl/persistence/blob_storage/blob_db.go index 9493ff0b86a..c3cc2593909 100644 --- a/cl/persistence/blob_storage/blob_db.go +++ b/cl/persistence/blob_storage/blob_db.go @@ -28,14 +28,14 @@ import ( "sync/atomic" gokzg4844 "github.com/crate-crypto/go-kzg-4844" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/utils/eth_clock" "github.com/spf13/afero" ) diff --git a/cl/persistence/blob_storage/blob_db_test.go b/cl/persistence/blob_storage/blob_db_test.go index 7154890fb2d..1481b65c12e 100644 --- a/cl/persistence/blob_storage/blob_db_test.go +++ b/cl/persistence/blob_storage/blob_db_test.go @@ -20,12 +20,12 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/block_store.go b/cl/persistence/block_store.go index 3abef9a49fe..b7cb1e422a2 100644 --- a/cl/persistence/block_store.go +++ b/cl/persistence/block_store.go @@ -20,10 +20,10 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/rpc" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/rpc" + "github.com/erigontech/erigon/cl/sentinel/peers" ) var _ BlockSource = (*BeaconRpcSource)(nil) diff --git a/cl/persistence/format/snapshot_format/blocks.go b/cl/persistence/format/snapshot_format/blocks.go index 455f0d1aee0..976213c685b 100644 --- a/cl/persistence/format/snapshot_format/blocks.go +++ b/cl/persistence/format/snapshot_format/blocks.go @@ -22,11 +22,11 @@ import ( "io" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type ExecutionBlockReaderByNumber interface { diff --git a/cl/persistence/format/snapshot_format/blocks_test.go b/cl/persistence/format/snapshot_format/blocks_test.go index 139687e562d..8e43e607fe1 100644 --- a/cl/persistence/format/snapshot_format/blocks_test.go +++ b/cl/persistence/format/snapshot_format/blocks_test.go @@ -21,10 +21,10 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/format/snapshot_format/getters/execution_snapshot.go b/cl/persistence/format/snapshot_format/getters/execution_snapshot.go index 50b7a9371df..53aa85eb6b8 100644 --- a/cl/persistence/format/snapshot_format/getters/execution_snapshot.go +++ b/cl/persistence/format/snapshot_format/getters/execution_snapshot.go @@ -21,14 +21,14 @@ import ( "encoding/binary" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/services" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/services" ) type ExecutionSnapshotReader struct { diff --git a/cl/persistence/format/snapshot_format/test_util.go b/cl/persistence/format/snapshot_format/test_util.go index de52b4652a6..66482fbead3 100644 --- a/cl/persistence/format/snapshot_format/test_util.go +++ b/cl/persistence/format/snapshot_format/test_util.go @@ -17,9 +17,9 @@ package snapshot_format import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type MockBlockReader struct { diff --git a/cl/persistence/interface.go b/cl/persistence/interface.go index 41c312f4116..9371ca5604a 100644 --- a/cl/persistence/interface.go +++ b/cl/persistence/interface.go @@ -19,9 +19,9 @@ package persistence import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/sentinel/peers" ) type BlockSource interface { diff --git a/cl/persistence/state/epoch_data.go b/cl/persistence/state/epoch_data.go index f4100c72397..bdd77ef860e 100644 --- a/cl/persistence/state/epoch_data.go +++ b/cl/persistence/state/epoch_data.go @@ -20,10 +20,10 @@ import ( "encoding/binary" "io" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) // EpochData stores the data for the epoch (valid throughout the epoch) diff --git a/cl/persistence/state/epoch_data_test.go b/cl/persistence/state/epoch_data_test.go index 74a74d5871e..f06b55b4505 100644 --- a/cl/persistence/state/epoch_data_test.go +++ b/cl/persistence/state/epoch_data_test.go @@ -20,9 +20,9 @@ import ( "bytes" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/state/historical_states_reader/attesting_indicies.go b/cl/persistence/state/historical_states_reader/attesting_indicies.go index 58091cab55d..1a63f09e121 100644 --- a/cl/persistence/state/historical_states_reader/attesting_indicies.go +++ b/cl/persistence/state/historical_states_reader/attesting_indicies.go @@ -19,14 +19,14 @@ package historical_states_reader import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon/cl/utils" ) func (r *HistoricalStatesReader) attestingIndicies(attestation solid.AttestationData, aggregationBits []byte, checkBitsLength bool, mix libcommon.Hash, idxs []uint64) ([]uint64, error) { diff --git a/cl/persistence/state/historical_states_reader/historical_states_reader.go b/cl/persistence/state/historical_states_reader/historical_states_reader.go index 78974202e13..0dccd54acb1 100644 --- a/cl/persistence/state/historical_states_reader/historical_states_reader.go +++ b/cl/persistence/state/historical_states_reader/historical_states_reader.go @@ -25,18 +25,17 @@ import ( "sync" "github.com/klauspost/compress/zstd" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - libcommon "github.com/ledgerwatch/erigon-lib/common" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) var buffersPool = sync.Pool{ @@ -841,7 +840,7 @@ func (r *HistoricalStatesReader) tryCachingEpochsInParallell(tx kv.Tx, activeIdx return err } - go func(mix libcommon.Hash, epoch uint64, idxs []uint64) { + go func(mix common.Hash, epoch uint64, idxs []uint64) { defer wg.Done() _, _ = r.ComputeCommittee(mix, idxs, epoch*r.cfg.SlotsPerEpoch, r.cfg.TargetCommitteeSize, 0) @@ -870,18 +869,18 @@ func (r *HistoricalStatesReader) ReadValidatorsBalances(tx kv.Tx, slot uint64) ( return balancesList, balancesList.DecodeSSZ(balances, 0) } -func (r *HistoricalStatesReader) ReadRandaoMixBySlotAndIndex(tx kv.Tx, slot, index uint64) (libcommon.Hash, error) { +func (r *HistoricalStatesReader) ReadRandaoMixBySlotAndIndex(tx kv.Tx, slot, index uint64) (common.Hash, error) { epoch := slot / r.cfg.SlotsPerEpoch epochSubIndex := epoch % r.cfg.EpochsPerHistoricalVector if index == epochSubIndex { intraRandaoMix, err := tx.GetOne(kv.IntraRandaoMixes, base_encoding.Encode64ToBytes4(slot)) if err != nil { - return libcommon.Hash{}, err + return common.Hash{}, err } if len(intraRandaoMix) != 32 { - return libcommon.Hash{}, fmt.Errorf("invalid intra randao mix length %d", len(intraRandaoMix)) + return common.Hash{}, fmt.Errorf("invalid intra randao mix length %d", len(intraRandaoMix)) } - return libcommon.BytesToHash(intraRandaoMix), nil + return common.BytesToHash(intraRandaoMix), nil } needFromGenesis := true var epochLookup uint64 @@ -905,10 +904,10 @@ func (r *HistoricalStatesReader) ReadRandaoMixBySlotAndIndex(tx kv.Tx, slot, ind } mixBytes, err := tx.GetOne(kv.RandaoMixes, base_encoding.Encode64ToBytes4(epochLookup*r.cfg.SlotsPerEpoch)) if err != nil { - return libcommon.Hash{}, err + return common.Hash{}, err } if len(mixBytes) != 32 { - return libcommon.Hash{}, fmt.Errorf("invalid mix length %d", len(mixBytes)) + return common.Hash{}, fmt.Errorf("invalid mix length %d", len(mixBytes)) } - return libcommon.BytesToHash(mixBytes), nil + return common.BytesToHash(mixBytes), nil } diff --git a/cl/persistence/state/historical_states_reader/historical_states_reader_test.go b/cl/persistence/state/historical_states_reader/historical_states_reader_test.go index d45b1c5d1ac..a153f812cd2 100644 --- a/cl/persistence/state/historical_states_reader/historical_states_reader_test.go +++ b/cl/persistence/state/historical_states_reader/historical_states_reader_test.go @@ -22,17 +22,17 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/persistence/state/historical_states_reader" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/persistence/state/historical_states_reader" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func runTest(t *testing.T, blocks []*cltypes.SignedBeaconBlock, preState, postState *state.CachingBeaconState) { diff --git a/cl/persistence/state/slot_data.go b/cl/persistence/state/slot_data.go index cb1bc323404..eca6c12c073 100644 --- a/cl/persistence/state/slot_data.go +++ b/cl/persistence/state/slot_data.go @@ -21,10 +21,10 @@ import ( "errors" "io" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + ssz2 "github.com/erigontech/erigon/cl/ssz" ) type SlotData struct { diff --git a/cl/persistence/state/slot_data_test.go b/cl/persistence/state/slot_data_test.go index fabc0ed7f59..886b4417cba 100644 --- a/cl/persistence/state/slot_data_test.go +++ b/cl/persistence/state/slot_data_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/state/state_accessors.go b/cl/persistence/state/state_accessors.go index f151e2c3139..e913d98bcca 100644 --- a/cl/persistence/state/state_accessors.go +++ b/cl/persistence/state/state_accessors.go @@ -19,13 +19,13 @@ package state_accessors import ( "bytes" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + "github.com/erigontech/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // InitializeValidatorTable initializes the validator table in the database. diff --git a/cl/persistence/state/static_validator_table.go b/cl/persistence/state/static_validator_table.go index d04aa68ea63..4bc10abe985 100644 --- a/cl/persistence/state/static_validator_table.go +++ b/cl/persistence/state/static_validator_table.go @@ -21,9 +21,9 @@ import ( "io" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/ethdb/cbor" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/ethdb/cbor" ) // class Validator(Container): diff --git a/cl/persistence/state/static_validator_table_test.go b/cl/persistence/state/static_validator_table_test.go index 972d5d72658..bae2a3b6586 100644 --- a/cl/persistence/state/static_validator_table_test.go +++ b/cl/persistence/state/static_validator_table_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/state/validator_events.go b/cl/persistence/state/validator_events.go index 7372d3664d6..3c5747c8166 100644 --- a/cl/persistence/state/validator_events.go +++ b/cl/persistence/state/validator_events.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" ) // THIS IS EXPERMIENTAL, IT MAY CHANGE diff --git a/cl/persistence/state/validator_events_test.go b/cl/persistence/state/validator_events_test.go index a25830fe5f3..4c427818215 100644 --- a/cl/persistence/state/validator_events_test.go +++ b/cl/persistence/state/validator_events_test.go @@ -19,8 +19,8 @@ package state_accessors import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/checkpoint.go b/cl/phase1/core/checkpoint.go index fc36e2c127c..1a52a6cd932 100644 --- a/cl/phase1/core/checkpoint.go +++ b/cl/phase1/core/checkpoint.go @@ -23,12 +23,12 @@ import ( "io" "net/http" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" ) func extractSlotFromSerializedBeaconState(beaconState []byte) (uint64, error) { diff --git a/cl/phase1/core/rawdb/config.go b/cl/phase1/core/rawdb/config.go index 11d61d32f81..59634e0e51a 100644 --- a/cl/phase1/core/rawdb/config.go +++ b/cl/phase1/core/rawdb/config.go @@ -20,7 +20,7 @@ import ( "encoding/json" "math" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) type BeaconDataConfig struct { diff --git a/cl/phase1/core/state/accessors.go b/cl/phase1/core/state/accessors.go index b9098844f0b..47198f38fe4 100644 --- a/cl/phase1/core/state/accessors.go +++ b/cl/phase1/core/state/accessors.go @@ -21,14 +21,14 @@ import ( "fmt" "github.com/Giulio2002/bls" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/utils" ) const PreAllocatedRewardsAndPenalties = 8192 diff --git a/cl/phase1/core/state/cache.go b/cl/phase1/core/state/cache.go index 75e69a3cc5e..b36514ea549 100644 --- a/cl/phase1/core/state/cache.go +++ b/cl/phase1/core/state/cache.go @@ -22,15 +22,15 @@ import ( "io" "math" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/raw" - shuffling2 "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" - - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/phase1/core/state/raw" + shuffling2 "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" + + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" ) const ( diff --git a/cl/phase1/core/state/cache_accessors.go b/cl/phase1/core/state/cache_accessors.go index c9141464b8c..41fea3a699a 100644 --- a/cl/phase1/core/state/cache_accessors.go +++ b/cl/phase1/core/state/cache_accessors.go @@ -22,15 +22,15 @@ import ( "fmt" "math" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" - shuffling2 "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" + shuffling2 "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" "github.com/Giulio2002/bls" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" ) // these are view functions for the beacon state cache diff --git a/cl/phase1/core/state/cache_getters.go b/cl/phase1/core/state/cache_getters.go index a34a47539bc..cfe97d1a1e4 100644 --- a/cl/phase1/core/state/cache_getters.go +++ b/cl/phase1/core/state/cache_getters.go @@ -17,7 +17,7 @@ package state import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func (b *CachingBeaconState) ValidatorIndexByPubkey(key [48]byte) (uint64, bool) { diff --git a/cl/phase1/core/state/cache_mutators.go b/cl/phase1/core/state/cache_mutators.go index 24c7a95eaee..70bc41fbba2 100644 --- a/cl/phase1/core/state/cache_mutators.go +++ b/cl/phase1/core/state/cache_mutators.go @@ -19,9 +19,9 @@ package state import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common/math" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common/math" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" ) func (b *CachingBeaconState) getSlashingProposerReward(whistleBlowerReward uint64) uint64 { diff --git a/cl/phase1/core/state/cache_setters.go b/cl/phase1/core/state/cache_setters.go index 19688e0682f..34bd18c843f 100644 --- a/cl/phase1/core/state/cache_setters.go +++ b/cl/phase1/core/state/cache_setters.go @@ -16,7 +16,7 @@ package state -import "github.com/ledgerwatch/erigon/cl/cltypes/solid" +import "github.com/erigontech/erigon/cl/cltypes/solid" // Below are setters. diff --git a/cl/phase1/core/state/copy.go b/cl/phase1/core/state/copy.go index 23c8d296cb2..94e119417ed 100644 --- a/cl/phase1/core/state/copy.go +++ b/cl/phase1/core/state/copy.go @@ -17,8 +17,8 @@ package state import ( - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/raw" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state/raw" ) func (b *CachingBeaconState) CopyInto(bs *CachingBeaconState) (err error) { diff --git a/cl/phase1/core/state/lru/lru.go b/cl/phase1/core/state/lru/lru.go index 5fe2dbcba26..8668f51c9d3 100644 --- a/cl/phase1/core/state/lru/lru.go +++ b/cl/phase1/core/state/lru/lru.go @@ -22,7 +22,8 @@ import ( lru "github.com/hashicorp/golang-lru/v2" "github.com/hashicorp/golang-lru/v2/expirable" - "github.com/ledgerwatch/erigon-lib/metrics" + + "github.com/erigontech/erigon-lib/metrics" ) // Cache is a wrapper around hashicorp lru but with metric for Get diff --git a/cl/phase1/core/state/mutators.go b/cl/phase1/core/state/mutators.go index c715422e6ce..a1c331e1068 100644 --- a/cl/phase1/core/state/mutators.go +++ b/cl/phase1/core/state/mutators.go @@ -16,7 +16,7 @@ package state -import "github.com/ledgerwatch/erigon/cl/abstract" +import "github.com/erigontech/erigon/cl/abstract" func IncreaseBalance(b abstract.BeaconState, index, delta uint64) error { currentBalance, err := b.ValidatorBalance(int(index)) diff --git a/cl/phase1/core/state/mutators_test.go b/cl/phase1/core/state/mutators_test.go index 5be68e184ba..00a40574a2b 100644 --- a/cl/phase1/core/state/mutators_test.go +++ b/cl/phase1/core/state/mutators_test.go @@ -19,10 +19,10 @@ package state_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - state2 "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/cltypes/solid" + state2 "github.com/erigontech/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/state/raw/copy.go b/cl/phase1/core/state/raw/copy.go index 61555c854f8..5a8ceaf24fc 100644 --- a/cl/phase1/core/state/raw/copy.go +++ b/cl/phase1/core/state/raw/copy.go @@ -17,9 +17,9 @@ package raw import ( - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) func (b *BeaconState) CopyInto(dst *BeaconState) error { diff --git a/cl/phase1/core/state/raw/events.go b/cl/phase1/core/state/raw/events.go index 2ec935d6a0a..a6da9525a82 100644 --- a/cl/phase1/core/state/raw/events.go +++ b/cl/phase1/core/state/raw/events.go @@ -17,9 +17,9 @@ package raw import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type Events struct { diff --git a/cl/phase1/core/state/raw/getters.go b/cl/phase1/core/state/raw/getters.go index 22443a5b8c5..d2d858e8a06 100644 --- a/cl/phase1/core/state/raw/getters.go +++ b/cl/phase1/core/state/raw/getters.go @@ -20,11 +20,11 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/fork" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/fork" ) var ( diff --git a/cl/phase1/core/state/raw/hashing.go b/cl/phase1/core/state/raw/hashing.go index fb8ddb5732a..0728cfff67b 100644 --- a/cl/phase1/core/state/raw/hashing.go +++ b/cl/phase1/core/state/raw/hashing.go @@ -19,11 +19,11 @@ package raw import ( "time" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/merkle_tree" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/merkle_tree" ) func (b *BeaconState) HashSSZ() (out [32]byte, err error) { diff --git a/cl/phase1/core/state/raw/misc_test.go b/cl/phase1/core/state/raw/misc_test.go index 879ac54eecd..ad29d900d7f 100644 --- a/cl/phase1/core/state/raw/misc_test.go +++ b/cl/phase1/core/state/raw/misc_test.go @@ -20,7 +20,7 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/state/raw/setters.go b/cl/phase1/core/state/raw/setters.go index 9a4b390e62f..d750ec40d6f 100644 --- a/cl/phase1/core/state/raw/setters.go +++ b/cl/phase1/core/state/raw/setters.go @@ -17,10 +17,10 @@ package raw import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) func (b *BeaconState) SetVersion(version clparams.StateVersion) { diff --git a/cl/phase1/core/state/raw/setters_test.go b/cl/phase1/core/state/raw/setters_test.go index ba5b186b7a9..b2986326e3f 100644 --- a/cl/phase1/core/state/raw/setters_test.go +++ b/cl/phase1/core/state/raw/setters_test.go @@ -19,10 +19,10 @@ package raw import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/assert" ) diff --git a/cl/phase1/core/state/raw/ssz.go b/cl/phase1/core/state/raw/ssz.go index c6ac353af8a..63afa6d4401 100644 --- a/cl/phase1/core/state/raw/ssz.go +++ b/cl/phase1/core/state/raw/ssz.go @@ -19,13 +19,13 @@ package raw import ( "fmt" - ssz2 "github.com/ledgerwatch/erigon/cl/ssz" + ssz2 "github.com/erigontech/erigon/cl/ssz" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" ) // BlockRoot computes the block root for the state. diff --git a/cl/phase1/core/state/raw/state.go b/cl/phase1/core/state/raw/state.go index d52f08a29fb..55caa337961 100644 --- a/cl/phase1/core/state/raw/state.go +++ b/cl/phase1/core/state/raw/state.go @@ -21,10 +21,10 @@ import ( "strconv" "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) const ( diff --git a/cl/phase1/core/state/raw/test_util.go b/cl/phase1/core/state/raw/test_util.go index 9d5d8333d66..1cc0d9a9b74 100644 --- a/cl/phase1/core/state/raw/test_util.go +++ b/cl/phase1/core/state/raw/test_util.go @@ -19,8 +19,8 @@ package raw import ( _ "embed" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" ) //go:embed testdata/state.ssz_snappy diff --git a/cl/phase1/core/state/root_test.go b/cl/phase1/core/state/root_test.go index f9acf698c74..35198b3e7fd 100644 --- a/cl/phase1/core/state/root_test.go +++ b/cl/phase1/core/state/root_test.go @@ -19,8 +19,8 @@ package state_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // Curr: 4358340 diff --git a/cl/phase1/core/state/shuffling/shuffling.go b/cl/phase1/core/state/shuffling/shuffling.go index 54c0924639c..61a6c217ca8 100644 --- a/cl/phase1/core/state/shuffling/shuffling.go +++ b/cl/phase1/core/state/shuffling/shuffling.go @@ -20,9 +20,9 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/raw" + "github.com/erigontech/erigon/cl/phase1/core/state/raw" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" ) func ComputeProposerIndex(b *raw.BeaconState, indices []uint64, seed [32]byte) (uint64, error) { diff --git a/cl/phase1/core/state/shuffling/shuffling_test.go b/cl/phase1/core/state/shuffling/shuffling_test.go index 9dc262e1931..19ec53a067d 100644 --- a/cl/phase1/core/state/shuffling/shuffling_test.go +++ b/cl/phase1/core/state/shuffling/shuffling_test.go @@ -20,15 +20,15 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common/eth2shuffle" + "github.com/erigontech/erigon-lib/common/eth2shuffle" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/raw" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/raw" + "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" ) func BenchmarkLambdaShuffledIndex(b *testing.B) { diff --git a/cl/phase1/core/state/shuffling/util.go b/cl/phase1/core/state/shuffling/util.go index c96df709d60..3e000bfdaa6 100644 --- a/cl/phase1/core/state/shuffling/util.go +++ b/cl/phase1/core/state/shuffling/util.go @@ -20,11 +20,11 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common/eth2shuffle" + "github.com/erigontech/erigon-lib/common/eth2shuffle" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" ) func ComputeShuffledIndex(conf *clparams.BeaconChainConfig, ind, ind_count uint64, seed [32]byte, preInputs [][32]byte, hashFunc utils.HashFunc) (uint64, error) { diff --git a/cl/phase1/core/state/ssz.go b/cl/phase1/core/state/ssz.go index 4b32977f952..5623ccf043d 100644 --- a/cl/phase1/core/state/ssz.go +++ b/cl/phase1/core/state/ssz.go @@ -17,8 +17,8 @@ package state import ( - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/types/clonable" ) func (b *CachingBeaconState) EncodeSSZ(buf []byte) ([]byte, error) { diff --git a/cl/phase1/core/state/ssz_test.go b/cl/phase1/core/state/ssz_test.go index 20effb21693..18ccb075a8c 100644 --- a/cl/phase1/core/state/ssz_test.go +++ b/cl/phase1/core/state/ssz_test.go @@ -21,10 +21,10 @@ import ( _ "embed" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/state/upgrade.go b/cl/phase1/core/state/upgrade.go index 96360114bbc..df7b84760b5 100644 --- a/cl/phase1/core/state/upgrade.go +++ b/cl/phase1/core/state/upgrade.go @@ -17,11 +17,11 @@ package state import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" ) func (b *CachingBeaconState) UpgradeToAltair() error { diff --git a/cl/phase1/core/state/upgrade_test.go b/cl/phase1/core/state/upgrade_test.go index b70646f93cd..802805af731 100644 --- a/cl/phase1/core/state/upgrade_test.go +++ b/cl/phase1/core/state/upgrade_test.go @@ -20,8 +20,8 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/core/state/util.go b/cl/phase1/core/state/util.go index 1d5f2a1e9ab..3cd93fd848c 100644 --- a/cl/phase1/core/state/util.go +++ b/cl/phase1/core/state/util.go @@ -19,10 +19,10 @@ package state import ( "sort" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" ) func copyLRU[K comparable, V any](dst *lru.Cache[K, V], src *lru.Cache[K, V]) *lru.Cache[K, V] { diff --git a/cl/phase1/core/state/utils_test.go b/cl/phase1/core/state/utils_test.go index b759ae6b972..ad91272559e 100644 --- a/cl/phase1/core/state/utils_test.go +++ b/cl/phase1/core/state/utils_test.go @@ -20,10 +20,10 @@ import ( "math" "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/execution_client/block_collector/block_collector.go b/cl/phase1/execution_client/block_collector/block_collector.go index 6cf60ca551e..1dd01fa67cc 100644 --- a/cl/phase1/execution_client/block_collector/block_collector.go +++ b/cl/phase1/execution_client/block_collector/block_collector.go @@ -21,15 +21,15 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/core/types" ) var ( diff --git a/cl/phase1/execution_client/block_collector/block_collector_test.go b/cl/phase1/execution_client/block_collector/block_collector_test.go index b167ca87f93..efc35509a0f 100644 --- a/cl/phase1/execution_client/block_collector/block_collector_test.go +++ b/cl/phase1/execution_client/block_collector/block_collector_test.go @@ -24,12 +24,12 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client/block_collector" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/execution_client/block_collector" + "github.com/erigontech/erigon/core/types" ) func TestBlockCollectorAccumulateAndFlush(t *testing.T) { diff --git a/cl/phase1/execution_client/execution_client_direct.go b/cl/phase1/execution_client/execution_client_direct.go index d01593a52f7..58eab549fd0 100644 --- a/cl/phase1/execution_client/execution_client_direct.go +++ b/cl/phase1/execution_client/execution_client_direct.go @@ -22,12 +22,12 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" + libcommon "github.com/erigontech/erigon-lib/common" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_chain_reader.go" ) type ExecutionClientDirect struct { diff --git a/cl/phase1/execution_client/execution_client_rpc.go b/cl/phase1/execution_client/execution_client_rpc.go index ecc6690ede4..154b3b9ce0a 100644 --- a/cl/phase1/execution_client/execution_client_rpc.go +++ b/cl/phase1/execution_client/execution_client_rpc.go @@ -24,17 +24,17 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client/rpc_helper" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/execution_client/rpc_helper" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" ) const DefaultRPCHTTPTimeout = time.Second * 30 diff --git a/cl/phase1/execution_client/execution_engine_mock.go b/cl/phase1/execution_client/execution_engine_mock.go index 3b6f60f1664..096058d1db2 100644 --- a/cl/phase1/execution_client/execution_engine_mock.go +++ b/cl/phase1/execution_client/execution_engine_mock.go @@ -14,10 +14,10 @@ import ( big "math/big" reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" - types "github.com/ledgerwatch/erigon/core/types" - engine_types "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + common "github.com/erigontech/erigon-lib/common" + cltypes "github.com/erigontech/erigon/cl/cltypes" + types "github.com/erigontech/erigon/core/types" + engine_types "github.com/erigontech/erigon/turbo/engineapi/engine_types" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/execution_client/interface.go b/cl/phase1/execution_client/interface.go index 6c9eaf6edb0..4a784f5d988 100644 --- a/cl/phase1/execution_client/interface.go +++ b/cl/phase1/execution_client/interface.go @@ -20,11 +20,11 @@ import ( "context" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" ) var errContextExceeded = "rpc error: code = DeadlineExceeded desc = context deadline exceeded" diff --git a/cl/phase1/execution_client/types.go b/cl/phase1/execution_client/types.go index f34587f3288..39c850f50d4 100644 --- a/cl/phase1/execution_client/types.go +++ b/cl/phase1/execution_client/types.go @@ -16,7 +16,7 @@ package execution_client -import "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" +import "github.com/erigontech/erigon/turbo/engineapi/engine_types" type PayloadStatus int diff --git a/cl/phase1/forkchoice/blob_sidecars.go b/cl/phase1/forkchoice/blob_sidecars.go index 6c6215da855..a4ccd374fa2 100644 --- a/cl/phase1/forkchoice/blob_sidecars.go +++ b/cl/phase1/forkchoice/blob_sidecars.go @@ -17,7 +17,7 @@ package forkchoice import ( - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" ) func (f *ForkChoiceStore) AddPreverifiedBlobSidecar(blobSidecar *cltypes.BlobSidecar) error { diff --git a/cl/phase1/forkchoice/checkpoint_state.go b/cl/phase1/forkchoice/checkpoint_state.go index 6a5939c3229..ecf9f147a61 100644 --- a/cl/phase1/forkchoice/checkpoint_state.go +++ b/cl/phase1/forkchoice/checkpoint_state.go @@ -19,16 +19,16 @@ package forkchoice import ( "fmt" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" "github.com/Giulio2002/bls" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" ) const randaoMixesLength = 65536 diff --git a/cl/phase1/forkchoice/fork_choice_test.go b/cl/phase1/forkchoice/fork_choice_test.go index 970b40c6e79..0782d360222 100644 --- a/cl/phase1/forkchoice/fork_choice_test.go +++ b/cl/phase1/forkchoice/fork_choice_test.go @@ -25,24 +25,24 @@ import ( "github.com/spf13/afero" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/transition" - - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/transition" + + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" ) //go:embed test_data/anchor_state.ssz_snappy diff --git a/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage.go b/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage.go index ccd3c1ad0c3..330c758e014 100644 --- a/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage.go +++ b/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage.go @@ -22,7 +22,7 @@ import ( "sync" "github.com/alecthomas/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) const maxDumps = 8 // max number of dumps to keep in memory to prevent from memory leak during long non-finality. diff --git a/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage_test.go b/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage_test.go index d5a6abfc378..e4a6835dcd0 100644 --- a/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage_test.go +++ b/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage_test.go @@ -20,9 +20,9 @@ import ( "math" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/forkchoice/fork_graph/fork_graph_disk.go b/cl/phase1/forkchoice/fork_graph/fork_graph_disk.go index a23839c53c6..00ce755a447 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph_disk.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph_disk.go @@ -26,18 +26,18 @@ import ( "github.com/klauspost/compress/zstd" "github.com/spf13/afero" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/lightclient_utils" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - diffstorage "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph/diff_storage" - "github.com/ledgerwatch/erigon/cl/transition" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/lightclient_utils" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + "github.com/erigontech/erigon/cl/phase1/core/state" + diffstorage "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph/diff_storage" + "github.com/erigontech/erigon/cl/transition" + "github.com/erigontech/erigon/cl/transition/impl/eth2" ) const dumpSlotFrequency = 4 diff --git a/cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go b/cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go index 0a5d58ac0a5..f700f1d5cdd 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go @@ -25,9 +25,10 @@ import ( "github.com/golang/snappy" "github.com/klauspost/compress/zstd" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" "github.com/spf13/afero" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func getBeaconStateFilename(blockRoot libcommon.Hash) string { diff --git a/cl/phase1/forkchoice/fork_graph/fork_graph_test.go b/cl/phase1/forkchoice/fork_graph/fork_graph_test.go index b58d8e15592..28b5628c977 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph_test.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph_test.go @@ -20,13 +20,13 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/phase1/core/state" "github.com/spf13/afero" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/phase1/forkchoice/fork_graph/interface.go b/cl/phase1/forkchoice/fork_graph/interface.go index 33345bc52e5..e86b4bcc071 100644 --- a/cl/phase1/forkchoice/fork_graph/interface.go +++ b/cl/phase1/forkchoice/fork_graph/interface.go @@ -17,11 +17,11 @@ package fork_graph import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/transition/impl/eth2" ) /* diff --git a/cl/phase1/forkchoice/forkchoice.go b/cl/phase1/forkchoice/forkchoice.go index 5adf97027e2..1dfd35949ca 100644 --- a/cl/phase1/forkchoice/forkchoice.go +++ b/cl/phase1/forkchoice/forkchoice.go @@ -22,25 +22,25 @@ import ( "sync" "sync/atomic" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - state2 "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/optimistic" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/core/state" + state2 "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph" + "github.com/erigontech/erigon/cl/phase1/forkchoice/optimistic" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/transition/impl/eth2" + "github.com/erigontech/erigon/cl/utils/eth_clock" lru "github.com/hashicorp/golang-lru/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" ) // ForkNode is a struct that represents a node in the fork choice tree. diff --git a/cl/phase1/forkchoice/get_head.go b/cl/phase1/forkchoice/get_head.go index d12050355fc..793aacd239b 100644 --- a/cl/phase1/forkchoice/get_head.go +++ b/cl/phase1/forkchoice/get_head.go @@ -21,9 +21,9 @@ import ( "fmt" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) // accountWeights updates the weights of the validators, given the vote and given an head leaf. diff --git a/cl/phase1/forkchoice/interface.go b/cl/phase1/forkchoice/interface.go index 61abab22799..7b9047491c3 100644 --- a/cl/phase1/forkchoice/interface.go +++ b/cl/phase1/forkchoice/interface.go @@ -19,13 +19,13 @@ package forkchoice import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/transition/impl/eth2" ) type ForkChoiceStorage interface { diff --git a/cl/phase1/forkchoice/mock_services/forkchoice_mock.go b/cl/phase1/forkchoice/mock_services/forkchoice_mock.go index 4ce4a0a97b0..a594818fafa 100644 --- a/cl/phase1/forkchoice/mock_services/forkchoice_mock.go +++ b/cl/phase1/forkchoice/mock_services/forkchoice_mock.go @@ -22,17 +22,17 @@ import ( "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" - "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool" - syncpoolmock "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool/mock_services" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/transition/impl/eth2" + "github.com/erigontech/erigon/cl/validator/sync_contribution_pool" + syncpoolmock "github.com/erigontech/erigon/cl/validator/sync_contribution_pool/mock_services" ) // Make mocks with maps and simple setters and getters, panic on methods from ForkChoiceStorageWriter diff --git a/cl/phase1/forkchoice/on_attestation.go b/cl/phase1/forkchoice/on_attestation.go index 9067e5ef628..036c5445bb3 100644 --- a/cl/phase1/forkchoice/on_attestation.go +++ b/cl/phase1/forkchoice/on_attestation.go @@ -19,10 +19,10 @@ package forkchoice import ( "fmt" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/cl/phase1/forkchoice/on_attester_slashing.go b/cl/phase1/forkchoice/on_attester_slashing.go index 4985590d9e9..5eb499aeee5 100644 --- a/cl/phase1/forkchoice/on_attester_slashing.go +++ b/cl/phase1/forkchoice/on_attester_slashing.go @@ -20,12 +20,12 @@ import ( "fmt" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/pool" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" ) func (f *ForkChoiceStore) OnAttesterSlashing(attesterSlashing *cltypes.AttesterSlashing, test bool) error { diff --git a/cl/phase1/forkchoice/on_block.go b/cl/phase1/forkchoice/on_block.go index a797e5a7910..b845e8c5522 100644 --- a/cl/phase1/forkchoice/on_block.go +++ b/cl/phase1/forkchoice/on_block.go @@ -22,21 +22,21 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2/statechange" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethutils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph" + "github.com/erigontech/erigon/cl/transition/impl/eth2/statechange" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" ) const foreseenProposers = 16 diff --git a/cl/phase1/forkchoice/on_tick.go b/cl/phase1/forkchoice/on_tick.go index 877e3d12085..8b80dc27aba 100644 --- a/cl/phase1/forkchoice/on_tick.go +++ b/cl/phase1/forkchoice/on_tick.go @@ -17,8 +17,8 @@ package forkchoice import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" ) // OnTick executes on_tick operation for forkchoice. diff --git a/cl/phase1/forkchoice/optimistic/optimistic.go b/cl/phase1/forkchoice/optimistic/optimistic.go index 3a09bf53dd0..20101a72e49 100644 --- a/cl/phase1/forkchoice/optimistic/optimistic.go +++ b/cl/phase1/forkchoice/optimistic/optimistic.go @@ -17,8 +17,8 @@ package optimistic import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" ) type OptimisticStore interface { diff --git a/cl/phase1/forkchoice/optimistic/optimistic_impl.go b/cl/phase1/forkchoice/optimistic/optimistic_impl.go index 7bd8aaa02ed..4b3afabae9a 100644 --- a/cl/phase1/forkchoice/optimistic/optimistic_impl.go +++ b/cl/phase1/forkchoice/optimistic/optimistic_impl.go @@ -19,8 +19,8 @@ package optimistic import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" ) type optimisticStoreImpl struct { diff --git a/cl/phase1/forkchoice/optimistic/optimistic_test.go b/cl/phase1/forkchoice/optimistic/optimistic_test.go index 0c50a28268a..b06e8135ba4 100644 --- a/cl/phase1/forkchoice/optimistic/optimistic_test.go +++ b/cl/phase1/forkchoice/optimistic/optimistic_test.go @@ -19,8 +19,8 @@ package optimistic import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/suite" ) diff --git a/cl/phase1/forkchoice/utils.go b/cl/phase1/forkchoice/utils.go index 7e6182756dd..468d30b3df2 100644 --- a/cl/phase1/forkchoice/utils.go +++ b/cl/phase1/forkchoice/utils.go @@ -19,12 +19,12 @@ package forkchoice import ( "fmt" - "github.com/ledgerwatch/erigon/cl/transition" + "github.com/erigontech/erigon/cl/transition" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // Slot calculates the current slot number using the time and genesis slot. diff --git a/cl/phase1/network/backward_beacon_downloader.go b/cl/phase1/network/backward_beacon_downloader.go index 23f26939903..81c18369d50 100644 --- a/cl/phase1/network/backward_beacon_downloader.go +++ b/cl/phase1/network/backward_beacon_downloader.go @@ -23,16 +23,16 @@ import ( "golang.org/x/net/context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/base_encoding" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/rpc" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/base_encoding" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/rpc" ) // Whether the reverse downloader arrived at expected height or condition. diff --git a/cl/phase1/network/beacon_downloader.go b/cl/phase1/network/beacon_downloader.go index da892463afc..927b645305f 100644 --- a/cl/phase1/network/beacon_downloader.go +++ b/cl/phase1/network/beacon_downloader.go @@ -21,11 +21,11 @@ import ( "sync/atomic" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "golang.org/x/net/context" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/rpc" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/rpc" ) // Input: the currently highest slot processed and the list of blocks we want to know process diff --git a/cl/phase1/network/blobs.go b/cl/phase1/network/blobs.go index a853311bb34..13dba4e3575 100644 --- a/cl/phase1/network/blobs.go +++ b/cl/phase1/network/blobs.go @@ -22,11 +22,11 @@ import ( "golang.org/x/net/context" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/rpc" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/rpc" ) var requestBlobBatchExpiration = 15 * time.Second diff --git a/cl/phase1/network/gossip_manager.go b/cl/phase1/network/gossip_manager.go index 3d1bfbfc0bb..920e6ac93e6 100644 --- a/cl/phase1/network/gossip_manager.go +++ b/cl/phase1/network/gossip_manager.go @@ -25,21 +25,21 @@ import ( "github.com/c2h5oh/datasize" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/phase1/network/services" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/committee_subscription" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/phase1/network/services" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/committee_subscription" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // Gossip manager is sending all messages to fork choice or others diff --git a/cl/phase1/network/services/aggregate_and_proof_service.go b/cl/phase1/network/services/aggregate_and_proof_service.go index 7fb91a0eaa1..adaa543fbe4 100644 --- a/cl/phase1/network/services/aggregate_and_proof_service.go +++ b/cl/phase1/network/services/aggregate_and_proof_service.go @@ -25,17 +25,17 @@ import ( "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/merkle_tree" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils" ) type aggregateJob struct { diff --git a/cl/phase1/network/services/aggregate_and_proof_service_test.go b/cl/phase1/network/services/aggregate_and_proof_service_test.go index c0b82191949..67847ce4051 100644 --- a/cl/phase1/network/services/aggregate_and_proof_service_test.go +++ b/cl/phase1/network/services/aggregate_and_proof_service_test.go @@ -23,16 +23,16 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/pool" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/pool" ) func getAggregateAndProofAndState(t *testing.T) (*cltypes.SignedAggregateAndProof, *state.CachingBeaconState) { diff --git a/cl/phase1/network/services/attestation_service.go b/cl/phase1/network/services/attestation_service.go index 3cf65d42c1b..ad673507c51 100644 --- a/cl/phase1/network/services/attestation_service.go +++ b/cl/phase1/network/services/attestation_service.go @@ -24,19 +24,19 @@ import ( "time" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/aggregation" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/phase1/network/subnets" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/committee_subscription" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/aggregation" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/phase1/network/subnets" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/committee_subscription" + "github.com/erigontech/erigon/common" ) var ( diff --git a/cl/phase1/network/services/attestation_service_test.go b/cl/phase1/network/services/attestation_service_test.go index 83b01e99b5a..ec66058b109 100644 --- a/cl/phase1/network/services/attestation_service_test.go +++ b/cl/phase1/network/services/attestation_service_test.go @@ -24,17 +24,17 @@ import ( "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/abstract" - mockState "github.com/ledgerwatch/erigon/cl/abstract/mock_services" - mockSync "github.com/ledgerwatch/erigon/cl/beacon/synced_data/mock_services" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - mockCommittee "github.com/ledgerwatch/erigon/cl/validator/committee_subscription/mock_services" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/abstract" + mockState "github.com/erigontech/erigon/cl/abstract/mock_services" + mockSync "github.com/erigontech/erigon/cl/beacon/synced_data/mock_services" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/utils/eth_clock" + mockCommittee "github.com/erigontech/erigon/cl/validator/committee_subscription/mock_services" ) var ( diff --git a/cl/phase1/network/services/blob_sidecar_service.go b/cl/phase1/network/services/blob_sidecar_service.go index 10604b1cdf7..56f14a434a8 100644 --- a/cl/phase1/network/services/blob_sidecar_service.go +++ b/cl/phase1/network/services/blob_sidecar_service.go @@ -25,16 +25,16 @@ import ( "github.com/Giulio2002/bls" gokzg4844 "github.com/crate-crypto/go-kzg-4844" - "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) type blobSidecarService struct { diff --git a/cl/phase1/network/services/blob_sidecar_service_test.go b/cl/phase1/network/services/blob_sidecar_service_test.go index ac68c0321f9..03090941857 100644 --- a/cl/phase1/network/services/blob_sidecar_service_test.go +++ b/cl/phase1/network/services/blob_sidecar_service_test.go @@ -24,16 +24,16 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) //go:embed test_data/blob_sidecar_service_blob.ssz_snappy diff --git a/cl/phase1/network/services/block_service.go b/cl/phase1/network/services/block_service.go index 5937ea1b3d3..e3c031e5929 100644 --- a/cl/phase1/network/services/block_service.go +++ b/cl/phase1/network/services/block_service.go @@ -22,19 +22,19 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/utils/eth_clock" + + libcommon "github.com/erigontech/erigon-lib/common" ) type proposerIndexAndSlot struct { diff --git a/cl/phase1/network/services/block_service_test.go b/cl/phase1/network/services/block_service_test.go index ed07fdef4e1..772e8a85a57 100644 --- a/cl/phase1/network/services/block_service_test.go +++ b/cl/phase1/network/services/block_service_test.go @@ -23,14 +23,14 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) func setupBlockService(t *testing.T, ctrl *gomock.Controller) (BlockService, *synced_data.SyncedDataManager, *eth_clock.MockEthereumClock, *mock_services.ForkChoiceStorageMock) { diff --git a/cl/phase1/network/services/bls_to_execution_change_service.go b/cl/phase1/network/services/bls_to_execution_change_service.go index c1ffbad43e0..b6170f11fd8 100644 --- a/cl/phase1/network/services/bls_to_execution_change_service.go +++ b/cl/phase1/network/services/bls_to_execution_change_service.go @@ -21,14 +21,14 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils" ) type blsToExecutionChangeService struct { diff --git a/cl/phase1/network/services/bls_to_execution_change_service_test.go b/cl/phase1/network/services/bls_to_execution_change_service_test.go index 5985229b6e4..2ef51b12d61 100644 --- a/cl/phase1/network/services/bls_to_execution_change_service_test.go +++ b/cl/phase1/network/services/bls_to_execution_change_service_test.go @@ -23,15 +23,15 @@ import ( "log" "testing" - "github.com/ledgerwatch/erigon-lib/common" - mockState "github.com/ledgerwatch/erigon/cl/abstract/mock_services" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - mockSync "github.com/ledgerwatch/erigon/cl/beacon/synced_data/mock_services" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + mockState "github.com/erigontech/erigon/cl/abstract/mock_services" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + mockSync "github.com/erigontech/erigon/cl/beacon/synced_data/mock_services" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/global_mock_test.go b/cl/phase1/network/services/global_mock_test.go index 1296ddd4f05..83a44eeedbc 100644 --- a/cl/phase1/network/services/global_mock_test.go +++ b/cl/phase1/network/services/global_mock_test.go @@ -17,7 +17,7 @@ package services import ( - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/types/ssz" "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/interface.go b/cl/phase1/network/services/interface.go index 9679ce17a1b..6d4a005e482 100644 --- a/cl/phase1/network/services/interface.go +++ b/cl/phase1/network/services/interface.go @@ -19,8 +19,8 @@ package services import ( "context" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) // Note: BlobSidecarService and BlockService are tested in spectests diff --git a/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go b/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go index 7d0eff95ca9..1d2f4b166de 100644 --- a/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go +++ b/cl/phase1/network/services/mock_services/aggregate_and_proof_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: AggregateAndProofService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: AggregateAndProofService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/attestation_service_mock.go b/cl/phase1/network/services/mock_services/attestation_service_mock.go index 537da583a5d..d60e4d59805 100644 --- a/cl/phase1/network/services/mock_services/attestation_service_mock.go +++ b/cl/phase1/network/services/mock_services/attestation_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: AttestationService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: AttestationService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - solid "github.com/ledgerwatch/erigon/cl/cltypes/solid" + solid "github.com/erigontech/erigon/cl/cltypes/solid" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/blob_sidecars_service_mock.go b/cl/phase1/network/services/mock_services/blob_sidecars_service_mock.go index c27b577b97e..ee82d59319a 100644 --- a/cl/phase1/network/services/mock_services/blob_sidecars_service_mock.go +++ b/cl/phase1/network/services/mock_services/blob_sidecars_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: BlobSidecarsService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: BlobSidecarsService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/block_service_mock.go b/cl/phase1/network/services/mock_services/block_service_mock.go index 22014d316bb..056061874a9 100644 --- a/cl/phase1/network/services/mock_services/block_service_mock.go +++ b/cl/phase1/network/services/mock_services/block_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: BlockService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: BlockService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/bls_to_execution_change_service_mock.go b/cl/phase1/network/services/mock_services/bls_to_execution_change_service_mock.go index 3fad375a124..7f3cf5243de 100644 --- a/cl/phase1/network/services/mock_services/bls_to_execution_change_service_mock.go +++ b/cl/phase1/network/services/mock_services/bls_to_execution_change_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: BLSToExecutionChangeService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: BLSToExecutionChangeService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/proposer_slashing_service_mock.go b/cl/phase1/network/services/mock_services/proposer_slashing_service_mock.go index d1f41e6aea6..ee9c87ab65b 100644 --- a/cl/phase1/network/services/mock_services/proposer_slashing_service_mock.go +++ b/cl/phase1/network/services/mock_services/proposer_slashing_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: ProposerSlashingService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: ProposerSlashingService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/sync_committee_messages_service_mock.go b/cl/phase1/network/services/mock_services/sync_committee_messages_service_mock.go index 37cde072f81..b914773ca18 100644 --- a/cl/phase1/network/services/mock_services/sync_committee_messages_service_mock.go +++ b/cl/phase1/network/services/mock_services/sync_committee_messages_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: SyncCommitteeMessagesService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: SyncCommitteeMessagesService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/sync_contribution_service_mock.go b/cl/phase1/network/services/mock_services/sync_contribution_service_mock.go index 937b86a4db5..9f1880aa13e 100644 --- a/cl/phase1/network/services/mock_services/sync_contribution_service_mock.go +++ b/cl/phase1/network/services/mock_services/sync_contribution_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: SyncContributionService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: SyncContributionService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/mock_services/voluntary_exit_service_mock.go b/cl/phase1/network/services/mock_services/voluntary_exit_service_mock.go index 3f8bd68d28c..5c3c2ae4e96 100644 --- a/cl/phase1/network/services/mock_services/voluntary_exit_service_mock.go +++ b/cl/phase1/network/services/mock_services/voluntary_exit_service_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/network/services (interfaces: VoluntaryExitService) +// Source: github.com/erigontech/erigon/cl/phase1/network/services (interfaces: VoluntaryExitService) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" + cltypes "github.com/erigontech/erigon/cl/cltypes" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/proposer_slashing_service.go b/cl/phase1/network/services/proposer_slashing_service.go index c75921b2eed..3aa5fc1ed45 100644 --- a/cl/phase1/network/services/proposer_slashing_service.go +++ b/cl/phase1/network/services/proposer_slashing_service.go @@ -20,13 +20,13 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - st "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + st "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) type proposerSlashingService struct { diff --git a/cl/phase1/network/services/proposer_slashing_service_test.go b/cl/phase1/network/services/proposer_slashing_service_test.go index 226da5e5423..7b3a9f00d44 100644 --- a/cl/phase1/network/services/proposer_slashing_service_test.go +++ b/cl/phase1/network/services/proposer_slashing_service_test.go @@ -22,14 +22,14 @@ import ( "log" "testing" - "github.com/ledgerwatch/erigon-lib/common" - mockState "github.com/ledgerwatch/erigon/cl/abstract/mock_services" - mockSync "github.com/ledgerwatch/erigon/cl/beacon/synced_data/mock_services" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon-lib/common" + mockState "github.com/erigontech/erigon/cl/abstract/mock_services" + mockSync "github.com/erigontech/erigon/cl/beacon/synced_data/mock_services" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils/eth_clock" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/sync_committee_messages_service.go b/cl/phase1/network/services/sync_committee_messages_service.go index 17dca287677..50cf9952546 100644 --- a/cl/phase1/network/services/sync_committee_messages_service.go +++ b/cl/phase1/network/services/sync_committee_messages_service.go @@ -25,14 +25,14 @@ import ( "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/network/subnets" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/network/subnets" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/sync_contribution_pool" ) type seenSyncCommitteeMessage struct { diff --git a/cl/phase1/network/services/sync_committee_messages_service_test.go b/cl/phase1/network/services/sync_committee_messages_service_test.go index 1e3f58a2ef7..c6a940d5035 100644 --- a/cl/phase1/network/services/sync_committee_messages_service_test.go +++ b/cl/phase1/network/services/sync_committee_messages_service_test.go @@ -20,13 +20,13 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - syncpoolmock "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool/mock_services" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils/eth_clock" + syncpoolmock "github.com/erigontech/erigon/cl/validator/sync_contribution_pool/mock_services" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/sync_contribution_service.go b/cl/phase1/network/services/sync_contribution_service.go index d6ca30a25ee..ebf28547a0c 100644 --- a/cl/phase1/network/services/sync_contribution_service.go +++ b/cl/phase1/network/services/sync_contribution_service.go @@ -27,18 +27,18 @@ import ( "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/sync_contribution_pool" ) type seenSyncCommitteeContribution struct { diff --git a/cl/phase1/network/services/sync_contribution_service_test.go b/cl/phase1/network/services/sync_contribution_service_test.go index 7c020e5d050..9a8d5e6d8e7 100644 --- a/cl/phase1/network/services/sync_contribution_service_test.go +++ b/cl/phase1/network/services/sync_contribution_service_test.go @@ -20,15 +20,15 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - syncpoolmock "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool/mock_services" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils/eth_clock" + syncpoolmock "github.com/erigontech/erigon/cl/validator/sync_contribution_pool/mock_services" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/network/services/voluntary_exit_service.go b/cl/phase1/network/services/voluntary_exit_service.go index 29943f6ebfe..c425f678cd1 100644 --- a/cl/phase1/network/services/voluntary_exit_service.go +++ b/cl/phase1/network/services/voluntary_exit_service.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" "github.com/pkg/errors" ) diff --git a/cl/phase1/network/services/voluntary_exit_service_test.go b/cl/phase1/network/services/voluntary_exit_service_test.go index a3a411c38d9..76cc9617272 100644 --- a/cl/phase1/network/services/voluntary_exit_service_test.go +++ b/cl/phase1/network/services/voluntary_exit_service_test.go @@ -21,15 +21,15 @@ import ( "log" "testing" - "github.com/ledgerwatch/erigon-lib/types/ssz" - mockState "github.com/ledgerwatch/erigon/cl/abstract/mock_services" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - mockSync "github.com/ledgerwatch/erigon/cl/beacon/synced_data/mock_services" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon-lib/types/ssz" + mockState "github.com/erigontech/erigon/cl/abstract/mock_services" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + mockSync "github.com/erigontech/erigon/cl/beacon/synced_data/mock_services" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils/eth_clock" "github.com/pkg/errors" "github.com/stretchr/testify/suite" "go.uber.org/mock/gomock" diff --git a/cl/phase1/network/subnets/subnets.go b/cl/phase1/network/subnets/subnets.go index f76133c7430..456199bc693 100644 --- a/cl/phase1/network/subnets/subnets.go +++ b/cl/phase1/network/subnets/subnets.go @@ -17,9 +17,9 @@ package subnets import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // def compute_subnets_for_sync_committee(state: BeaconState, validator_index: ValidatorIndex) -> Set[uint64]: diff --git a/cl/phase1/stages/clstages.go b/cl/phase1/stages/clstages.go index 5ac55503bf7..596acc37496 100644 --- a/cl/phase1/stages/clstages.go +++ b/cl/phase1/stages/clstages.go @@ -26,33 +26,33 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clstages" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client/block_collector" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/attestation_producer" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - network2 "github.com/ledgerwatch/erigon/cl/phase1/network" - "github.com/ledgerwatch/erigon/cl/rpc" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clstages" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/execution_client/block_collector" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/attestation_producer" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + + "github.com/erigontech/erigon-lib/log/v3" + + network2 "github.com/erigontech/erigon/cl/phase1/network" + "github.com/erigontech/erigon/cl/rpc" + "github.com/erigontech/erigon/cl/sentinel/peers" ) type Cfg struct { diff --git a/cl/phase1/stages/stage_history_download.go b/cl/phase1/stages/stage_history_download.go index b2b4039d84f..12c0678d6ef 100644 --- a/cl/phase1/stages/stage_history_download.go +++ b/cl/phase1/stages/stage_history_download.go @@ -23,20 +23,20 @@ import ( "sync/atomic" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client/block_collector" - "github.com/ledgerwatch/erigon/cl/phase1/network" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/execution_client/block_collector" + "github.com/erigontech/erigon/cl/phase1/network" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" ) type StageHistoryReconstructionCfg struct { diff --git a/cl/pool/operation_pool.go b/cl/pool/operation_pool.go index 2654a715d6e..f4054e25ee4 100644 --- a/cl/pool/operation_pool.go +++ b/cl/pool/operation_pool.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" ) const lifeSpan = 30 * time.Minute diff --git a/cl/pool/operations_pool.go b/cl/pool/operations_pool.go index 3bc2c8adf57..ec51bec5782 100644 --- a/cl/pool/operations_pool.go +++ b/cl/pool/operations_pool.go @@ -17,11 +17,11 @@ package pool import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/crypto/blake2b" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/crypto/blake2b" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) const operationsPerPool = 512 diff --git a/cl/pool/operations_pool_test.go b/cl/pool/operations_pool_test.go index 52b232bb0d7..a96b51f5da4 100644 --- a/cl/pool/operations_pool_test.go +++ b/cl/pool/operations_pool_test.go @@ -19,9 +19,9 @@ package pool import ( "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" "github.com/stretchr/testify/require" ) diff --git a/cl/rpc/rpc.go b/cl/rpc/rpc.go index 67e672c0a21..a72d8f5ecdf 100644 --- a/cl/rpc/rpc.go +++ b/cl/rpc/rpc.go @@ -24,23 +24,23 @@ import ( "io" "time" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/utils/eth_clock" "github.com/c2h5oh/datasize" "github.com/golang/snappy" "go.uber.org/zap/buffer" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" ) const maxMessageLength = 18 * datasize.MB diff --git a/cl/sentinel/communication/ssz_snappy/encoding.go b/cl/sentinel/communication/ssz_snappy/encoding.go index 3b3c993891e..5d841614f4f 100644 --- a/cl/sentinel/communication/ssz_snappy/encoding.go +++ b/cl/sentinel/communication/ssz_snappy/encoding.go @@ -26,9 +26,10 @@ import ( "github.com/c2h5oh/datasize" "github.com/golang/snappy" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) var writerPool = sync.Pool{ diff --git a/cl/sentinel/config.go b/cl/sentinel/config.go index a0e88f3c767..728e7a1eb94 100644 --- a/cl/sentinel/config.go +++ b/cl/sentinel/config.go @@ -28,8 +28,8 @@ import ( "github.com/libp2p/go-libp2p/p2p/transport/tcp" "github.com/multiformats/go-multiaddr" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" ) type SentinelConfig struct { diff --git a/cl/sentinel/discovery.go b/cl/sentinel/discovery.go index 4499d3d23f4..c95e4ab5dc3 100644 --- a/cl/sentinel/discovery.go +++ b/cl/sentinel/discovery.go @@ -26,10 +26,10 @@ import ( "github.com/multiformats/go-multiaddr" "github.com/prysmaticlabs/go-bitfield" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) const peerSubnetTarget = 4 diff --git a/cl/sentinel/gossip.go b/cl/sentinel/gossip.go index 6526c8201d6..3c83050d6ba 100644 --- a/cl/sentinel/gossip.go +++ b/cl/sentinel/gossip.go @@ -28,9 +28,9 @@ import ( pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/gossip" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/gossip" ) const ( diff --git a/cl/sentinel/handlers/blobs.go b/cl/sentinel/handlers/blobs.go index ca48a76b8f0..be38709f143 100644 --- a/cl/sentinel/handlers/blobs.go +++ b/cl/sentinel/handlers/blobs.go @@ -17,13 +17,13 @@ package handlers import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/utils" "github.com/libp2p/go-libp2p/core/network" ) diff --git a/cl/sentinel/handlers/blobs_test.go b/cl/sentinel/handlers/blobs_test.go index 3c13ce2ae08..6465776cd69 100644 --- a/cl/sentinel/handlers/blobs_test.go +++ b/cl/sentinel/handlers/blobs_test.go @@ -32,20 +32,20 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) func getEthClock(t *testing.T) eth_clock.EthereumClock { diff --git a/cl/sentinel/handlers/blocks.go b/cl/sentinel/handlers/blocks.go index 84fcd76f21e..25e7a1c4041 100644 --- a/cl/sentinel/handlers/blocks.go +++ b/cl/sentinel/handlers/blocks.go @@ -17,12 +17,12 @@ package handlers import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/utils" "github.com/libp2p/go-libp2p/core/network" ) diff --git a/cl/sentinel/handlers/blocks_by_range_test.go b/cl/sentinel/handlers/blocks_by_range_test.go index 29c826f6a0f..3fcf0620f99 100644 --- a/cl/sentinel/handlers/blocks_by_range_test.go +++ b/cl/sentinel/handlers/blocks_by_range_test.go @@ -30,15 +30,15 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/cl/utils" ) func TestBlocksByRootHandler(t *testing.T) { diff --git a/cl/sentinel/handlers/blocks_by_root_test.go b/cl/sentinel/handlers/blocks_by_root_test.go index 5910ab05a33..28661a4d59c 100644 --- a/cl/sentinel/handlers/blocks_by_root_test.go +++ b/cl/sentinel/handlers/blocks_by_root_test.go @@ -30,17 +30,17 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/cl/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/cl/utils" ) func TestBlocksByRangeHandler(t *testing.T) { diff --git a/cl/sentinel/handlers/handlers.go b/cl/sentinel/handlers/handlers.go index ea00bb0172b..51a63d089a8 100644 --- a/cl/sentinel/handlers/handlers.go +++ b/cl/sentinel/handlers/handlers.go @@ -26,23 +26,23 @@ import ( "golang.org/x/time/rate" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/handshake" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/handshake" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" ) type RateLimits struct { diff --git a/cl/sentinel/handlers/heartbeats.go b/cl/sentinel/handlers/heartbeats.go index 8b8d75f909c..e5431af9424 100644 --- a/cl/sentinel/handlers/heartbeats.go +++ b/cl/sentinel/handlers/heartbeats.go @@ -19,11 +19,11 @@ package handlers import ( "github.com/libp2p/go-libp2p/core/network" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/p2p/enr" ) // Type safe handlers which all have access to the original stream & decompressed data. diff --git a/cl/sentinel/handlers/heartbeats_test.go b/cl/sentinel/handlers/heartbeats_test.go index fdcd07ccd9f..4b4a4baff0d 100644 --- a/cl/sentinel/handlers/heartbeats_test.go +++ b/cl/sentinel/handlers/heartbeats_test.go @@ -27,19 +27,19 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/sentinel/handshake" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/sentinel/handshake" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) var ( diff --git a/cl/sentinel/handlers/light_client.go b/cl/sentinel/handlers/light_client.go index edf0e816d3d..b62418c245c 100644 --- a/cl/sentinel/handlers/light_client.go +++ b/cl/sentinel/handlers/light_client.go @@ -17,10 +17,10 @@ package handlers import ( - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/utils" "github.com/libp2p/go-libp2p/core/network" ) diff --git a/cl/sentinel/handlers/light_client_test.go b/cl/sentinel/handlers/light_client_test.go index 718368d87ad..458c85f4dcd 100644 --- a/cl/sentinel/handlers/light_client_test.go +++ b/cl/sentinel/handlers/light_client_test.go @@ -30,16 +30,16 @@ import ( "github.com/libp2p/go-libp2p/core/protocol" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/cl/utils" ) func TestLightClientOptimistic(t *testing.T) { diff --git a/cl/sentinel/handlers/utils_test.go b/cl/sentinel/handlers/utils_test.go index be0f656b3ea..29ccd40ae60 100644 --- a/cl/sentinel/handlers/utils_test.go +++ b/cl/sentinel/handlers/utils_test.go @@ -20,15 +20,15 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "github.com/stretchr/testify/require" ) diff --git a/cl/sentinel/handshake/handshake.go b/cl/sentinel/handshake/handshake.go index 14c38cf2914..e4bae0355e0 100644 --- a/cl/sentinel/handshake/handshake.go +++ b/cl/sentinel/handshake/handshake.go @@ -24,13 +24,13 @@ import ( "net/http" "sync" - communication2 "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/sentinel/httpreqresp" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + communication2 "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/sentinel/httpreqresp" + "github.com/erigontech/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" "github.com/libp2p/go-libp2p/core/peer" ) diff --git a/cl/sentinel/msg_id.go b/cl/sentinel/msg_id.go index 6960584fe2b..ed241a10b99 100644 --- a/cl/sentinel/msg_id.go +++ b/cl/sentinel/msg_id.go @@ -17,7 +17,7 @@ package sentinel import ( - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" ) diff --git a/cl/sentinel/msg_id_test.go b/cl/sentinel/msg_id_test.go index 80f3c999494..6eb83180056 100644 --- a/cl/sentinel/msg_id_test.go +++ b/cl/sentinel/msg_id_test.go @@ -22,10 +22,11 @@ import ( "testing" "github.com/golang/snappy" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" pubsubpb "github.com/libp2p/go-libp2p-pubsub/pb" "github.com/stretchr/testify/require" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" ) func TestMsgID(t *testing.T) { diff --git a/cl/sentinel/peers/pool.go b/cl/sentinel/peers/pool.go index b3d4b6d3502..ad969212ad6 100644 --- a/cl/sentinel/peers/pool.go +++ b/cl/sentinel/peers/pool.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/common/ring" + "github.com/erigontech/erigon-lib/common/ring" "github.com/libp2p/go-libp2p/core/peer" ) diff --git a/cl/sentinel/sentinel.go b/cl/sentinel/sentinel.go index 0600fa419c0..d9caa326902 100644 --- a/cl/sentinel/sentinel.go +++ b/cl/sentinel/sentinel.go @@ -30,16 +30,16 @@ import ( "github.com/go-chi/chi/v5" "github.com/prysmaticlabs/go-bitfield" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/sentinel/handlers" - "github.com/ledgerwatch/erigon/cl/sentinel/handshake" - "github.com/ledgerwatch/erigon/cl/sentinel/httpreqresp" - "github.com/ledgerwatch/erigon/cl/sentinel/peers" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/sentinel/handlers" + "github.com/erigontech/erigon/cl/sentinel/handshake" + "github.com/erigontech/erigon/cl/sentinel/httpreqresp" + "github.com/erigontech/erigon/cl/sentinel/peers" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "github.com/libp2p/go-libp2p" pubsub "github.com/libp2p/go-libp2p-pubsub" @@ -49,13 +49,13 @@ import ( rcmgr "github.com/libp2p/go-libp2p/p2p/host/resource-manager" rcmgrObs "github.com/libp2p/go-libp2p/p2p/host/resource-manager/obs" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/discover" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + sentinelrpc "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/discover" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) const ( diff --git a/cl/sentinel/sentinel_gossip_test.go b/cl/sentinel/sentinel_gossip_test.go index 529ac23e12c..db099b8b9d7 100644 --- a/cl/sentinel/sentinel_gossip_test.go +++ b/cl/sentinel/sentinel_gossip_test.go @@ -25,12 +25,12 @@ import ( "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) func getEthClock(t *testing.T) eth_clock.EthereumClock { diff --git a/cl/sentinel/sentinel_requests_test.go b/cl/sentinel/sentinel_requests_test.go index dbf57f72b14..ae59388ba0d 100644 --- a/cl/sentinel/sentinel_requests_test.go +++ b/cl/sentinel/sentinel_requests_test.go @@ -30,22 +30,22 @@ import ( "github.com/spf13/afero" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/mock_services" - "github.com/ledgerwatch/erigon/cl/sentinel/communication" - "github.com/ledgerwatch/erigon/cl/sentinel/communication/ssz_snappy" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/forkchoice/mock_services" + "github.com/erigontech/erigon/cl/sentinel/communication" + "github.com/erigontech/erigon/cl/sentinel/communication/ssz_snappy" + "github.com/erigontech/erigon/cl/utils" ) func loadChain(t *testing.T) (db kv.RwDB, blocks []*cltypes.SignedBeaconBlock, f afero.Fs, preState, postState *state.CachingBeaconState, reader *tests.MockBlockReader) { diff --git a/cl/sentinel/service/service.go b/cl/sentinel/service/service.go index 8bf038369b0..2084c1f8b11 100644 --- a/cl/sentinel/service/service.go +++ b/cl/sentinel/service/service.go @@ -29,18 +29,18 @@ import ( "time" "unicode" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/sentinel" - "github.com/ledgerwatch/erigon/cl/sentinel/httpreqresp" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/sentinel" + "github.com/erigontech/erigon/cl/sentinel/httpreqresp" "github.com/libp2p/go-libp2p/core/peer" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/gointerfaces" + sentinelrpc "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" ) const gracePeerCount = 8 diff --git a/cl/sentinel/service/start.go b/cl/sentinel/service/start.go index a6e7e5e9334..5df3ee9c2a1 100644 --- a/cl/sentinel/service/start.go +++ b/cl/sentinel/service/start.go @@ -23,22 +23,22 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/sentinel" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/sentinel" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "google.golang.org/grpc" "google.golang.org/grpc/credentials" - "github.com/ledgerwatch/erigon-lib/direct" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon-lib/direct" + sentinelrpc "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes" ) type ServerConfig struct { diff --git a/cl/sentinel/utils.go b/cl/sentinel/utils.go index 357be097c77..f108c91d257 100644 --- a/cl/sentinel/utils.go +++ b/cl/sentinel/utils.go @@ -30,11 +30,11 @@ import ( "github.com/pion/randutil" "github.com/prysmaticlabs/go-bitfield" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) func convertToInterfacePubkey(pubkey *ecdsa.PublicKey) (crypto.PubKey, error) { diff --git a/cl/spectest/consensus_tests/appendix.go b/cl/spectest/consensus_tests/appendix.go index aa54d533f71..820cca70a97 100644 --- a/cl/spectest/consensus_tests/appendix.go +++ b/cl/spectest/consensus_tests/appendix.go @@ -17,11 +17,11 @@ package consensus_tests import ( - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/spectest" ) var TestFormats = spectest.Appendix{} diff --git a/cl/spectest/consensus_tests/bls.go b/cl/spectest/consensus_tests/bls.go index 7414ae80901..7b7483d4110 100644 --- a/cl/spectest/consensus_tests/bls.go +++ b/cl/spectest/consensus_tests/bls.go @@ -20,7 +20,7 @@ import ( "io/fs" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" ) type BlsAggregateVerify struct { diff --git a/cl/spectest/consensus_tests/eip4844_proofs.go b/cl/spectest/consensus_tests/eip4844_proofs.go index 276a54099ba..e1868e66640 100644 --- a/cl/spectest/consensus_tests/eip4844_proofs.go +++ b/cl/spectest/consensus_tests/eip4844_proofs.go @@ -20,12 +20,12 @@ import ( "io/fs" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/spectest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/spectest" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/consensus_tests/epoch_processing.go b/cl/spectest/consensus_tests/epoch_processing.go index ad403eb34ad..1c12f705660 100644 --- a/cl/spectest/consensus_tests/epoch_processing.go +++ b/cl/spectest/consensus_tests/epoch_processing.go @@ -21,12 +21,12 @@ import ( "os" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2/statechange" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/transition/impl/eth2/statechange" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cl/spectest/consensus_tests/finality.go b/cl/spectest/consensus_tests/finality.go index 4da980a7e35..3a9c6924c1d 100644 --- a/cl/spectest/consensus_tests/finality.go +++ b/cl/spectest/consensus_tests/finality.go @@ -21,8 +21,8 @@ import ( "io/fs" "testing" - "github.com/ledgerwatch/erigon/cl/transition/machine" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/cl/transition/machine" + "github.com/erigontech/erigon/spectest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/cl/spectest/consensus_tests/fork_choice.go b/cl/spectest/consensus_tests/fork_choice.go index 1855558be41..e88fd21003b 100644 --- a/cl/spectest/consensus_tests/fork_choice.go +++ b/cl/spectest/consensus_tests/fork_choice.go @@ -23,31 +23,31 @@ import ( "math" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" "github.com/spf13/afero" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" - "github.com/ledgerwatch/erigon/cl/phase1/network/services" - "github.com/ledgerwatch/erigon/cl/pool" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph" + "github.com/erigontech/erigon/cl/phase1/network/services" + "github.com/erigontech/erigon/cl/pool" + "github.com/erigontech/erigon/cl/utils/eth_clock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/cl/cltypes" ) func (f *ForkChoiceStep) StepType() string { diff --git a/cl/spectest/consensus_tests/forks.go b/cl/spectest/consensus_tests/forks.go index 219ba64cf63..3fa64cf9f86 100644 --- a/cl/spectest/consensus_tests/forks.go +++ b/cl/spectest/consensus_tests/forks.go @@ -22,9 +22,9 @@ import ( "os" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/consensus_tests/light_client.go b/cl/spectest/consensus_tests/light_client.go index e428a77fb9c..cb38c51862c 100644 --- a/cl/spectest/consensus_tests/light_client.go +++ b/cl/spectest/consensus_tests/light_client.go @@ -20,11 +20,11 @@ import ( "io/fs" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/spectest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/spectest" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/consensus_tests/operations.go b/cl/spectest/consensus_tests/operations.go index d74c5e4d4dd..af719ecee74 100644 --- a/cl/spectest/consensus_tests/operations.go +++ b/cl/spectest/consensus_tests/operations.go @@ -22,12 +22,12 @@ import ( "os" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/consensus_tests/rewards.go b/cl/spectest/consensus_tests/rewards.go index 33ea194c87f..bc282f2084e 100644 --- a/cl/spectest/consensus_tests/rewards.go +++ b/cl/spectest/consensus_tests/rewards.go @@ -20,7 +20,7 @@ import ( "io/fs" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" ) type RewardsCore struct { diff --git a/cl/spectest/consensus_tests/sanity.go b/cl/spectest/consensus_tests/sanity.go index f2debfe1c7c..3fdba531233 100644 --- a/cl/spectest/consensus_tests/sanity.go +++ b/cl/spectest/consensus_tests/sanity.go @@ -21,10 +21,10 @@ import ( "os" "testing" - "github.com/ledgerwatch/erigon/cl/transition/machine" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/cl/transition/machine" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/consensus_tests/shuffling.go b/cl/spectest/consensus_tests/shuffling.go index 28b83c2857d..3ba6d951646 100644 --- a/cl/spectest/consensus_tests/shuffling.go +++ b/cl/spectest/consensus_tests/shuffling.go @@ -20,14 +20,14 @@ import ( "io/fs" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/shuffling" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/shuffling" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/consensus_tests/ssz_static.go b/cl/spectest/consensus_tests/ssz_static.go index 27644687fa1..2de8235d81e 100644 --- a/cl/spectest/consensus_tests/ssz_static.go +++ b/cl/spectest/consensus_tests/ssz_static.go @@ -22,19 +22,19 @@ import ( "io/fs" "testing" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon-lib/types/ssz" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" "gopkg.in/yaml.v2" ) diff --git a/cl/spectest/consensus_tests/transition.go b/cl/spectest/consensus_tests/transition.go index 8ba61ae77b9..edd10497938 100644 --- a/cl/spectest/consensus_tests/transition.go +++ b/cl/spectest/consensus_tests/transition.go @@ -21,11 +21,11 @@ import ( "io/fs" "testing" - "github.com/ledgerwatch/erigon/cl/transition/machine" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/cl/transition/machine" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/tests_test.go b/cl/spectest/tests_test.go index 4935bb0ad92..83258113c49 100644 --- a/cl/spectest/tests_test.go +++ b/cl/spectest/tests_test.go @@ -20,11 +20,11 @@ import ( "os" "testing" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" - "github.com/ledgerwatch/erigon/cl/transition" + "github.com/erigontech/erigon/cl/transition" - "github.com/ledgerwatch/erigon/cl/spectest/consensus_tests" + "github.com/erigontech/erigon/cl/spectest/consensus_tests" ) func Test(t *testing.T) { diff --git a/cl/ssz/decode.go b/cl/ssz/decode.go index f24236268d1..424ec0ca1fc 100644 --- a/cl/ssz/decode.go +++ b/cl/ssz/decode.go @@ -21,7 +21,7 @@ import ( "fmt" "reflect" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/types/ssz" ) /* diff --git a/cl/ssz/encode.go b/cl/ssz/encode.go index d01322c1a12..26fbf131bc2 100644 --- a/cl/ssz/encode.go +++ b/cl/ssz/encode.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/types/ssz" ) type Sized interface { diff --git a/cl/ssz/ssz_test.go b/cl/ssz/ssz_test.go index a1da7e5939e..69eacababd8 100644 --- a/cl/ssz/ssz_test.go +++ b/cl/ssz/ssz_test.go @@ -20,10 +20,10 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/transition/compat.go b/cl/transition/compat.go index 5b85dc5a2dd..815d91869fb 100644 --- a/cl/transition/compat.go +++ b/cl/transition/compat.go @@ -17,11 +17,11 @@ package transition import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2" - machine2 "github.com/ledgerwatch/erigon/cl/transition/machine" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/transition/impl/eth2" + machine2 "github.com/erigontech/erigon/cl/transition/machine" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes" ) var _ machine2.Interface = (*eth2.Impl)(nil) diff --git a/cl/transition/impl/eth2/block_processing_test.go b/cl/transition/impl/eth2/block_processing_test.go index 9662f5863c4..f9a3d1157c6 100644 --- a/cl/transition/impl/eth2/block_processing_test.go +++ b/cl/transition/impl/eth2/block_processing_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/transition" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/transition" + "github.com/erigontech/erigon/cl/utils" ) //go:embed statechange/test_data/block_processing/capella_block.ssz_snappy diff --git a/cl/transition/impl/eth2/impl.go b/cl/transition/impl/eth2/impl.go index 956e48e5c57..ec5311a542e 100644 --- a/cl/transition/impl/eth2/impl.go +++ b/cl/transition/impl/eth2/impl.go @@ -16,7 +16,7 @@ package eth2 -import "github.com/ledgerwatch/erigon/cl/transition/machine" +import "github.com/erigontech/erigon/cl/transition/machine" type Impl = impl diff --git a/cl/transition/impl/eth2/operations.go b/cl/transition/impl/eth2/operations.go index 0f0bf3c992d..3d9dab984f5 100644 --- a/cl/transition/impl/eth2/operations.go +++ b/cl/transition/impl/eth2/operations.go @@ -23,24 +23,24 @@ import ( "slices" "time" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2/statechange" + "github.com/erigontech/erigon/cl/transition/impl/eth2/statechange" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/utils" ) func (I *impl) ProcessProposerSlashing( diff --git a/cl/transition/impl/eth2/statechange/finalization_and_justification.go b/cl/transition/impl/eth2/statechange/finalization_and_justification.go index 4bbb49463f0..6c39010e3f7 100644 --- a/cl/transition/impl/eth2/statechange/finalization_and_justification.go +++ b/cl/transition/impl/eth2/statechange/finalization_and_justification.go @@ -17,11 +17,11 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // weighJustificationAndFinalization checks justification and finality of epochs and adds records to the state as needed. diff --git a/cl/transition/impl/eth2/statechange/process_effective_balance_update.go b/cl/transition/impl/eth2/statechange/process_effective_balance_update.go index 5e39cb1b12b..c7bbd0b813c 100644 --- a/cl/transition/impl/eth2/statechange/process_effective_balance_update.go +++ b/cl/transition/impl/eth2/statechange/process_effective_balance_update.go @@ -17,8 +17,8 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes/solid" ) // ProcessEffectiveBalanceUpdates updates the effective balance of validators. Specs at: https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#effective-balances-updates diff --git a/cl/transition/impl/eth2/statechange/process_epoch.go b/cl/transition/impl/eth2/statechange/process_epoch.go index 10fafa03e57..e76647e503f 100644 --- a/cl/transition/impl/eth2/statechange/process_epoch.go +++ b/cl/transition/impl/eth2/statechange/process_epoch.go @@ -17,10 +17,10 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func GetUnslashedIndiciesSet(cfg *clparams.BeaconChainConfig, previousEpoch uint64, validatorSet *solid.ValidatorSet, previousEpochPartecipation *solid.BitList) [][]bool { diff --git a/cl/transition/impl/eth2/statechange/process_epoch_test.go b/cl/transition/impl/eth2/statechange/process_epoch_test.go index a3ac26e3cf3..4002c23a370 100644 --- a/cl/transition/impl/eth2/statechange/process_epoch_test.go +++ b/cl/transition/impl/eth2/statechange/process_epoch_test.go @@ -20,11 +20,11 @@ import ( _ "embed" "testing" - "github.com/ledgerwatch/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/transition/impl/eth2/statechange/process_historical_roots.go b/cl/transition/impl/eth2/statechange/process_historical_roots.go index 166ac33e72a..e8ffe65301d 100644 --- a/cl/transition/impl/eth2/statechange/process_historical_roots.go +++ b/cl/transition/impl/eth2/statechange/process_historical_roots.go @@ -17,8 +17,8 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes/solid" ) func ProcessParticipationRecordUpdates(s abstract.BeaconState) error { diff --git a/cl/transition/impl/eth2/statechange/process_historical_roots_update.go b/cl/transition/impl/eth2/statechange/process_historical_roots_update.go index 0dbc0b56a33..a79a897c1b6 100644 --- a/cl/transition/impl/eth2/statechange/process_historical_roots_update.go +++ b/cl/transition/impl/eth2/statechange/process_historical_roots_update.go @@ -17,11 +17,11 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" ) // ProcessHistoricalRootsUpdate updates the historical root data structure by computing a new historical root batch when it is time to do so. diff --git a/cl/transition/impl/eth2/statechange/process_inactivity_scores.go b/cl/transition/impl/eth2/statechange/process_inactivity_scores.go index 89b95b98326..b51d265dfa5 100644 --- a/cl/transition/impl/eth2/statechange/process_inactivity_scores.go +++ b/cl/transition/impl/eth2/statechange/process_inactivity_scores.go @@ -17,8 +17,8 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // ProcessInactivityScores will updates the inactivity registry of each validator. diff --git a/cl/transition/impl/eth2/statechange/process_registry_updates.go b/cl/transition/impl/eth2/statechange/process_registry_updates.go index ffbc38ec742..161ff1e7e04 100644 --- a/cl/transition/impl/eth2/statechange/process_registry_updates.go +++ b/cl/transition/impl/eth2/statechange/process_registry_updates.go @@ -19,12 +19,12 @@ package statechange import ( "sort" - "github.com/ledgerwatch/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams" ) // computeActivationExitEpoch is Implementation of compute_activation_exit_epoch. Defined in https://github.com/ethereum/consensus-specs/blob/dev/specs/phase0/beacon-chain.md#compute_activation_exit_epoch. diff --git a/cl/transition/impl/eth2/statechange/process_rewards_and_penalties.go b/cl/transition/impl/eth2/statechange/process_rewards_and_penalties.go index ab30f99d66b..5cd1adb2c52 100644 --- a/cl/transition/impl/eth2/statechange/process_rewards_and_penalties.go +++ b/cl/transition/impl/eth2/statechange/process_rewards_and_penalties.go @@ -17,10 +17,10 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func processRewardsAndPenaltiesPostAltair(s abstract.BeaconState, eligibleValidators []uint64, flagsUnslashedIndiciesSet [][]bool) (err error) { diff --git a/cl/transition/impl/eth2/statechange/process_slashings.go b/cl/transition/impl/eth2/statechange/process_slashings.go index e531e6a757f..4fb4e9437a1 100644 --- a/cl/transition/impl/eth2/statechange/process_slashings.go +++ b/cl/transition/impl/eth2/statechange/process_slashings.go @@ -17,10 +17,10 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func processSlashings(s abstract.BeaconState, slashingMultiplier uint64) error { diff --git a/cl/transition/impl/eth2/statechange/process_sync_committee_update.go b/cl/transition/impl/eth2/statechange/process_sync_committee_update.go index 19bf2bff6a0..db2f2b3af5a 100644 --- a/cl/transition/impl/eth2/statechange/process_sync_committee_update.go +++ b/cl/transition/impl/eth2/statechange/process_sync_committee_update.go @@ -17,8 +17,8 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // ProcessSyncCommitteeUpdate implements processing for the sync committee update. unfortunately there is no easy way to test it. diff --git a/cl/transition/impl/eth2/statechange/process_sync_committee_update_test.go b/cl/transition/impl/eth2/statechange/process_sync_committee_update_test.go index d9fc32889fa..196ef806d65 100644 --- a/cl/transition/impl/eth2/statechange/process_sync_committee_update_test.go +++ b/cl/transition/impl/eth2/statechange/process_sync_committee_update_test.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/transition/impl/eth2/statechange" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/transition/impl/eth2/statechange" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" "github.com/stretchr/testify/require" ) diff --git a/cl/transition/impl/eth2/statechange/resets.go b/cl/transition/impl/eth2/statechange/resets.go index 50e86f3f24e..65126544ed9 100644 --- a/cl/transition/impl/eth2/statechange/resets.go +++ b/cl/transition/impl/eth2/statechange/resets.go @@ -17,8 +17,8 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func ProcessEth1DataReset(s abstract.BeaconState) { diff --git a/cl/transition/impl/eth2/utils.go b/cl/transition/impl/eth2/utils.go index dc1c0fab534..59759e8e5cf 100644 --- a/cl/transition/impl/eth2/utils.go +++ b/cl/transition/impl/eth2/utils.go @@ -19,10 +19,10 @@ package eth2 import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/utils" ) func computeSigningRootEpoch(epoch uint64, domain []byte) (libcommon.Hash, error) { diff --git a/cl/transition/impl/eth2/validation.go b/cl/transition/impl/eth2/validation.go index 27d6c5665f0..7f5c8c25445 100644 --- a/cl/transition/impl/eth2/validation.go +++ b/cl/transition/impl/eth2/validation.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/fork" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/fork" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func (I *impl) VerifyTransition(s abstract.BeaconState, currentBlock *cltypes.BeaconBlock) error { diff --git a/cl/transition/impl/funcmap/impl.go b/cl/transition/impl/funcmap/impl.go index 03a68324ed7..3c24aa77fb2 100644 --- a/cl/transition/impl/funcmap/impl.go +++ b/cl/transition/impl/funcmap/impl.go @@ -17,11 +17,11 @@ package funcmap import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/transition/machine" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/transition/machine" ) var _ machine.Interface = (*Impl)(nil) diff --git a/cl/transition/machine/block.go b/cl/transition/machine/block.go index 171a433d6ee..262c9595187 100644 --- a/cl/transition/machine/block.go +++ b/cl/transition/machine/block.go @@ -19,14 +19,14 @@ package machine import ( "fmt" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/phase1/core/state" "github.com/pkg/errors" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) // ProcessBlock processes a block with the block processor diff --git a/cl/transition/machine/helpers.go b/cl/transition/machine/helpers.go index ccc17049ef7..3ed244a3483 100644 --- a/cl/transition/machine/helpers.go +++ b/cl/transition/machine/helpers.go @@ -17,9 +17,9 @@ package machine import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func executionEnabled(s abstract.BeaconState, blockHash common.Hash) bool { diff --git a/cl/transition/machine/machine.go b/cl/transition/machine/machine.go index f9e139a4185..888ecac95d4 100644 --- a/cl/transition/machine/machine.go +++ b/cl/transition/machine/machine.go @@ -18,10 +18,10 @@ package machine import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) type Interface interface { diff --git a/cl/transition/machine/transition.go b/cl/transition/machine/transition.go index e0e079079f4..fc612a9f544 100644 --- a/cl/transition/machine/transition.go +++ b/cl/transition/machine/transition.go @@ -17,8 +17,8 @@ package machine import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes" ) // TransitionState will call impl..ProcessSlots, then impl.VerifyBlockSignature, then ProcessBlock, then impl.VerifyTransition diff --git a/cl/utils/blob.go b/cl/utils/blob.go index 2e6a42effc9..3dc95ea5ed0 100644 --- a/cl/utils/blob.go +++ b/cl/utils/blob.go @@ -17,7 +17,7 @@ package utils import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) const VERSIONED_HASH_VERSION_KZG byte = byte(1) diff --git a/cl/utils/bytes.go b/cl/utils/bytes.go index 15fa93739b0..e6c2ac25ff6 100644 --- a/cl/utils/bytes.go +++ b/cl/utils/bytes.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "math/bits" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/types/ssz" "github.com/golang/snappy" ) diff --git a/cl/utils/bytes_test.go b/cl/utils/bytes_test.go index cac6fe6ac6e..e3d11c28ef3 100644 --- a/cl/utils/bytes_test.go +++ b/cl/utils/bytes_test.go @@ -19,10 +19,10 @@ package utils_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/utils/crypto_test.go b/cl/utils/crypto_test.go index f29e03d6717..896cdaa95fa 100644 --- a/cl/utils/crypto_test.go +++ b/cl/utils/crypto_test.go @@ -19,7 +19,7 @@ package utils_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" ) func TestKeccak256(t *testing.T) { diff --git a/cl/utils/eth_clock/ethereum_clock.go b/cl/utils/eth_clock/ethereum_clock.go index ab2e152bbb3..6686f46eda6 100644 --- a/cl/utils/eth_clock/ethereum_clock.go +++ b/cl/utils/eth_clock/ethereum_clock.go @@ -21,9 +21,9 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" ) var maximumClockDisparity = 500 * time.Millisecond diff --git a/cl/utils/eth_clock/ethereum_clock_mock.go b/cl/utils/eth_clock/ethereum_clock_mock.go index ab444a50e4f..757028f484d 100644 --- a/cl/utils/eth_clock/ethereum_clock_mock.go +++ b/cl/utils/eth_clock/ethereum_clock_mock.go @@ -13,8 +13,8 @@ import ( reflect "reflect" time "time" - common "github.com/ledgerwatch/erigon-lib/common" - clparams "github.com/ledgerwatch/erigon/cl/clparams" + common "github.com/erigontech/erigon-lib/common" + clparams "github.com/erigontech/erigon/cl/clparams" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/utils/eth_clock/ethereum_clock_test.go b/cl/utils/eth_clock/ethereum_clock_test.go index c8bc59acba7..3e8b08c63d7 100644 --- a/cl/utils/eth_clock/ethereum_clock_test.go +++ b/cl/utils/eth_clock/ethereum_clock_test.go @@ -19,8 +19,8 @@ package eth_clock import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" "github.com/stretchr/testify/require" ) diff --git a/cl/utils/math_test.go b/cl/utils/math_test.go index 6e643806bf4..0c994ac87b8 100644 --- a/cl/utils/math_test.go +++ b/cl/utils/math_test.go @@ -19,7 +19,7 @@ package utils_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" ) func TestIsPowerOf2(t *testing.T) { diff --git a/cl/utils/merkle.go b/cl/utils/merkle.go index 3cf3049c07e..eb27d62b6e7 100644 --- a/cl/utils/merkle.go +++ b/cl/utils/merkle.go @@ -17,7 +17,7 @@ package utils import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // Check if leaf at index verifies against the Merkle root and branch diff --git a/cl/validator/attestation_producer/attestation_producer.go b/cl/validator/attestation_producer/attestation_producer.go index 838c8155b2a..b48ac1427d3 100644 --- a/cl/validator/attestation_producer/attestation_producer.go +++ b/cl/validator/attestation_producer/attestation_producer.go @@ -19,13 +19,13 @@ package attestation_producer import ( "errors" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/cl/transition" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/transition" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/cl/validator/attestation_producer/attestation_producer_test.go b/cl/validator/attestation_producer/attestation_producer_test.go index e28b3fdc26b..7dcf7b74d7b 100644 --- a/cl/validator/attestation_producer/attestation_producer_test.go +++ b/cl/validator/attestation_producer/attestation_producer_test.go @@ -19,9 +19,9 @@ package attestation_producer_test import ( "testing" - "github.com/ledgerwatch/erigon/cl/antiquary/tests" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/validator/attestation_producer" + "github.com/erigontech/erigon/cl/antiquary/tests" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/validator/attestation_producer" "github.com/stretchr/testify/require" ) diff --git a/cl/validator/attestation_producer/interface.go b/cl/validator/attestation_producer/interface.go index 81789ad6bb0..6700b48a6e3 100644 --- a/cl/validator/attestation_producer/interface.go +++ b/cl/validator/attestation_producer/interface.go @@ -17,8 +17,8 @@ package attestation_producer import ( - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" ) type AttestationDataProducer interface { diff --git a/cl/validator/committee_subscription/committee_subscription.go b/cl/validator/committee_subscription/committee_subscription.go index c7a701027cc..1f6859eec83 100644 --- a/cl/validator/committee_subscription/committee_subscription.go +++ b/cl/validator/committee_subscription/committee_subscription.go @@ -22,18 +22,18 @@ import ( "sync" "time" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/aggregation" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/network/subnets" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/aggregation" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/network/subnets" + "github.com/erigontech/erigon/cl/utils/eth_clock" ) var ( diff --git a/cl/validator/committee_subscription/interface.go b/cl/validator/committee_subscription/interface.go index e0c449e8262..1c2f3bf0149 100644 --- a/cl/validator/committee_subscription/interface.go +++ b/cl/validator/committee_subscription/interface.go @@ -19,8 +19,8 @@ package committee_subscription import ( "context" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" ) //go:generate mockgen -typed=true -destination=./mock_services/committee_subscribe_mock.go -package=mock_services . CommitteeSubscribe diff --git a/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go b/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go index bfdfee3dc12..58dd1c84e69 100644 --- a/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go +++ b/cl/validator/committee_subscription/mock_services/committee_subscribe_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/validator/committee_subscription (interfaces: CommitteeSubscribe) +// Source: github.com/erigontech/erigon/cl/validator/committee_subscription (interfaces: CommitteeSubscribe) // // Generated by this command: // @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" - solid "github.com/ledgerwatch/erigon/cl/cltypes/solid" + cltypes "github.com/erigontech/erigon/cl/cltypes" + solid "github.com/erigontech/erigon/cl/cltypes/solid" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/validator/sync_contribution_pool/interface.go b/cl/validator/sync_contribution_pool/interface.go index 8ba939a3b3b..655d0ffd269 100644 --- a/cl/validator/sync_contribution_pool/interface.go +++ b/cl/validator/sync_contribution_pool/interface.go @@ -17,9 +17,9 @@ package sync_contribution_pool import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" ) // SyncContributionPool is an interface for managing sync committee contributions and messages. diff --git a/cl/validator/sync_contribution_pool/mock_services/sync_contribution_pool_mock.go b/cl/validator/sync_contribution_pool/mock_services/sync_contribution_pool_mock.go index 37950068065..92dc4f3e7d5 100644 --- a/cl/validator/sync_contribution_pool/mock_services/sync_contribution_pool_mock.go +++ b/cl/validator/sync_contribution_pool/mock_services/sync_contribution_pool_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool (interfaces: SyncContributionPool) +// Source: github.com/erigontech/erigon/cl/validator/sync_contribution_pool (interfaces: SyncContributionPool) // // Generated by this command: // @@ -12,9 +12,9 @@ package mock_services import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - cltypes "github.com/ledgerwatch/erigon/cl/cltypes" - state "github.com/ledgerwatch/erigon/cl/phase1/core/state" + common "github.com/erigontech/erigon-lib/common" + cltypes "github.com/erigontech/erigon/cl/cltypes" + state "github.com/erigontech/erigon/cl/phase1/core/state" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/validator/sync_contribution_pool/sync_contribution_pool.go b/cl/validator/sync_contribution_pool/sync_contribution_pool.go index 24e9ec06b2c..d709b6dc766 100644 --- a/cl/validator/sync_contribution_pool/sync_contribution_pool.go +++ b/cl/validator/sync_contribution_pool/sync_contribution_pool.go @@ -22,12 +22,12 @@ import ( "sync" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" ) type syncContributionKey struct { diff --git a/cl/validator/sync_contribution_pool/sync_contribution_pool_test.go b/cl/validator/sync_contribution_pool/sync_contribution_pool_test.go index bdbd198608f..674b492ba60 100644 --- a/cl/validator/sync_contribution_pool/sync_contribution_pool_test.go +++ b/cl/validator/sync_contribution_pool/sync_contribution_pool_test.go @@ -20,12 +20,12 @@ import ( "testing" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" "github.com/stretchr/testify/require" ) diff --git a/cl/validator/validator_params/validator_params.go b/cl/validator/validator_params/validator_params.go index 17aa1769384..ebbc804df9d 100644 --- a/cl/validator/validator_params/validator_params.go +++ b/cl/validator/validator_params/validator_params.go @@ -19,7 +19,7 @@ package validator_params import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) type ValidatorParams struct { diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 0d64cdb4ca3..852b7919e1c 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -28,19 +28,19 @@ import ( "regexp" "strings" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/compiler" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - cli2 "github.com/ledgerwatch/erigon/turbo/cli" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/compiler" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + cli2 "github.com/erigontech/erigon/turbo/cli" ) var ( diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 5090142eb18..9e05bc07973 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -27,15 +27,15 @@ import ( "net" "os" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/turbo/logging" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/discover" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/turbo/logging" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/discover" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/p2p/netutil" ) func main() { diff --git a/cmd/capcli/cli.go b/cmd/capcli/cli.go index 29ba3794048..447848cb1b5 100644 --- a/cmd/capcli/cli.go +++ b/cmd/capcli/cli.go @@ -32,35 +32,35 @@ import ( "github.com/spf13/afero" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/metrics" - - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format/getters" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/persistence/state/historical_states_reader" - "github.com/ledgerwatch/erigon/cl/phase1/core" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/network" - "github.com/ledgerwatch/erigon/cl/phase1/stages" - "github.com/ledgerwatch/erigon/cl/rpc" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cmd/caplin/caplin1" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader/snaptype" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/metrics" + + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format/getters" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/persistence/state/historical_states_reader" + "github.com/erigontech/erigon/cl/phase1/core" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/network" + "github.com/erigontech/erigon/cl/phase1/stages" + "github.com/erigontech/erigon/cl/rpc" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cmd/caplin/caplin1" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) var CLI struct { diff --git a/cmd/caplin/caplin1/option.go b/cmd/caplin/caplin1/option.go index 6d141a26f47..c01ecf55afc 100644 --- a/cmd/caplin/caplin1/option.go +++ b/cmd/caplin/caplin1/option.go @@ -17,8 +17,8 @@ package caplin1 import ( - "github.com/ledgerwatch/erigon/cl/beacon/builder" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/beacon/builder" + "github.com/erigontech/erigon/cl/clparams" ) type option struct { diff --git a/cmd/caplin/caplin1/run.go b/cmd/caplin/caplin1/run.go index a755ea7ee51..0032ec9b213 100644 --- a/cmd/caplin/caplin1/run.go +++ b/cmd/caplin/caplin1/run.go @@ -25,54 +25,54 @@ import ( "google.golang.org/grpc/credentials" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/semaphore" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - "github.com/ledgerwatch/erigon/cl/aggregation" - "github.com/ledgerwatch/erigon/cl/antiquary" - "github.com/ledgerwatch/erigon/cl/beacon" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "github.com/ledgerwatch/erigon/cl/beacon/handler" - "github.com/ledgerwatch/erigon/cl/beacon/synced_data" - "github.com/ledgerwatch/erigon/cl/clparams/initial_state" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/rpc" - "github.com/ledgerwatch/erigon/cl/sentinel" - "github.com/ledgerwatch/erigon/cl/sentinel/service" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cl/validator/attestation_producer" - "github.com/ledgerwatch/erigon/cl/validator/committee_subscription" - "github.com/ledgerwatch/erigon/cl/validator/sync_contribution_pool" - "github.com/ledgerwatch/erigon/cl/validator/validator_params" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon/cl/aggregation" + "github.com/erigontech/erigon/cl/antiquary" + "github.com/erigontech/erigon/cl/beacon" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "github.com/erigontech/erigon/cl/beacon/handler" + "github.com/erigontech/erigon/cl/beacon/synced_data" + "github.com/erigontech/erigon/cl/clparams/initial_state" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/rpc" + "github.com/erigontech/erigon/cl/sentinel" + "github.com/erigontech/erigon/cl/sentinel/service" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cl/validator/attestation_producer" + "github.com/erigontech/erigon/cl/validator/committee_subscription" + "github.com/erigontech/erigon/cl/validator/sync_contribution_pool" + "github.com/erigontech/erigon/cl/validator/validator_params" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "github.com/spf13/afero" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" - state_accessors "github.com/ledgerwatch/erigon/cl/persistence/state" - "github.com/ledgerwatch/erigon/cl/persistence/state/historical_states_reader" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice" - "github.com/ledgerwatch/erigon/cl/phase1/forkchoice/fork_graph" - "github.com/ledgerwatch/erigon/cl/phase1/network" - "github.com/ledgerwatch/erigon/cl/phase1/network/services" - "github.com/ledgerwatch/erigon/cl/phase1/stages" - "github.com/ledgerwatch/erigon/cl/pool" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" + state_accessors "github.com/erigontech/erigon/cl/persistence/state" + "github.com/erigontech/erigon/cl/persistence/state/historical_states_reader" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/phase1/forkchoice" + "github.com/erigontech/erigon/cl/phase1/forkchoice/fork_graph" + "github.com/erigontech/erigon/cl/phase1/network" + "github.com/erigontech/erigon/cl/phase1/network/services" + "github.com/erigontech/erigon/cl/phase1/stages" + "github.com/erigontech/erigon/cl/pool" "github.com/Giulio2002/bls" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon/cl/clparams" ) func OpenCaplinDatabase(ctx context.Context, diff --git a/cmd/caplin/caplincli/config.go b/cmd/caplin/caplincli/config.go index a4028a43921..5b2129da027 100644 --- a/cmd/caplin/caplincli/config.go +++ b/cmd/caplin/caplincli/config.go @@ -25,14 +25,14 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cmd/caplin/caplinflags" - "github.com/ledgerwatch/erigon/cmd/sentinel/sentinelcli" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cmd/caplin/caplinflags" + "github.com/erigontech/erigon/cmd/sentinel/sentinelcli" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common" ) type CaplinCliCfg struct { diff --git a/cmd/caplin/caplinflags/flags.go b/cmd/caplin/caplinflags/flags.go index fd665c9c35b..b9ec72af1c8 100644 --- a/cmd/caplin/caplinflags/flags.go +++ b/cmd/caplin/caplinflags/flags.go @@ -17,7 +17,7 @@ package caplinflags import ( - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils" "github.com/urfave/cli/v2" ) diff --git a/cmd/caplin/main.go b/cmd/caplin/main.go index edc62a9e266..a527cca4abc 100644 --- a/cmd/caplin/main.go +++ b/cmd/caplin/main.go @@ -24,24 +24,24 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/phase1/core" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - execution_client2 "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/eth/ethconfig" - - "github.com/ledgerwatch/erigon/cmd/caplin/caplin1" - "github.com/ledgerwatch/erigon/cmd/caplin/caplincli" - "github.com/ledgerwatch/erigon/cmd/caplin/caplinflags" - "github.com/ledgerwatch/erigon/cmd/sentinel/sentinelflags" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/turbo/app" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/phase1/core" + "github.com/erigontech/erigon/cl/phase1/core/state" + execution_client2 "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/eth/ethconfig" + + "github.com/erigontech/erigon/cmd/caplin/caplin1" + "github.com/erigontech/erigon/cmd/caplin/caplincli" + "github.com/erigontech/erigon/cmd/caplin/caplinflags" + "github.com/erigontech/erigon/cmd/sentinel/sentinelflags" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/turbo/app" + "github.com/erigontech/erigon/turbo/debug" ) func main() { diff --git a/cmd/commitment-prefix/main.go b/cmd/commitment-prefix/main.go index 3754c019483..e192351d857 100644 --- a/cmd/commitment-prefix/main.go +++ b/cmd/commitment-prefix/main.go @@ -30,9 +30,10 @@ import ( "github.com/go-echarts/go-echarts/v2/components" "github.com/go-echarts/go-echarts/v2/opts" "github.com/go-echarts/go-echarts/v2/types" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/seg" - "github.com/ledgerwatch/erigon-lib/state" + + "github.com/erigontech/erigon-lib/commitment" + "github.com/erigontech/erigon-lib/seg" + "github.com/erigontech/erigon-lib/state" ) var ( diff --git a/cmd/devnet/README.md b/cmd/devnet/README.md index 8c68381cc8e..b3bb1d7c2f7 100644 --- a/cmd/devnet/README.md +++ b/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/main/DEV_CHAIN.md) for a manual version. +See [DEV_CHAIN](https://github.com/erigontech/erigon/blob/main/DEV_CHAIN.md) for a manual version. The devnet code performs 3 main functions: diff --git a/cmd/devnet/accounts/accounts.go b/cmd/devnet/accounts/accounts.go index ce59e371253..d981a236507 100644 --- a/cmd/devnet/accounts/accounts.go +++ b/cmd/devnet/accounts/accounts.go @@ -19,9 +19,9 @@ package accounts import ( "crypto/ecdsa" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" ) const DevAddress = "0x67b1d87101671b127f5f8714789C7192f7ad340e" diff --git a/cmd/devnet/accounts/steps/steps.go b/cmd/devnet/accounts/steps/steps.go index c4a790eea70..cadeaa203e9 100644 --- a/cmd/devnet/accounts/steps/steps.go +++ b/cmd/devnet/accounts/steps/steps.go @@ -22,17 +22,17 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "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/transactions" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/cmd/devnet/transactions" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) func init() { diff --git a/cmd/devnet/admin/ping.go b/cmd/devnet/admin/ping.go index 710686f0c52..3208d098ce3 100644 --- a/cmd/devnet/admin/ping.go +++ b/cmd/devnet/admin/ping.go @@ -19,8 +19,8 @@ package admin import ( "context" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/scenarios" ) func init() { diff --git a/cmd/devnet/args/node_args.go b/cmd/devnet/args/node_args.go index 62dacefca42..a0dc0e2cc05 100644 --- a/cmd/devnet/args/node_args.go +++ b/cmd/devnet/args/node_args.go @@ -25,13 +25,13 @@ import ( "path/filepath" "strconv" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/params" ) type NodeArgs struct { diff --git a/cmd/devnet/args/node_args_test.go b/cmd/devnet/args/node_args_test.go index 79b9bb259ed..e7e0e81a8c5 100644 --- a/cmd/devnet/args/node_args_test.go +++ b/cmd/devnet/args/node_args_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon/cmd/devnet/args" + "github.com/erigontech/erigon/cmd/devnet/args" ) func TestNodeArgs(t *testing.T) { diff --git a/cmd/devnet/blocks/checks.go b/cmd/devnet/blocks/checks.go index 69fd2921c44..cf4fa0740d8 100644 --- a/cmd/devnet/blocks/checks.go +++ b/cmd/devnet/blocks/checks.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/turbo/jsonrpc" ) var CompletionChecker = BlockHandlerFunc( diff --git a/cmd/devnet/blocks/fees.go b/cmd/devnet/blocks/fees.go index 2539ed6c2bb..07ac1812019 100644 --- a/cmd/devnet/blocks/fees.go +++ b/cmd/devnet/blocks/fees.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/rpc" ) func BaseFeeFromBlock(ctx context.Context) (uint64, error) { diff --git a/cmd/devnet/blocks/generator.go b/cmd/devnet/blocks/generator.go index e0c442f5683..17d69512490 100644 --- a/cmd/devnet/blocks/generator.go +++ b/cmd/devnet/blocks/generator.go @@ -22,12 +22,12 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/stages/mock" ) type TxFn func(_ *core.BlockGen, backend bind.ContractBackend) (types.Transaction, bool) diff --git a/cmd/devnet/blocks/waiter.go b/cmd/devnet/blocks/waiter.go index 44bfbe92623..c4747ed4f4e 100644 --- a/cmd/devnet/blocks/waiter.go +++ b/cmd/devnet/blocks/waiter.go @@ -19,14 +19,14 @@ package blocks import ( "context" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" ) type BlockHandler interface { diff --git a/cmd/devnet/contracts/backend.go b/cmd/devnet/contracts/backend.go index 536a959473f..c47590a90ca 100644 --- a/cmd/devnet/contracts/backend.go +++ b/cmd/devnet/contracts/backend.go @@ -21,15 +21,15 @@ import ( "fmt" "math/big" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) func NewBackend(node devnet.Node) bind.ContractBackend { diff --git a/cmd/devnet/contracts/gen_childreceiver.go b/cmd/devnet/contracts/gen_childreceiver.go index c4a88535535..55b39a483bf 100644 --- a/cmd/devnet/contracts/gen_childreceiver.go +++ b/cmd/devnet/contracts/gen_childreceiver.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_childsender.go b/cmd/devnet/contracts/gen_childsender.go index 4928cf39f51..e0924f63bc0 100644 --- a/cmd/devnet/contracts/gen_childsender.go +++ b/cmd/devnet/contracts/gen_childsender.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_faucet.go b/cmd/devnet/contracts/gen_faucet.go index fececc739de..fcd3741da20 100644 --- a/cmd/devnet/contracts/gen_faucet.go +++ b/cmd/devnet/contracts/gen_faucet.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_rootreceiver.go b/cmd/devnet/contracts/gen_rootreceiver.go index 5f9f39c9aac..f7c12822f37 100644 --- a/cmd/devnet/contracts/gen_rootreceiver.go +++ b/cmd/devnet/contracts/gen_rootreceiver.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_rootsender.go b/cmd/devnet/contracts/gen_rootsender.go index 472f96dbf8f..5aba6c02b1c 100644 --- a/cmd/devnet/contracts/gen_rootsender.go +++ b/cmd/devnet/contracts/gen_rootsender.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_subscription.go b/cmd/devnet/contracts/gen_subscription.go index cb1a209743a..3db9b1b436f 100644 --- a/cmd/devnet/contracts/gen_subscription.go +++ b/cmd/devnet/contracts/gen_subscription.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_testrootchain.go b/cmd/devnet/contracts/gen_testrootchain.go index 24d82755a52..b9150eb1f50 100644 --- a/cmd/devnet/contracts/gen_testrootchain.go +++ b/cmd/devnet/contracts/gen_testrootchain.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/gen_teststatesender.go b/cmd/devnet/contracts/gen_teststatesender.go index 7cecbef02a5..eb18a91b283 100644 --- a/cmd/devnet/contracts/gen_teststatesender.go +++ b/cmd/devnet/contracts/gen_teststatesender.go @@ -9,12 +9,12 @@ import ( "reflect" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/devnet/contracts/steps/l1l2transfers.go b/cmd/devnet/contracts/steps/l1l2transfers.go index 74c545644a2..0a6d05d3558 100644 --- a/cmd/devnet/contracts/steps/l1l2transfers.go +++ b/cmd/devnet/contracts/steps/l1l2transfers.go @@ -24,19 +24,19 @@ import ( "math" "math/big" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "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/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) func init() { diff --git a/cmd/devnet/contracts/steps/l2l1transfers.go b/cmd/devnet/contracts/steps/l2l1transfers.go index 18a17d12d3d..35174fcc98d 100644 --- a/cmd/devnet/contracts/steps/l2l1transfers.go +++ b/cmd/devnet/contracts/steps/l2l1transfers.go @@ -22,19 +22,19 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "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/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) func init() { diff --git a/cmd/devnet/contracts/steps/subscriber.go b/cmd/devnet/contracts/steps/subscriber.go index d70230d45fc..ec0e64ffd48 100644 --- a/cmd/devnet/contracts/steps/subscriber.go +++ b/cmd/devnet/contracts/steps/subscriber.go @@ -21,23 +21,23 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" - "github.com/ledgerwatch/erigon/cmd/devnet/transactions" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/common/hexutil" + + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/cmd/devnet/transactions" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" ) func init() { diff --git a/cmd/devnet/contracts/util.go b/cmd/devnet/contracts/util.go index 81f88184f10..c1dea2037b9 100644 --- a/cmd/devnet/contracts/util.go +++ b/cmd/devnet/contracts/util.go @@ -19,15 +19,15 @@ package contracts import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" ) func TransactOpts(ctx context.Context, sender libcommon.Address) (*bind.TransactOpts, error) { diff --git a/cmd/devnet/devnet/context.go b/cmd/devnet/devnet/context.go index 87048771caf..46a308ceb0b 100644 --- a/cmd/devnet/devnet/context.go +++ b/cmd/devnet/devnet/context.go @@ -20,7 +20,7 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type ctxKey int diff --git a/cmd/devnet/devnet/devnet.go b/cmd/devnet/devnet/devnet.go index 384af113b4c..9f381f4cf8b 100644 --- a/cmd/devnet/devnet/devnet.go +++ b/cmd/devnet/devnet/devnet.go @@ -22,7 +22,7 @@ import ( "regexp" "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type Devnet []*Network diff --git a/cmd/devnet/devnet/network.go b/cmd/devnet/devnet/network.go index 348a45c23ed..42679853775 100644 --- a/cmd/devnet/devnet/network.go +++ b/cmd/devnet/devnet/network.go @@ -26,18 +26,18 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" - devnet_args "github.com/ledgerwatch/erigon/cmd/devnet/args" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" - erigonapp "github.com/ledgerwatch/erigon/turbo/app" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" + devnet_args "github.com/erigontech/erigon/cmd/devnet/args" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" + erigonapp "github.com/erigontech/erigon/turbo/app" + erigoncli "github.com/erigontech/erigon/turbo/cli" ) type Network struct { diff --git a/cmd/devnet/devnet/node.go b/cmd/devnet/devnet/node.go index 3d081c8c561..c5835a73e9d 100644 --- a/cmd/devnet/devnet/node.go +++ b/cmd/devnet/devnet/node.go @@ -26,17 +26,17 @@ import ( "github.com/c2h5oh/datasize" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/args" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/diagnostics" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/debug" - enode "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/args" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/diagnostics" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/debug" + enode "github.com/erigontech/erigon/turbo/node" ) type Node interface { diff --git a/cmd/devnet/devnetutils/utils.go b/cmd/devnet/devnetutils/utils.go index cc42c01bbd0..6e89b5ee563 100644 --- a/cmd/devnet/devnetutils/utils.go +++ b/cmd/devnet/devnetutils/utils.go @@ -27,11 +27,11 @@ import ( "strconv" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" ) var ErrInvalidEnodeString = errors.New("invalid enode string") diff --git a/cmd/devnet/main.go b/cmd/devnet/main.go index 416f8a5d550..102d5a3e2be 100644 --- a/cmd/devnet/main.go +++ b/cmd/devnet/main.go @@ -29,26 +29,26 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/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" + "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon/cmd/devnet/accounts" + _ "github.com/erigontech/erigon/cmd/devnet/accounts/steps" + _ "github.com/erigontech/erigon/cmd/devnet/admin" + _ "github.com/erigontech/erigon/cmd/devnet/contracts/steps" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/cmd/devnet/networks" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/cmd/devnet/services/polygon" + "github.com/erigontech/erigon/cmd/utils/flags" + "github.com/erigontech/erigon/params" + erigon_app "github.com/erigontech/erigon/turbo/app" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" ) var ( diff --git a/cmd/devnet/networks/devnet_bor.go b/cmd/devnet/networks/devnet_bor.go index 862b4181388..6b2cf843b17 100644 --- a/cmd/devnet/networks/devnet_bor.go +++ b/cmd/devnet/networks/devnet_bor.go @@ -20,18 +20,18 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/args" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - account_services "github.com/ledgerwatch/erigon/cmd/devnet/services/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/services/polygon" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/args" + "github.com/erigontech/erigon/cmd/devnet/devnet" + account_services "github.com/erigontech/erigon/cmd/devnet/services/accounts" + "github.com/erigontech/erigon/cmd/devnet/services/polygon" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) func NewBorDevnetWithoutHeimdall( diff --git a/cmd/devnet/networks/devnet_dev.go b/cmd/devnet/networks/devnet_dev.go index 12a1ff3db03..afd7bd3aec1 100644 --- a/cmd/devnet/networks/devnet_dev.go +++ b/cmd/devnet/networks/devnet_dev.go @@ -19,13 +19,13 @@ package networks import ( "strconv" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/args" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - account_services "github.com/ledgerwatch/erigon/cmd/devnet/services/accounts" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/args" + "github.com/erigontech/erigon/cmd/devnet/devnet" + account_services "github.com/erigontech/erigon/cmd/devnet/services/accounts" + "github.com/erigontech/erigon/core/types" ) func NewDevDevnet( diff --git a/cmd/devnet/requests/account.go b/cmd/devnet/requests/account.go index 9d76f03b813..b89432d97a2 100644 --- a/cmd/devnet/requests/account.go +++ b/cmd/devnet/requests/account.go @@ -21,10 +21,10 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/rpc" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/rpc" ) type DebugAccountAt struct { diff --git a/cmd/devnet/requests/admin.go b/cmd/devnet/requests/admin.go index 96fae30bd39..7c3b0da8444 100644 --- a/cmd/devnet/requests/admin.go +++ b/cmd/devnet/requests/admin.go @@ -19,7 +19,7 @@ package requests import ( "context" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon/p2p" ) func (reqGen *requestGenerator) AdminNodeInfo() (p2p.NodeInfo, error) { diff --git a/cmd/devnet/requests/block.go b/cmd/devnet/requests/block.go index 3545bbd6aff..ac065c36779 100644 --- a/cmd/devnet/requests/block.go +++ b/cmd/devnet/requests/block.go @@ -21,14 +21,14 @@ import ( "encoding/json" "math/big" - hexutil2 "github.com/ledgerwatch/erigon-lib/common/hexutil" + hexutil2 "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" ) type BlockNumber string diff --git a/cmd/devnet/requests/event.go b/cmd/devnet/requests/event.go index b2b7bf27f1b..2451d8105f8 100644 --- a/cmd/devnet/requests/event.go +++ b/cmd/devnet/requests/event.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/types" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/core/types" ) func Compare(expected types.Log, actual types.Log) ([]error, bool) { diff --git a/cmd/devnet/requests/nopgenerator.go b/cmd/devnet/requests/nopgenerator.go index 09f5b55ff65..a2514f548b8 100644 --- a/cmd/devnet/requests/nopgenerator.go +++ b/cmd/devnet/requests/nopgenerator.go @@ -21,14 +21,14 @@ import ( "errors" "math/big" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/jsonrpc" ) var ErrNotImplemented = errors.New("not implemented") diff --git a/cmd/devnet/requests/request_generator.go b/cmd/devnet/requests/request_generator.go index d5f16b4b1e0..56d5d4e6016 100644 --- a/cmd/devnet/requests/request_generator.go +++ b/cmd/devnet/requests/request_generator.go @@ -31,16 +31,16 @@ import ( "github.com/valyala/fastjson" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/jsonrpc" ) type callResult struct { diff --git a/cmd/devnet/requests/trace.go b/cmd/devnet/requests/trace.go index c639b1f80c5..c1693cf2930 100644 --- a/cmd/devnet/requests/trace.go +++ b/cmd/devnet/requests/trace.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) type TraceCall struct { diff --git a/cmd/devnet/requests/transaction.go b/cmd/devnet/requests/transaction.go index 68dd170e8ca..01c5b9ec25c 100644 --- a/cmd/devnet/requests/transaction.go +++ b/cmd/devnet/requests/transaction.go @@ -23,15 +23,15 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon-lib/common/hexutil" + + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/jsonrpc" ) type ETHEstimateGas struct { diff --git a/cmd/devnet/scenarios/context.go b/cmd/devnet/scenarios/context.go index ae036b53b96..fa7bca3bb66 100644 --- a/cmd/devnet/scenarios/context.go +++ b/cmd/devnet/scenarios/context.go @@ -20,7 +20,7 @@ import ( "context" "sync" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/devnet" ) type ctxKey int diff --git a/cmd/devnet/scenarios/run.go b/cmd/devnet/scenarios/run.go index 258f4a1b579..dd82918499c 100644 --- a/cmd/devnet/scenarios/run.go +++ b/cmd/devnet/scenarios/run.go @@ -20,7 +20,7 @@ import ( "context" "sync" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" ) type SimulationInitializer func(*SimulationContext) diff --git a/cmd/devnet/scenarios/scenario.go b/cmd/devnet/scenarios/scenario.go index c64c7d64152..29aeace1db5 100644 --- a/cmd/devnet/scenarios/scenario.go +++ b/cmd/devnet/scenarios/scenario.go @@ -26,8 +26,8 @@ import ( "runtime" "unicode" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/devnet/devnet" ) var ( diff --git a/cmd/devnet/scenarios/suite.go b/cmd/devnet/scenarios/suite.go index 4412d56b523..8fa5fbeac9e 100644 --- a/cmd/devnet/scenarios/suite.go +++ b/cmd/devnet/scenarios/suite.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/devnet/devnet" ) type SimulationContext struct { diff --git a/cmd/devnet/services/accounts/faucet.go b/cmd/devnet/services/accounts/faucet.go index e8f775992a6..daf0233a754 100644 --- a/cmd/devnet/services/accounts/faucet.go +++ b/cmd/devnet/services/accounts/faucet.go @@ -23,13 +23,13 @@ import ( "strings" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/rpc" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/rpc" ) type Faucet struct { diff --git a/cmd/devnet/services/context.go b/cmd/devnet/services/context.go index 9b90e5cb48e..4b02d5d7067 100644 --- a/cmd/devnet/services/context.go +++ b/cmd/devnet/services/context.go @@ -19,9 +19,9 @@ package services import ( "context" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/services/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/services/polygon" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/services/accounts" + "github.com/erigontech/erigon/cmd/devnet/services/polygon" ) type ctxKey int diff --git a/cmd/devnet/services/polygon/checkpoint.go b/cmd/devnet/services/polygon/checkpoint.go index 69679ac8dba..c1f9b7b1c6d 100644 --- a/cmd/devnet/services/polygon/checkpoint.go +++ b/cmd/devnet/services/polygon/checkpoint.go @@ -26,18 +26,18 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/polygon/heimdall" ) type CheckpointBlock struct { diff --git a/cmd/devnet/services/polygon/heimdall.go b/cmd/devnet/services/polygon/heimdall.go index ecf1cec7e61..018a2cd0d15 100644 --- a/cmd/devnet/services/polygon/heimdall.go +++ b/cmd/devnet/services/polygon/heimdall.go @@ -31,19 +31,19 @@ import ( "github.com/go-chi/chi/v5" - "github.com/ledgerwatch/erigon-lib/log/v3" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/log/v3" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall" ) type BridgeEvent string diff --git a/cmd/devnet/services/polygon/heimdall_test.go b/cmd/devnet/services/polygon/heimdall_test.go index 044b5637334..29e31540ae7 100644 --- a/cmd/devnet/services/polygon/heimdall_test.go +++ b/cmd/devnet/services/polygon/heimdall_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/heimdall" ) func TestHeimdallServer(t *testing.T) { diff --git a/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator.go b/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator.go index c6657ded1ad..30191beb39e 100644 --- a/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator.go +++ b/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator.go @@ -23,12 +23,12 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) type HeimdallSimulator struct { diff --git a/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go b/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go index 6cee73e4f0f..8031a036e19 100644 --- a/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go +++ b/cmd/devnet/services/polygon/heimdallsim/heimdall_simulator_test.go @@ -27,10 +27,10 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/services/polygon/heimdallsim" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/cmd/devnet/services/polygon/heimdallsim" + "github.com/erigontech/erigon/polygon/heimdall" ) //go:embed testdata/v1-000000-000500-borevents.seg diff --git a/cmd/devnet/services/polygon/proofgenerator.go b/cmd/devnet/services/polygon/proofgenerator.go index 91f06565492..4c8fb7c12d8 100644 --- a/cmd/devnet/services/polygon/proofgenerator.go +++ b/cmd/devnet/services/polygon/proofgenerator.go @@ -26,22 +26,22 @@ import ( "strings" "sync" - "github.com/ledgerwatch/erigon/cl/merkle_tree" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" + "github.com/erigontech/erigon/cl/merkle_tree" + bortypes "github.com/erigontech/erigon/polygon/bor/types" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/trie" ) var ErrTokenIndexOutOfRange = errors.New("index is grater than the number of tokens in transaction") diff --git a/cmd/devnet/services/polygon/proofgenerator_test.go b/cmd/devnet/services/polygon/proofgenerator_test.go index 50785de208d..ecc01979643 100644 --- a/cmd/devnet/services/polygon/proofgenerator_test.go +++ b/cmd/devnet/services/polygon/proofgenerator_test.go @@ -29,34 +29,34 @@ import ( "github.com/holiman/uint256" "github.com/pion/randutil" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "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/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/transactions" ) type requestGenerator struct { diff --git a/cmd/devnet/services/polygon/statesync.go b/cmd/devnet/services/polygon/statesync.go index f5691a2697c..00305b418af 100644 --- a/cmd/devnet/services/polygon/statesync.go +++ b/cmd/devnet/services/polygon/statesync.go @@ -23,9 +23,9 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/cmd/devnet/contracts" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/cmd/devnet/contracts" + "github.com/erigontech/erigon/polygon/heimdall" ) // Maximum allowed event record data size diff --git a/cmd/devnet/services/polygon/util.go b/cmd/devnet/services/polygon/util.go index 714f7ca1b2d..a716f0384fe 100644 --- a/cmd/devnet/services/polygon/util.go +++ b/cmd/devnet/services/polygon/util.go @@ -23,10 +23,10 @@ import ( "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/types" ) // UnpackLog unpacks log diff --git a/cmd/devnet/services/subscriptions.go b/cmd/devnet/services/subscriptions.go index dedd5e9e05b..cff78bc80eb 100644 --- a/cmd/devnet/services/subscriptions.go +++ b/cmd/devnet/services/subscriptions.go @@ -20,12 +20,12 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/rpc" ) func init() { diff --git a/cmd/devnet/tests/bor_devnet_test.go b/cmd/devnet/tests/bor_devnet_test.go index 7de34797ae4..2d166a3d7ed 100644 --- a/cmd/devnet/tests/bor_devnet_test.go +++ b/cmd/devnet/tests/bor_devnet_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - accounts_steps "github.com/ledgerwatch/erigon/cmd/devnet/accounts/steps" - contracts_steps "github.com/ledgerwatch/erigon/cmd/devnet/contracts/steps" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/cmd/devnet/services" + "github.com/erigontech/erigon-lib/chain/networkname" + accounts_steps "github.com/erigontech/erigon/cmd/devnet/accounts/steps" + contracts_steps "github.com/erigontech/erigon/cmd/devnet/contracts/steps" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/services" ) func TestStateSync(t *testing.T) { diff --git a/cmd/devnet/tests/context.go b/cmd/devnet/tests/context.go index 1bc37ac0a57..83d3c877c49 100644 --- a/cmd/devnet/tests/context.go +++ b/cmd/devnet/tests/context.go @@ -23,14 +23,14 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/networks" - "github.com/ledgerwatch/erigon/cmd/devnet/services" - "github.com/ledgerwatch/erigon/cmd/devnet/services/polygon" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/networks" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/cmd/devnet/services/polygon" + "github.com/erigontech/erigon/turbo/debug" ) func initDevnet(chainName string, dataDir string, producerCount int, gasLimit uint64, logger log.Logger, consoleLogLevel log.Lvl, dirLogLevel log.Lvl) (devnet.Devnet, error) { diff --git a/cmd/devnet/tests/generic_devnet_test.go b/cmd/devnet/tests/generic_devnet_test.go index 0b5c374b286..c252e8ec84c 100644 --- a/cmd/devnet/tests/generic_devnet_test.go +++ b/cmd/devnet/tests/generic_devnet_test.go @@ -25,12 +25,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/admin" - contracts_steps "github.com/ledgerwatch/erigon/cmd/devnet/contracts/steps" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/cmd/devnet/services" - "github.com/ledgerwatch/erigon/cmd/devnet/transactions" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/admin" + contracts_steps "github.com/erigontech/erigon/cmd/devnet/contracts/steps" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/cmd/devnet/transactions" ) func testDynamicTx(t *testing.T, ctx context.Context) { diff --git a/cmd/devnet/transactions/block.go b/cmd/devnet/transactions/block.go index eb4b96dccf1..47eb2a2bfab 100644 --- a/cmd/devnet/transactions/block.go +++ b/cmd/devnet/transactions/block.go @@ -21,16 +21,16 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" - "github.com/ledgerwatch/erigon/cmd/devnet/requests" - "github.com/ledgerwatch/erigon/cmd/devnet/services" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/cmd/devnet/requests" + "github.com/erigontech/erigon/cmd/devnet/services" + "github.com/erigontech/erigon/rpc" ) // max number of blocks to look for a transaction in diff --git a/cmd/devnet/transactions/tx.go b/cmd/devnet/transactions/tx.go index 28ba82b4689..c97a2ffb2ce 100644 --- a/cmd/devnet/transactions/tx.go +++ b/cmd/devnet/transactions/tx.go @@ -22,21 +22,21 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/blocks" - "github.com/ledgerwatch/erigon/cmd/devnet/devnet" - "github.com/ledgerwatch/erigon/cmd/devnet/devnetutils" - "github.com/ledgerwatch/erigon/cmd/devnet/scenarios" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/cmd/devnet/accounts" + "github.com/erigontech/erigon/cmd/devnet/blocks" + "github.com/erigontech/erigon/cmd/devnet/devnet" + "github.com/erigontech/erigon/cmd/devnet/devnetutils" + "github.com/erigontech/erigon/cmd/devnet/scenarios" + "github.com/erigontech/erigon/rpc" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func init() { diff --git a/cmd/diag/db/db.go b/cmd/diag/db/db.go index eaf7916e2fb..6962ab64247 100644 --- a/cmd/diag/db/db.go +++ b/cmd/diag/db/db.go @@ -22,10 +22,11 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/ledgerwatch/erigon/cmd/diag/util" "github.com/urfave/cli/v2" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/diag/flags" + "github.com/erigontech/erigon/cmd/diag/util" ) type DBInfo struct { diff --git a/cmd/diag/downloader/diag_downloader.go b/cmd/diag/downloader/diag_downloader.go index 6c31e015d8b..7a72e5a5680 100644 --- a/cmd/diag/downloader/diag_downloader.go +++ b/cmd/diag/downloader/diag_downloader.go @@ -22,11 +22,12 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/jedib0t/go-pretty/v6/text" - "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" "github.com/urfave/cli/v2" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon/cmd/diag/flags" + "github.com/erigontech/erigon/cmd/diag/util" ) var ( diff --git a/cmd/diag/main.go b/cmd/diag/main.go index 42873c33d57..fab1ad3e178 100644 --- a/cmd/diag/main.go +++ b/cmd/diag/main.go @@ -26,16 +26,16 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/diag/db" + "github.com/erigontech/erigon/cmd/diag/downloader" + "github.com/erigontech/erigon/cmd/diag/stages" + "github.com/erigontech/erigon/cmd/diag/ui" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/logging" ) func main() { diff --git a/cmd/diag/readme.md b/cmd/diag/readme.md index 279a0f7258b..69c02ce6d4c 100644 --- a/cmd/diag/readme.md +++ b/cmd/diag/readme.md @@ -7,7 +7,7 @@ Diagnostics command is implemented to retrieve information from the Erigon node ### Diagnostics command local connection diagram ![overview](./_images/local_connection.png) -[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) ## Available commands | | | @@ -93,4 +93,4 @@ Serve diagnostics ui locally |ui.addr|`127.0.0.1:6060`|string|URL to serve UI web application.| |||| -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. \ No newline at end of file +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. \ No newline at end of file diff --git a/cmd/diag/stages/stages.go b/cmd/diag/stages/stages.go index 119f39194cb..dccb4377b1f 100644 --- a/cmd/diag/stages/stages.go +++ b/cmd/diag/stages/stages.go @@ -23,10 +23,11 @@ import ( "time" "github.com/jedib0t/go-pretty/v6/table" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/ledgerwatch/erigon/cmd/diag/util" "github.com/urfave/cli/v2" + + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon/cmd/diag/flags" + "github.com/erigontech/erigon/cmd/diag/util" ) var Command = cli.Command{ diff --git a/cmd/diag/ui/ui.go b/cmd/diag/ui/ui.go index fa277d53f60..e0560ecb827 100644 --- a/cmd/diag/ui/ui.go +++ b/cmd/diag/ui/ui.go @@ -24,14 +24,15 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigonwatch" - "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" - "github.com/ledgerwatch/erigon/cmd/diag/flags" "github.com/urfave/cli/v2" + + "github.com/ledgerwatch/erigonwatch" + + "github.com/erigontech/erigon/cmd/diag/flags" ) var ( diff --git a/cmd/downloader/downloadernat/nat.go b/cmd/downloader/downloadernat/nat.go index caff7dda9b7..7a6c715168d 100644 --- a/cmd/downloader/downloadernat/nat.go +++ b/cmd/downloader/downloadernat/nat.go @@ -19,8 +19,8 @@ package downloadernat import ( "github.com/anacrolix/torrent" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/nat" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/nat" ) // DoNat can mutate `cfg` parameter diff --git a/cmd/downloader/main.go b/cmd/downloader/main.go index 3793ffd55e0..c79cc9fd8c2 100644 --- a/cmd/downloader/main.go +++ b/cmd/downloader/main.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" - _ "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 "github.com/anacrolix/torrent/metainfo" "github.com/c2h5oh/datasize" @@ -46,26 +46,26 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - "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/downloaderproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cmd/downloader/downloadernat" - "github.com/ledgerwatch/erigon/cmd/hack/tool" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/downloadergrpc" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/downloader/downloadernat" + "github.com/erigontech/erigon/cmd/hack/tool" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" ) func main() { diff --git a/cmd/erigon/main.go b/cmd/erigon/main.go index 1dfa5dfda1c..b105ae7acbd 100644 --- a/cmd/erigon/main.go +++ b/cmd/erigon/main.go @@ -23,17 +23,17 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/diagnostics" - "github.com/ledgerwatch/erigon/params" - erigonapp "github.com/ledgerwatch/erigon/turbo/app" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/diagnostics" + "github.com/erigontech/erigon/params" + erigonapp "github.com/erigontech/erigon/turbo/app" + erigoncli "github.com/erigontech/erigon/turbo/cli" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/node" ) func main() { diff --git a/cmd/erigoncustom/main.go b/cmd/erigoncustom/main.go index 4d8148de650..8318fb40219 100644 --- a/cmd/erigoncustom/main.go +++ b/cmd/erigoncustom/main.go @@ -22,8 +22,8 @@ import ( "github.com/urfave/cli/v2" - erigonapp "github.com/ledgerwatch/erigon/turbo/app" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" + erigonapp "github.com/erigontech/erigon/turbo/app" + erigoncli "github.com/erigontech/erigon/turbo/cli" ) // defining a custom command-line flag, a string diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index 0beae1a067f..690ed517fe9 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -26,7 +26,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/cmd/evm/internal/compiler" + "github.com/erigontech/erigon/cmd/evm/internal/compiler" ) var compileCommand = cli.Command{ diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index 05d950f00d9..20561a44706 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -27,7 +27,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/core/asm" + "github.com/erigontech/erigon/core/asm" ) var disasmCommand = cli.Command{ diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index a4d5dce0a00..127ec949a34 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -23,7 +23,7 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon/core/asm" + "github.com/erigontech/erigon/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index 86548acd244..9cf60061557 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -24,17 +24,18 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - state3 "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + state3 "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/rpchelper" ) type Prestate struct { diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go index 638c6fc546e..333678b0584 100644 --- a/cmd/evm/internal/t8ntool/flags.go +++ b/cmd/evm/internal/t8ntool/flags.go @@ -25,8 +25,8 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/tests" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/tests" ) var ( diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go index 2b1bb7479e9..b4a60de2f13 100644 --- a/cmd/evm/internal/t8ntool/gen_stenv.go +++ b/cmd/evm/internal/t8ntool/gen_stenv.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - common0 "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + common0 "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" ) var _ = (*stEnvMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go index 97ed7f7bacc..f2a161867c5 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -33,29 +33,29 @@ import ( "github.com/holiman/uint256" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/consensuschain" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - trace_logger "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/consensuschain" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + trace_logger "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/jsonrpc" ) const ( diff --git a/cmd/evm/main.go b/cmd/evm/main.go index 21577d254cc..a5745b7070a 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -27,12 +27,12 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/evm/internal/t8ntool" - "github.com/ledgerwatch/erigon/cmd/utils/flags" - "github.com/ledgerwatch/erigon/params" - cli2 "github.com/ledgerwatch/erigon/turbo/cli" + "github.com/erigontech/erigon/cmd/evm/internal/t8ntool" + "github.com/erigontech/erigon/cmd/utils/flags" + "github.com/erigontech/erigon/params" + cli2 "github.com/erigontech/erigon/turbo/cli" ) var ( diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index 9720eb095fd..70ca45700a4 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -33,26 +33,26 @@ import ( "time" "github.com/holiman/uint256" - state2 "github.com/ledgerwatch/erigon-lib/state" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - common2 "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/utils/flags" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + common2 "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + state2 "github.com/erigontech/erigon-lib/state" - "github.com/ledgerwatch/erigon/cmd/evm/internal/compiler" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/runtime" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/cmd/evm/internal/compiler" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils/flags" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/runtime" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/params" ) var runCommand = cli.Command{ diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index a76c1d34e08..184274bc748 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -31,19 +31,19 @@ import ( mdbx2 "github.com/erigontech/mdbx-go/mdbx" "github.com/urfave/cli/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - libstate "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/tests" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/tests" ) var stateTestCommand = cli.Command{ diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index ea6011dcc12..10bef940668 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -28,7 +28,7 @@ import ( "testing" "github.com/docker/docker/pkg/reexec" - "github.com/ledgerwatch/erigon/turbo/cmdtest" + "github.com/erigontech/erigon/turbo/cmdtest" ) func TestMain(m *testing.M) { diff --git a/cmd/hack/db/lmdb.go b/cmd/hack/db/lmdb.go index ff5c5c4886b..52e64f2570d 100644 --- a/cmd/hack/db/lmdb.go +++ b/cmd/hack/db/lmdb.go @@ -29,10 +29,10 @@ import ( "path/filepath" "strings" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" + "github.com/erigontech/erigon-lib/kv" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/debug" ) var logger = log.New() diff --git a/cmd/hack/flow/flow.go b/cmd/hack/flow/flow.go index 0b0621cc6b2..2a964c253eb 100644 --- a/cmd/hack/flow/flow.go +++ b/cmd/hack/flow/flow.go @@ -30,11 +30,11 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon/cmd/hack/tool" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/cmd/hack/tool" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/vm" ) const ( diff --git a/cmd/hack/hack.go b/cmd/hack/hack.go index 87c29cca2ba..1215c7cba18 100644 --- a/cmd/hack/hack.go +++ b/cmd/hack/hack.go @@ -34,39 +34,39 @@ import ( "sort" "strings" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/RoaringBitmap/roaring/roaring64" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" - - hackdb "github.com/ledgerwatch/erigon/cmd/hack/db" - "github.com/ledgerwatch/erigon/cmd/hack/flow" - "github.com/ledgerwatch/erigon/cmd/hack/tool" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/cbor" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" + + hackdb "github.com/erigontech/erigon/cmd/hack/db" + "github.com/erigontech/erigon/cmd/hack/flow" + "github.com/erigontech/erigon/cmd/hack/tool" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/cbor" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) var ( diff --git a/cmd/hack/scripts/geth_log_parse.py b/cmd/hack/scripts/geth_log_parse.py index d3d9e167a6f..c6b2c6dfa36 100644 --- a/cmd/hack/scripts/geth_log_parse.py +++ b/cmd/hack/scripts/geth_log_parse.py @@ -1,6 +1,6 @@ import datetime -with open('/Users/alexeyakhunov/workspace/src/github.com/ledgerwatch/erigon/badger.log') as f: +with open('/Users/alexeyakhunov/workspace/src/github.com/erigontech/erigon/badger.log') as f: lines = f.readlines() print(len(lines)) @@ -13,7 +13,7 @@ db_size = 0 heap = 0 -with open('/Users/alexeyakhunov/workspace/src/github.com/ledgerwatch/erigon/badger.csv', 'w') as w: +with open('/Users/alexeyakhunov/workspace/src/github.com/erigontech/erigon/badger.csv', 'w') as w: for l in lines: if l.startswith('Oct'): diff --git a/cmd/hack/tool/fromdb/tool.go b/cmd/hack/tool/fromdb/tool.go index e8c1b6d673d..247d485c8e8 100644 --- a/cmd/hack/tool/fromdb/tool.go +++ b/cmd/hack/tool/fromdb/tool.go @@ -19,10 +19,10 @@ package fromdb import ( "context" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/hack/tool" - "github.com/ledgerwatch/erigon/ethdb/prune" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/hack/tool" + "github.com/erigontech/erigon/ethdb/prune" ) func ChainConfig(db kv.RoDB) (cc *chain.Config) { diff --git a/cmd/hack/tool/tool.go b/cmd/hack/tool/tool.go index 66b43add3b1..6944884b1e5 100644 --- a/cmd/hack/tool/tool.go +++ b/cmd/hack/tool/tool.go @@ -20,9 +20,9 @@ import ( "context" "strconv" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" ) func Check(e error) { diff --git a/cmd/integration/commands/flags.go b/cmd/integration/commands/flags.go index a760452aa06..1a70a4280b1 100644 --- a/cmd/integration/commands/flags.go +++ b/cmd/integration/commands/flags.go @@ -19,10 +19,10 @@ package commands import ( "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon/turbo/cli" + "github.com/erigontech/erigon/turbo/cli" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/eth/ethconfig" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/eth/ethconfig" ) var ( diff --git a/cmd/integration/commands/refetence_db.go b/cmd/integration/commands/refetence_db.go index 0e8d2adf0be..6c8cb4d4a74 100644 --- a/cmd/integration/commands/refetence_db.go +++ b/cmd/integration/commands/refetence_db.go @@ -31,15 +31,15 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/backup" - mdbx2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/backup" + mdbx2 "github.com/erigontech/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/turbo/debug" ) var stateBuckets = []string{ diff --git a/cmd/integration/commands/reset_state.go b/cmd/integration/commands/reset_state.go index fea9d9f94f7..a1138763b48 100644 --- a/cmd/integration/commands/reset_state.go +++ b/cmd/integration/commands/reset_state.go @@ -24,22 +24,22 @@ import ( "os" "text/tabwriter" - "github.com/ledgerwatch/erigon-lib/kv/backup" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv/backup" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - "github.com/ledgerwatch/erigon/core/rawdb/rawdbhelpers" - reset2 "github.com/ledgerwatch/erigon/core/rawdb/rawdbreset" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + + "github.com/erigontech/erigon/core/rawdb/rawdbhelpers" + reset2 "github.com/erigontech/erigon/core/rawdb/rawdbreset" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/turbo/debug" ) var cmdResetState = &cobra.Command{ diff --git a/cmd/integration/commands/root.go b/cmd/integration/commands/root.go index 44570aef1b4..f54a47310ac 100644 --- a/cmd/integration/commands/root.go +++ b/cmd/integration/commands/root.go @@ -26,16 +26,16 @@ import ( "github.com/spf13/cobra" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/migrations" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/migrations" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" ) func expandHomeDir(dirpath string) string { diff --git a/cmd/integration/commands/stages.go b/cmd/integration/commands/stages.go index 56230f9d5d1..fc1bc1e028b 100644 --- a/cmd/integration/commands/stages.go +++ b/cmd/integration/commands/stages.go @@ -37,49 +37,49 @@ import ( "github.com/erigontech/mdbx-go/mdbx" "github.com/erigontech/secp256k1" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/log/v3" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - reset2 "github.com/ledgerwatch/erigon/core/rawdb/rawdbreset" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconsensusconfig" - "github.com/ledgerwatch/erigon/eth/integrity" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/migrations" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/snap" - stages2 "github.com/ledgerwatch/erigon/turbo/stages" + chain2 "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cmd/hack/tool/fromdb" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + reset2 "github.com/erigontech/erigon/core/rawdb/rawdbreset" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconsensusconfig" + "github.com/erigontech/erigon/eth/integrity" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/migrations" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon/turbo/snapshotsync/snap" + stages2 "github.com/erigontech/erigon/turbo/stages" ) var cmdStageSnapshots = &cobra.Command{ diff --git a/cmd/integration/commands/state_domains.go b/cmd/integration/commands/state_domains.go index 1e97fb858bb..2b9dd3712e0 100644 --- a/cmd/integration/commands/state_domains.go +++ b/cmd/integration/commands/state_domains.go @@ -24,24 +24,24 @@ import ( "path/filepath" "strings" - state3 "github.com/ledgerwatch/erigon-lib/state" + state3 "github.com/erigontech/erigon-lib/state" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/node/nodecfg" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/node/nodecfg" + erigoncli "github.com/erigontech/erigon/turbo/cli" + "github.com/erigontech/erigon/turbo/debug" ) func init() { diff --git a/cmd/integration/commands/state_stages.go b/cmd/integration/commands/state_stages.go index a7326401167..974d082fe15 100644 --- a/cmd/integration/commands/state_stages.go +++ b/cmd/integration/commands/state_stages.go @@ -25,31 +25,31 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon-lib/wrap" + "github.com/erigontech/erigon-lib/wrap" "github.com/c2h5oh/datasize" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/log/v3" - - chain2 "github.com/ledgerwatch/erigon-lib/chain" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/debugprint" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon-lib/log/v3" + + chain2 "github.com/erigontech/erigon-lib/chain" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/hack/tool/fromdb" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/debugprint" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + erigoncli "github.com/erigontech/erigon/turbo/cli" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/shards" ) var stateStages = &cobra.Command{ diff --git a/cmd/integration/main.go b/cmd/integration/main.go index 19912a5f045..ec0156e072e 100644 --- a/cmd/integration/main.go +++ b/cmd/integration/main.go @@ -20,11 +20,11 @@ import ( "fmt" "os" - _ "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 - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/integration/commands" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/integration/commands" ) func main() { diff --git a/cmd/observer/database/db_retrier.go b/cmd/observer/database/db_retrier.go index fe89eb88b92..835932da86f 100644 --- a/cmd/observer/database/db_retrier.go +++ b/cmd/observer/database/db_retrier.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/observer/utils" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/observer/utils" ) type DBRetrier struct { diff --git a/cmd/observer/database/db_sqlite.go b/cmd/observer/database/db_sqlite.go index 38a0ed9a182..1527122ff7b 100644 --- a/cmd/observer/database/db_sqlite.go +++ b/cmd/observer/database/db_sqlite.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" _ "modernc.org/sqlite" ) diff --git a/cmd/observer/main.go b/cmd/observer/main.go index 9cc88954a11..6c1834364fe 100644 --- a/cmd/observer/main.go +++ b/cmd/observer/main.go @@ -22,13 +22,13 @@ import ( "fmt" "path/filepath" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/observer" - "github.com/ledgerwatch/erigon/cmd/observer/reports" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/observer" + "github.com/erigontech/erigon/cmd/observer/reports" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/params" ) func mainWithFlags(ctx context.Context, flags observer.CommandFlags, logger log.Logger) error { diff --git a/cmd/observer/observer/command.go b/cmd/observer/observer/command.go index 66c1ab64017..cb0461acad4 100644 --- a/cmd/observer/observer/command.go +++ b/cmd/observer/observer/command.go @@ -25,10 +25,10 @@ import ( "github.com/spf13/cobra" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" ) type CommandFlags struct { diff --git a/cmd/observer/observer/crawler.go b/cmd/observer/observer/crawler.go index f2fd1a209fe..1d2d5840b84 100644 --- a/cmd/observer/observer/crawler.go +++ b/cmd/observer/observer/crawler.go @@ -26,16 +26,16 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/observer/node_utils" - "github.com/ledgerwatch/erigon/cmd/observer/observer/sentry_candidates" - "github.com/ledgerwatch/erigon/cmd/observer/utils" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/observer/node_utils" + "github.com/erigontech/erigon/cmd/observer/observer/sentry_candidates" + "github.com/erigontech/erigon/cmd/observer/utils" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/params" ) type Crawler struct { diff --git a/cmd/observer/observer/diplomacy.go b/cmd/observer/observer/diplomacy.go index d90a106eab5..47e97d5936b 100644 --- a/cmd/observer/observer/diplomacy.go +++ b/cmd/observer/observer/diplomacy.go @@ -26,12 +26,12 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/observer/node_utils" - "github.com/ledgerwatch/erigon/cmd/observer/utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/observer/node_utils" + "github.com/erigontech/erigon/cmd/observer/utils" ) type Diplomacy struct { diff --git a/cmd/observer/observer/diplomat.go b/cmd/observer/observer/diplomat.go index 06fe4449d2b..7716e523730 100644 --- a/cmd/observer/observer/diplomat.go +++ b/cmd/observer/observer/diplomat.go @@ -22,10 +22,10 @@ import ( "errors" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" ) type Diplomat struct { diff --git a/cmd/observer/observer/handshake.go b/cmd/observer/observer/handshake.go index 93e96a47a82..ffadc946b56 100644 --- a/cmd/observer/observer/handshake.go +++ b/cmd/observer/observer/handshake.go @@ -25,17 +25,17 @@ import ( "net" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/rlpx" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/rlpx" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) // https://github.com/ethereum/devp2p/blob/master/rlpx.md#p2p-capability diff --git a/cmd/observer/observer/handshake_test.go b/cmd/observer/observer/handshake_test.go index b4c59eecfe7..441305b4372 100644 --- a/cmd/observer/observer/handshake_test.go +++ b/cmd/observer/observer/handshake_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/direct" + "github.com/erigontech/erigon-lib/direct" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/params" ) func TestHandshake(t *testing.T) { diff --git a/cmd/observer/observer/interrogator.go b/cmd/observer/observer/interrogator.go index eba3e415559..53ba266218d 100644 --- a/cmd/observer/observer/interrogator.go +++ b/cmd/observer/observer/interrogator.go @@ -26,13 +26,13 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/observer/utils" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p/enode" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/observer/utils" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p/enode" ) type DiscV4Transport interface { diff --git a/cmd/observer/observer/keygen.go b/cmd/observer/observer/keygen.go index 6a500cf823a..e024370d520 100644 --- a/cmd/observer/observer/keygen.go +++ b/cmd/observer/observer/keygen.go @@ -21,9 +21,9 @@ import ( "crypto/ecdsa" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" ) func keygen( diff --git a/cmd/observer/observer/keygen_test.go b/cmd/observer/observer/keygen_test.go index 6e9c216cfc6..f8a9ef38086 100644 --- a/cmd/observer/observer/keygen_test.go +++ b/cmd/observer/observer/keygen_test.go @@ -24,8 +24,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" ) func TestKeygen(t *testing.T) { diff --git a/cmd/observer/observer/node_utils/node_addr.go b/cmd/observer/observer/node_utils/node_addr.go index 80841c76b7c..91685d01d8b 100644 --- a/cmd/observer/observer/node_utils/node_addr.go +++ b/cmd/observer/observer/node_utils/node_addr.go @@ -20,10 +20,10 @@ import ( "fmt" "net" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/utils" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/utils" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) func MakeNodeAddr(node *enode.Node) database.NodeAddr { diff --git a/cmd/observer/observer/node_utils/node_id.go b/cmd/observer/observer/node_utils/node_id.go index d85bc6b45c7..410b8cad3ed 100644 --- a/cmd/observer/observer/node_utils/node_id.go +++ b/cmd/observer/observer/node_utils/node_id.go @@ -21,8 +21,8 @@ import ( "fmt" "net/url" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/p2p/enode" ) func NodeID(node *enode.Node) (database.NodeID, error) { diff --git a/cmd/observer/observer/sentry_candidates/intake.go b/cmd/observer/observer/sentry_candidates/intake.go index 18293017d34..47e4027a814 100644 --- a/cmd/observer/observer/sentry_candidates/intake.go +++ b/cmd/observer/observer/sentry_candidates/intake.go @@ -23,12 +23,12 @@ import ( "github.com/nxadm/tail" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/observer/node_utils" - "github.com/ledgerwatch/erigon/cmd/observer/utils" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/observer/node_utils" + "github.com/erigontech/erigon/cmd/observer/utils" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/params" ) type Intake struct { diff --git a/cmd/observer/observer/sentry_candidates/log.go b/cmd/observer/observer/sentry_candidates/log.go index 6ecb588aa17..ade97908979 100644 --- a/cmd/observer/observer/sentry_candidates/log.go +++ b/cmd/observer/observer/sentry_candidates/log.go @@ -25,7 +25,7 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/eth/protocols/eth" "github.com/nxadm/tail" ) diff --git a/cmd/observer/observer/server.go b/cmd/observer/observer/server.go index 26e18cc16f4..313058bdc5a 100644 --- a/cmd/observer/observer/server.go +++ b/cmd/observer/observer/server.go @@ -24,19 +24,19 @@ import ( "net" "path/filepath" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/discover" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/p2p/netutil" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/discover" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/p2p/netutil" + "github.com/erigontech/erigon/params" ) type Server struct { diff --git a/cmd/observer/observer/status_logger.go b/cmd/observer/observer/status_logger.go index 5c91f6979a0..f0f9a457997 100644 --- a/cmd/observer/observer/status_logger.go +++ b/cmd/observer/observer/status_logger.go @@ -21,10 +21,10 @@ import ( "errors" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/observer/database" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/observer/database" ) func StatusLoggerLoop(ctx context.Context, db database.DB, networkID uint, period time.Duration, logger log.Logger) { diff --git a/cmd/observer/reports/clients_estimate_report.go b/cmd/observer/reports/clients_estimate_report.go index 506825a1437..0edc0fb531d 100644 --- a/cmd/observer/reports/clients_estimate_report.go +++ b/cmd/observer/reports/clients_estimate_report.go @@ -22,7 +22,7 @@ import ( "math" "strings" - "github.com/ledgerwatch/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/database" ) type ClientsEstimateReportEntry struct { diff --git a/cmd/observer/reports/clients_report.go b/cmd/observer/reports/clients_report.go index 2fa74b6e43f..9ced66a2389 100644 --- a/cmd/observer/reports/clients_report.go +++ b/cmd/observer/reports/clients_report.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/observer" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/observer" ) type ClientsReportEntry struct { diff --git a/cmd/observer/reports/command.go b/cmd/observer/reports/command.go index 28a9a71ef3a..7cff8008e85 100644 --- a/cmd/observer/reports/command.go +++ b/cmd/observer/reports/command.go @@ -22,7 +22,7 @@ import ( "github.com/spf13/cobra" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils" ) type CommandFlags struct { diff --git a/cmd/observer/reports/sentry_candidates_report.go b/cmd/observer/reports/sentry_candidates_report.go index b6a28701c88..4ba1aeec653 100644 --- a/cmd/observer/reports/sentry_candidates_report.go +++ b/cmd/observer/reports/sentry_candidates_report.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/observer/sentry_candidates" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/observer/sentry_candidates" ) type SentryCandidatesReport struct { diff --git a/cmd/observer/reports/status_report.go b/cmd/observer/reports/status_report.go index 065cd9a2b30..97bcaf1e848 100644 --- a/cmd/observer/reports/status_report.go +++ b/cmd/observer/reports/status_report.go @@ -21,7 +21,7 @@ import ( "fmt" "strings" - "github.com/ledgerwatch/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/database" ) type StatusReport struct { diff --git a/cmd/observer/utils/pubkey_hex.go b/cmd/observer/utils/pubkey_hex.go index 932758f8cb6..ef05c42cf93 100644 --- a/cmd/observer/utils/pubkey_hex.go +++ b/cmd/observer/utils/pubkey_hex.go @@ -21,8 +21,8 @@ import ( "encoding/hex" "fmt" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" ) func ParseHexPublicKey(keyStr string) (*ecdsa.PublicKey, error) { diff --git a/cmd/observer/utils/retry.go b/cmd/observer/utils/retry.go index 5df13f2b09c..573a1de02d3 100644 --- a/cmd/observer/utils/retry.go +++ b/cmd/observer/utils/retry.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func Retry( diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 3911b1d7a5c..4cbb96d56bc 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -47,19 +47,19 @@ import ( "strings" "text/tabwriter" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/simulations" - "github.com/ledgerwatch/erigon/p2p/simulations/adapters" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/simulations" + "github.com/erigontech/erigon/p2p/simulations/adapters" + "github.com/erigontech/erigon/rpc" ) var client *simulations.Client diff --git a/cmd/pics/contracts/gen_token.go b/cmd/pics/contracts/gen_token.go index 3973e6d0e62..a0da6eff9be 100644 --- a/cmd/pics/contracts/gen_token.go +++ b/cmd/pics/contracts/gen_token.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/cmd/pics/pics.go b/cmd/pics/pics.go index d37a098aa61..0487fe88900 100644 --- a/cmd/pics/pics.go +++ b/cmd/pics/pics.go @@ -23,11 +23,11 @@ import ( "os/exec" "sort" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/trie" - "github.com/ledgerwatch/erigon/visual" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/trie" + "github.com/erigontech/erigon/visual" ) var pic = flag.String("pic", "", "specifies picture to regenerate") diff --git a/cmd/pics/state.go b/cmd/pics/state.go index 4ea1a32887b..e066e4ae761 100644 --- a/cmd/pics/state.go +++ b/cmd/pics/state.go @@ -29,22 +29,22 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/cmd/pics/contracts" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/trie" - "github.com/ledgerwatch/erigon/visual" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/cmd/pics/contracts" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/trie" + "github.com/erigontech/erigon/visual" ) /*func statePicture(t *trie.Trie, number int, keyCompression int, codeCompressed bool, valCompressed bool, diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 223f1851afb..a205a369ccf 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -29,7 +29,7 @@ import ( "os" "strings" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/cmd/rpcdaemon/README.md b/cmd/rpcdaemon/README.md index 01683015719..0874e82a809 100644 --- a/cmd/rpcdaemon/README.md +++ b/cmd/rpcdaemon/README.md @@ -170,7 +170,7 @@ This should return something along the lines of this (depending on how far your ``` Also, there -are [extensive instructions for using Postman](https://github.com/ledgerwatch/erigon/wiki/Using-Postman-to-Test-TurboGeth-RPC) +are [extensive instructions for using Postman](https://github.com/erigontech/erigon/wiki/Using-Postman-to-Test-TurboGeth-RPC) to test the RPC. ### Debugging diff --git a/cmd/rpcdaemon/cli/config.go b/cmd/rpcdaemon/cli/config.go index 6c6931273ee..ba9d8f8c83d 100644 --- a/cmd/rpcdaemon/cli/config.go +++ b/cmd/rpcdaemon/cli/config.go @@ -36,57 +36,57 @@ import ( grpcHealth "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" - "github.com/ledgerwatch/erigon-lib/chain" - 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" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "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" - "github.com/ledgerwatch/erigon-lib/log/v3" - 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" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcservices" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/cmd/utils/flags" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/snap" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/remotedb" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/cmd/rpcdaemon/graphql" + "github.com/erigontech/erigon/cmd/rpcdaemon/health" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcservices" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils/flags" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/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" + _ "github.com/erigontech/erigon/eth/tracers/js" + _ "github.com/erigontech/erigon/eth/tracers/native" ) var rootCmd = &cobra.Command{ @@ -126,7 +126,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/main/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/erigontech/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") diff --git a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go index 5de2be9f6ce..d588e7babfe 100644 --- a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go +++ b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go @@ -19,12 +19,12 @@ package httpcfg import ( "time" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/rpc/rpccfg" ) type HttpCfg struct { diff --git a/cmd/rpcdaemon/cli/rpc_allow_list.go b/cmd/rpcdaemon/cli/rpc_allow_list.go index c8e9d18097f..f3739449f1d 100644 --- a/cmd/rpcdaemon/cli/rpc_allow_list.go +++ b/cmd/rpcdaemon/cli/rpc_allow_list.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) type allowListFile struct { diff --git a/cmd/rpcdaemon/graphql/gqlgen.yml b/cmd/rpcdaemon/graphql/gqlgen.yml index 8fd1db2ed06..7e39ca27c65 100644 --- a/cmd/rpcdaemon/graphql/gqlgen.yml +++ b/cmd/rpcdaemon/graphql/gqlgen.yml @@ -42,7 +42,7 @@ skip_validation: true # gqlgen will search for any type names in the schema in these go packages # if they match it will use them, otherwise it will generate them. autobind: - - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/graphql/graph/model" + - "github.com/erigontech/erigon/cmd/rpcdaemon/graphql/graph/model" # This section declares type mapping between the GraphQL and go type systems # diff --git a/cmd/rpcdaemon/graphql/graph/generated.go b/cmd/rpcdaemon/graphql/graph/generated.go index 1c08d07a307..df4ac38da32 100644 --- a/cmd/rpcdaemon/graphql/graph/generated.go +++ b/cmd/rpcdaemon/graphql/graph/generated.go @@ -14,7 +14,7 @@ import ( "github.com/99designs/gqlgen/graphql" "github.com/99designs/gqlgen/graphql/introspection" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/graphql/graph/model" + "github.com/erigontech/erigon/cmd/rpcdaemon/graphql/graph/model" gqlparser "github.com/vektah/gqlparser/v2" "github.com/vektah/gqlparser/v2/ast" ) @@ -1138,7 +1138,7 @@ func (ec *executionContext) field_Block_call_args(ctx context.Context, rawArgs m var arg0 model.CallData if tmp, ok := rawArgs["data"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("data")) - arg0, err = ec.unmarshalNCallData2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) + arg0, err = ec.unmarshalNCallData2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) if err != nil { return nil, err } @@ -1153,7 +1153,7 @@ func (ec *executionContext) field_Block_estimateGas_args(ctx context.Context, ra var arg0 model.CallData if tmp, ok := rawArgs["data"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("data")) - arg0, err = ec.unmarshalNCallData2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) + arg0, err = ec.unmarshalNCallData2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) if err != nil { return nil, err } @@ -1168,7 +1168,7 @@ func (ec *executionContext) field_Block_logs_args(ctx context.Context, rawArgs m var arg0 model.BlockFilterCriteria if tmp, ok := rawArgs["filter"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("filter")) - arg0, err = ec.unmarshalNBlockFilterCriteria2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockFilterCriteria(ctx, tmp) + arg0, err = ec.unmarshalNBlockFilterCriteria2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockFilterCriteria(ctx, tmp) if err != nil { return nil, err } @@ -1273,7 +1273,7 @@ func (ec *executionContext) field_Pending_call_args(ctx context.Context, rawArgs var arg0 model.CallData if tmp, ok := rawArgs["data"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("data")) - arg0, err = ec.unmarshalNCallData2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) + arg0, err = ec.unmarshalNCallData2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) if err != nil { return nil, err } @@ -1288,7 +1288,7 @@ func (ec *executionContext) field_Pending_estimateGas_args(ctx context.Context, var arg0 model.CallData if tmp, ok := rawArgs["data"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("data")) - arg0, err = ec.unmarshalNCallData2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) + arg0, err = ec.unmarshalNCallData2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx, tmp) if err != nil { return nil, err } @@ -1366,7 +1366,7 @@ func (ec *executionContext) field_Query_logs_args(ctx context.Context, rawArgs m var arg0 model.FilterCriteria if tmp, ok := rawArgs["filter"]; ok { ctx := graphql.WithPathContext(ctx, graphql.NewPathWithField("filter")) - arg0, err = ec.unmarshalNFilterCriteria2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐFilterCriteria(ctx, tmp) + arg0, err = ec.unmarshalNFilterCriteria2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐFilterCriteria(ctx, tmp) if err != nil { return nil, err } @@ -1905,7 +1905,7 @@ func (ec *executionContext) _Block_parent(ctx context.Context, field graphql.Col } res := resTmp.(*model.Block) fc.Result = res - return ec.marshalOBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) + return ec.marshalOBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_parent(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2232,7 +2232,7 @@ func (ec *executionContext) _Block_miner(ctx context.Context, field graphql.Coll } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalNAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalNAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_miner(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2771,7 +2771,7 @@ func (ec *executionContext) _Block_ommers(ctx context.Context, field graphql.Col } res := resTmp.([]*model.Block) fc.Result = res - return ec.marshalOBlock2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) + return ec.marshalOBlock2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_ommers(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -2878,7 +2878,7 @@ func (ec *executionContext) _Block_ommerAt(ctx context.Context, field graphql.Co } res := resTmp.(*model.Block) fc.Result = res - return ec.marshalOBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) + return ec.marshalOBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_ommerAt(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3040,7 +3040,7 @@ func (ec *executionContext) _Block_transactions(ctx context.Context, field graph } res := resTmp.([]*model.Transaction) fc.Result = res - return ec.marshalOTransaction2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransactionᚄ(ctx, field.Selections, res) + return ec.marshalOTransaction2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransactionᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_transactions(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3135,7 +3135,7 @@ func (ec *executionContext) _Block_transactionAt(ctx context.Context, field grap } res := resTmp.(*model.Transaction) fc.Result = res - return ec.marshalOTransaction2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, field.Selections, res) + return ec.marshalOTransaction2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_transactionAt(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3244,7 +3244,7 @@ func (ec *executionContext) _Block_logs(ctx context.Context, field graphql.Colle } res := resTmp.([]*model.Log) fc.Result = res - return ec.marshalNLog2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx, field.Selections, res) + return ec.marshalNLog2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_logs(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3311,7 +3311,7 @@ func (ec *executionContext) _Block_account(ctx context.Context, field graphql.Co } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalNAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalNAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_account(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3375,7 +3375,7 @@ func (ec *executionContext) _Block_call(ctx context.Context, field graphql.Colle } res := resTmp.(*model.CallResult) fc.Result = res - return ec.marshalOCallResult2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallResult(ctx, field.Selections, res) + return ec.marshalOCallResult2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallResult(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_call(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3578,7 +3578,7 @@ func (ec *executionContext) _Block_withdrawals(ctx context.Context, field graphq } res := resTmp.([]*model.Withdrawal) fc.Result = res - return ec.marshalOWithdrawal2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawalᚄ(ctx, field.Selections, res) + return ec.marshalOWithdrawal2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawalᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Block_withdrawals(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3808,7 +3808,7 @@ func (ec *executionContext) _Log_account(ctx context.Context, field graphql.Coll } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalNAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalNAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Log_account(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -3963,7 +3963,7 @@ func (ec *executionContext) _Log_transaction(ctx context.Context, field graphql. } res := resTmp.(*model.Transaction) fc.Result = res - return ec.marshalNTransaction2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, field.Selections, res) + return ec.marshalNTransaction2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Log_transaction(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4157,7 +4157,7 @@ func (ec *executionContext) _Pending_transactions(ctx context.Context, field gra } res := resTmp.([]*model.Transaction) fc.Result = res - return ec.marshalOTransaction2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransactionᚄ(ctx, field.Selections, res) + return ec.marshalOTransaction2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransactionᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Pending_transactions(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4255,7 +4255,7 @@ func (ec *executionContext) _Pending_account(ctx context.Context, field graphql. } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalNAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalNAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Pending_account(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4319,7 +4319,7 @@ func (ec *executionContext) _Pending_call(ctx context.Context, field graphql.Col } res := resTmp.(*model.CallResult) fc.Result = res - return ec.marshalOCallResult2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallResult(ctx, field.Selections, res) + return ec.marshalOCallResult2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallResult(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Pending_call(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4434,7 +4434,7 @@ func (ec *executionContext) _Query_block(ctx context.Context, field graphql.Coll } res := resTmp.(*model.Block) fc.Result = res - return ec.marshalOBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) + return ec.marshalOBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_block(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4555,7 +4555,7 @@ func (ec *executionContext) _Query_blocks(ctx context.Context, field graphql.Col } res := resTmp.([]*model.Block) fc.Result = res - return ec.marshalNBlock2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockᚄ(ctx, field.Selections, res) + return ec.marshalNBlock2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_blocks(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4676,7 +4676,7 @@ func (ec *executionContext) _Query_pending(ctx context.Context, field graphql.Co } res := resTmp.(*model.Pending) fc.Result = res - return ec.marshalNPending2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐPending(ctx, field.Selections, res) + return ec.marshalNPending2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐPending(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_pending(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4729,7 +4729,7 @@ func (ec *executionContext) _Query_transaction(ctx context.Context, field graphq } res := resTmp.(*model.Transaction) fc.Result = res - return ec.marshalOTransaction2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, field.Selections, res) + return ec.marshalOTransaction2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_transaction(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4838,7 +4838,7 @@ func (ec *executionContext) _Query_logs(ctx context.Context, field graphql.Colle } res := resTmp.([]*model.Log) fc.Result = res - return ec.marshalNLog2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx, field.Selections, res) + return ec.marshalNLog2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_logs(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -4990,7 +4990,7 @@ func (ec *executionContext) _Query_syncing(ctx context.Context, field graphql.Co } res := resTmp.(*model.SyncState) fc.Result = res - return ec.marshalOSyncState2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐSyncState(ctx, field.Selections, res) + return ec.marshalOSyncState2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐSyncState(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Query_syncing(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -5476,7 +5476,7 @@ func (ec *executionContext) _Transaction_from(ctx context.Context, field graphql } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalNAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalNAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Transaction_from(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -5540,7 +5540,7 @@ func (ec *executionContext) _Transaction_to(ctx context.Context, field graphql.C } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalOAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalOAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Transaction_to(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -5903,7 +5903,7 @@ func (ec *executionContext) _Transaction_block(ctx context.Context, field graphq } res := resTmp.(*model.Block) fc.Result = res - return ec.marshalOBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) + return ec.marshalOBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Transaction_block(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6174,7 +6174,7 @@ func (ec *executionContext) _Transaction_createdContract(ctx context.Context, fi } res := resTmp.(*model.Account) fc.Result = res - return ec.marshalOAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) + return ec.marshalOAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Transaction_createdContract(ctx context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6238,7 +6238,7 @@ func (ec *executionContext) _Transaction_logs(ctx context.Context, field graphql } res := resTmp.([]*model.Log) fc.Result = res - return ec.marshalOLog2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx, field.Selections, res) + return ec.marshalOLog2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Transaction_logs(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -6464,7 +6464,7 @@ func (ec *executionContext) _Transaction_accessList(ctx context.Context, field g } res := resTmp.([]*model.AccessTuple) fc.Result = res - return ec.marshalOAccessTuple2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTupleᚄ(ctx, field.Selections, res) + return ec.marshalOAccessTuple2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTupleᚄ(ctx, field.Selections, res) } func (ec *executionContext) fieldContext_Transaction_accessList(_ context.Context, field graphql.CollectedField) (fc *graphql.FieldContext, err error) { @@ -9953,7 +9953,7 @@ func (ec *executionContext) ___Type(ctx context.Context, sel ast.SelectionSet, o // region ***************************** type.gotpl ***************************** -func (ec *executionContext) marshalNAccessTuple2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTuple(ctx context.Context, sel ast.SelectionSet, v *model.AccessTuple) graphql.Marshaler { +func (ec *executionContext) marshalNAccessTuple2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTuple(ctx context.Context, sel ast.SelectionSet, v *model.AccessTuple) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -9963,7 +9963,7 @@ func (ec *executionContext) marshalNAccessTuple2ᚖgithub.comᚋledgerwatchᚋ return ec._AccessTuple(ctx, sel, v) } -func (ec *executionContext) marshalNAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx context.Context, sel ast.SelectionSet, v *model.Account) graphql.Marshaler { +func (ec *executionContext) marshalNAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx context.Context, sel ast.SelectionSet, v *model.Account) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -10003,7 +10003,7 @@ func (ec *executionContext) marshalNBigInt2string(ctx context.Context, sel ast.S return res } -func (ec *executionContext) marshalNBlock2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Block) graphql.Marshaler { +func (ec *executionContext) marshalNBlock2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Block) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -10027,7 +10027,7 @@ func (ec *executionContext) marshalNBlock2ᚕᚖgithub.comᚋledgerwatchᚋeri if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, sel, v[i]) + ret[i] = ec.marshalNBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10047,7 +10047,7 @@ func (ec *executionContext) marshalNBlock2ᚕᚖgithub.comᚋledgerwatchᚋeri return ret } -func (ec *executionContext) marshalNBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx context.Context, sel ast.SelectionSet, v *model.Block) graphql.Marshaler { +func (ec *executionContext) marshalNBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx context.Context, sel ast.SelectionSet, v *model.Block) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -10057,7 +10057,7 @@ func (ec *executionContext) marshalNBlock2ᚖgithub.comᚋledgerwatchᚋerigon return ec._Block(ctx, sel, v) } -func (ec *executionContext) unmarshalNBlockFilterCriteria2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockFilterCriteria(ctx context.Context, v interface{}) (model.BlockFilterCriteria, error) { +func (ec *executionContext) unmarshalNBlockFilterCriteria2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlockFilterCriteria(ctx context.Context, v interface{}) (model.BlockFilterCriteria, error) { res, err := ec.unmarshalInputBlockFilterCriteria(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } @@ -10139,12 +10139,12 @@ func (ec *executionContext) marshalNBytes322ᚕstringᚄ(ctx context.Context, se return ret } -func (ec *executionContext) unmarshalNCallData2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx context.Context, v interface{}) (model.CallData, error) { +func (ec *executionContext) unmarshalNCallData2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallData(ctx context.Context, v interface{}) (model.CallData, error) { res, err := ec.unmarshalInputCallData(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } -func (ec *executionContext) unmarshalNFilterCriteria2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐFilterCriteria(ctx context.Context, v interface{}) (model.FilterCriteria, error) { +func (ec *executionContext) unmarshalNFilterCriteria2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐFilterCriteria(ctx context.Context, v interface{}) (model.FilterCriteria, error) { res, err := ec.unmarshalInputFilterCriteria(ctx, v) return res, graphql.ErrorOnPath(ctx, err) } @@ -10164,7 +10164,7 @@ func (ec *executionContext) marshalNInt2int(ctx context.Context, sel ast.Selecti return res } -func (ec *executionContext) marshalNLog2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Log) graphql.Marshaler { +func (ec *executionContext) marshalNLog2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Log) graphql.Marshaler { ret := make(graphql.Array, len(v)) var wg sync.WaitGroup isLen1 := len(v) == 1 @@ -10188,7 +10188,7 @@ func (ec *executionContext) marshalNLog2ᚕᚖgithub.comᚋledgerwatchᚋerigo if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNLog2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLog(ctx, sel, v[i]) + ret[i] = ec.marshalNLog2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLog(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10208,7 +10208,7 @@ func (ec *executionContext) marshalNLog2ᚕᚖgithub.comᚋledgerwatchᚋerigo return ret } -func (ec *executionContext) marshalNLog2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLog(ctx context.Context, sel ast.SelectionSet, v *model.Log) graphql.Marshaler { +func (ec *executionContext) marshalNLog2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLog(ctx context.Context, sel ast.SelectionSet, v *model.Log) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -10233,11 +10233,11 @@ func (ec *executionContext) marshalNLong2uint64(ctx context.Context, sel ast.Sel return res } -func (ec *executionContext) marshalNPending2githubᚗcomᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐPending(ctx context.Context, sel ast.SelectionSet, v model.Pending) graphql.Marshaler { +func (ec *executionContext) marshalNPending2githubᚗcomᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐPending(ctx context.Context, sel ast.SelectionSet, v model.Pending) graphql.Marshaler { return ec._Pending(ctx, sel, &v) } -func (ec *executionContext) marshalNPending2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐPending(ctx context.Context, sel ast.SelectionSet, v *model.Pending) graphql.Marshaler { +func (ec *executionContext) marshalNPending2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐPending(ctx context.Context, sel ast.SelectionSet, v *model.Pending) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -10262,7 +10262,7 @@ func (ec *executionContext) marshalNString2string(ctx context.Context, sel ast.S return res } -func (ec *executionContext) marshalNTransaction2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx context.Context, sel ast.SelectionSet, v *model.Transaction) graphql.Marshaler { +func (ec *executionContext) marshalNTransaction2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx context.Context, sel ast.SelectionSet, v *model.Transaction) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -10272,7 +10272,7 @@ func (ec *executionContext) marshalNTransaction2ᚖgithub.comᚋledgerwatchᚋ return ec._Transaction(ctx, sel, v) } -func (ec *executionContext) marshalNWithdrawal2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawal(ctx context.Context, sel ast.SelectionSet, v *model.Withdrawal) graphql.Marshaler { +func (ec *executionContext) marshalNWithdrawal2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawal(ctx context.Context, sel ast.SelectionSet, v *model.Withdrawal) graphql.Marshaler { if v == nil { if !graphql.HasFieldError(ctx, graphql.GetFieldContext(ctx)) { ec.Errorf(ctx, "the requested element is null which the schema does not allow") @@ -10535,7 +10535,7 @@ func (ec *executionContext) marshalN__TypeKind2string(ctx context.Context, sel a return res } -func (ec *executionContext) marshalOAccessTuple2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTupleᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.AccessTuple) graphql.Marshaler { +func (ec *executionContext) marshalOAccessTuple2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTupleᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.AccessTuple) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10562,7 +10562,7 @@ func (ec *executionContext) marshalOAccessTuple2ᚕᚖgithub.comᚋledgerwatch if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNAccessTuple2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTuple(ctx, sel, v[i]) + ret[i] = ec.marshalNAccessTuple2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccessTuple(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10582,7 +10582,7 @@ func (ec *executionContext) marshalOAccessTuple2ᚕᚖgithub.comᚋledgerwatch return ret } -func (ec *executionContext) marshalOAccount2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx context.Context, sel ast.SelectionSet, v *model.Account) graphql.Marshaler { +func (ec *executionContext) marshalOAccount2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐAccount(ctx context.Context, sel ast.SelectionSet, v *model.Account) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10659,7 +10659,7 @@ func (ec *executionContext) marshalOBigInt2ᚖstring(ctx context.Context, sel as return res } -func (ec *executionContext) marshalOBlock2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx context.Context, sel ast.SelectionSet, v []*model.Block) graphql.Marshaler { +func (ec *executionContext) marshalOBlock2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx context.Context, sel ast.SelectionSet, v []*model.Block) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10686,7 +10686,7 @@ func (ec *executionContext) marshalOBlock2ᚕᚖgithub.comᚋledgerwatchᚋeri if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalOBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, sel, v[i]) + ret[i] = ec.marshalOBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10700,7 +10700,7 @@ func (ec *executionContext) marshalOBlock2ᚕᚖgithub.comᚋledgerwatchᚋeri return ret } -func (ec *executionContext) marshalOBlock2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx context.Context, sel ast.SelectionSet, v *model.Block) graphql.Marshaler { +func (ec *executionContext) marshalOBlock2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐBlock(ctx context.Context, sel ast.SelectionSet, v *model.Block) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10819,7 +10819,7 @@ func (ec *executionContext) marshalOBytes322ᚖstring(ctx context.Context, sel a return res } -func (ec *executionContext) marshalOCallResult2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallResult(ctx context.Context, sel ast.SelectionSet, v *model.CallResult) graphql.Marshaler { +func (ec *executionContext) marshalOCallResult2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐCallResult(ctx context.Context, sel ast.SelectionSet, v *model.CallResult) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10842,7 +10842,7 @@ func (ec *executionContext) marshalOInt2ᚖint(ctx context.Context, sel ast.Sele return res } -func (ec *executionContext) marshalOLog2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Log) graphql.Marshaler { +func (ec *executionContext) marshalOLog2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLogᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Log) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10869,7 +10869,7 @@ func (ec *executionContext) marshalOLog2ᚕᚖgithub.comᚋledgerwatchᚋerigo if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNLog2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLog(ctx, sel, v[i]) + ret[i] = ec.marshalNLog2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐLog(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10921,14 +10921,14 @@ func (ec *executionContext) marshalOString2ᚖstring(ctx context.Context, sel as return res } -func (ec *executionContext) marshalOSyncState2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐSyncState(ctx context.Context, sel ast.SelectionSet, v *model.SyncState) graphql.Marshaler { +func (ec *executionContext) marshalOSyncState2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐSyncState(ctx context.Context, sel ast.SelectionSet, v *model.SyncState) graphql.Marshaler { if v == nil { return graphql.Null } return ec._SyncState(ctx, sel, v) } -func (ec *executionContext) marshalOTransaction2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransactionᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Transaction) graphql.Marshaler { +func (ec *executionContext) marshalOTransaction2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransactionᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Transaction) graphql.Marshaler { if v == nil { return graphql.Null } @@ -10955,7 +10955,7 @@ func (ec *executionContext) marshalOTransaction2ᚕᚖgithub.comᚋledgerwatch if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNTransaction2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, sel, v[i]) + ret[i] = ec.marshalNTransaction2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx, sel, v[i]) } if isLen1 { f(i) @@ -10975,14 +10975,14 @@ func (ec *executionContext) marshalOTransaction2ᚕᚖgithub.comᚋledgerwatch return ret } -func (ec *executionContext) marshalOTransaction2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx context.Context, sel ast.SelectionSet, v *model.Transaction) graphql.Marshaler { +func (ec *executionContext) marshalOTransaction2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐTransaction(ctx context.Context, sel ast.SelectionSet, v *model.Transaction) graphql.Marshaler { if v == nil { return graphql.Null } return ec._Transaction(ctx, sel, v) } -func (ec *executionContext) marshalOWithdrawal2ᚕᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawalᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Withdrawal) graphql.Marshaler { +func (ec *executionContext) marshalOWithdrawal2ᚕᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawalᚄ(ctx context.Context, sel ast.SelectionSet, v []*model.Withdrawal) graphql.Marshaler { if v == nil { return graphql.Null } @@ -11009,7 +11009,7 @@ func (ec *executionContext) marshalOWithdrawal2ᚕᚖgithub.comᚋledgerwatch if !isLen1 { defer wg.Done() } - ret[i] = ec.marshalNWithdrawal2ᚖgithub.comᚋledgerwatchᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawal(ctx, sel, v[i]) + ret[i] = ec.marshalNWithdrawal2ᚖgithub.comᚋerigontechᚋerigonᚋcmdᚋrpcdaemonᚋgraphqlᚋgraphᚋmodelᚐWithdrawal(ctx, sel, v[i]) } if isLen1 { f(i) diff --git a/cmd/rpcdaemon/graphql/graph/helpers.go b/cmd/rpcdaemon/graphql/graph/helpers.go index 0a29017196e..d10b94c5fda 100644 --- a/cmd/rpcdaemon/graphql/graph/helpers.go +++ b/cmd/rpcdaemon/graphql/graph/helpers.go @@ -6,14 +6,14 @@ import ( "reflect" "strconv" - hexutil2 "github.com/ledgerwatch/erigon-lib/common/hexutil" + hexutil2 "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) func convertDataToStringP(abstractMap map[string]interface{}, field string) *string { diff --git a/cmd/rpcdaemon/graphql/graph/resolver.go b/cmd/rpcdaemon/graphql/graph/resolver.go index 400d9751ece..1e5ac9a951b 100644 --- a/cmd/rpcdaemon/graphql/graph/resolver.go +++ b/cmd/rpcdaemon/graphql/graph/resolver.go @@ -1,10 +1,10 @@ package graph import ( - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" ) // This file will not be regenerated automatically. diff --git a/cmd/rpcdaemon/graphql/graph/schema.resolvers.go b/cmd/rpcdaemon/graphql/graph/schema.resolvers.go index c90315e0695..52b79fb03d6 100644 --- a/cmd/rpcdaemon/graphql/graph/schema.resolvers.go +++ b/cmd/rpcdaemon/graphql/graph/schema.resolvers.go @@ -11,11 +11,11 @@ import ( "strconv" "strings" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/graphql/graph/model" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/cmd/rpcdaemon/graphql/graph/model" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" ) // SendRawTransaction is the resolver for the sendRawTransaction field. diff --git a/cmd/rpcdaemon/graphql/graphql.go b/cmd/rpcdaemon/graphql/graphql.go index f0842523678..d8b31268491 100644 --- a/cmd/rpcdaemon/graphql/graphql.go +++ b/cmd/rpcdaemon/graphql/graphql.go @@ -23,9 +23,9 @@ import ( "github.com/99designs/gqlgen/graphql/handler" "github.com/99designs/gqlgen/graphql/playground" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/graphql/graph" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/cmd/rpcdaemon/graphql/graph" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" ) const ( diff --git a/cmd/rpcdaemon/health/check_block.go b/cmd/rpcdaemon/health/check_block.go index 1dac742252f..b6cab8ed2b1 100644 --- a/cmd/rpcdaemon/health/check_block.go +++ b/cmd/rpcdaemon/health/check_block.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) func checkBlockNumber(blockNumber rpc.BlockNumber, api EthAPI) error { diff --git a/cmd/rpcdaemon/health/check_synced.go b/cmd/rpcdaemon/health/check_synced.go index 6e394b992c6..9ab829edae9 100644 --- a/cmd/rpcdaemon/health/check_synced.go +++ b/cmd/rpcdaemon/health/check_synced.go @@ -20,7 +20,7 @@ import ( "errors" "net/http" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/cmd/rpcdaemon/health/check_time.go b/cmd/rpcdaemon/health/check_time.go index 078e97ae784..36b8da70a3c 100644 --- a/cmd/rpcdaemon/health/check_time.go +++ b/cmd/rpcdaemon/health/check_time.go @@ -21,8 +21,8 @@ import ( "fmt" "net/http" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/rpc" ) var ( diff --git a/cmd/rpcdaemon/health/health.go b/cmd/rpcdaemon/health/health.go index 063d897bb35..ea1d6654fc0 100644 --- a/cmd/rpcdaemon/health/health.go +++ b/cmd/rpcdaemon/health/health.go @@ -26,9 +26,9 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) type requestBody struct { diff --git a/cmd/rpcdaemon/health/health_test.go b/cmd/rpcdaemon/health/health_test.go index 57d60ff4389..96d099205e3 100644 --- a/cmd/rpcdaemon/health/health_test.go +++ b/cmd/rpcdaemon/health/health_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) type netApiStub struct { diff --git a/cmd/rpcdaemon/health/interfaces.go b/cmd/rpcdaemon/health/interfaces.go index 83c1e408021..31e3fc0ed9c 100644 --- a/cmd/rpcdaemon/health/interfaces.go +++ b/cmd/rpcdaemon/health/interfaces.go @@ -19,9 +19,9 @@ package health import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) type NetAPI interface { diff --git a/cmd/rpcdaemon/health/parse_api.go b/cmd/rpcdaemon/health/parse_api.go index fbec55071d1..74ba895da0c 100644 --- a/cmd/rpcdaemon/health/parse_api.go +++ b/cmd/rpcdaemon/health/parse_api.go @@ -17,7 +17,7 @@ package health import ( - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) func parseAPI(api []rpc.API) (netAPI NetAPI, ethAPI EthAPI) { diff --git a/cmd/rpcdaemon/main.go b/cmd/rpcdaemon/main.go index 7e691a024ce..6ff6e86c6c5 100644 --- a/cmd/rpcdaemon/main.go +++ b/cmd/rpcdaemon/main.go @@ -22,15 +22,15 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/jsonrpc" "github.com/spf13/cobra" - _ "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 ) func main() { diff --git a/cmd/rpcdaemon/postman/README.md b/cmd/rpcdaemon/postman/README.md index 5b29d7f2407..0a63feff9f4 100644 --- a/cmd/rpcdaemon/postman/README.md +++ b/cmd/rpcdaemon/postman/README.md @@ -7,7 +7,7 @@ There are three files here: - Overlay_Testing.json You can import them into Postman using these -instructions: https://github.com/ledgerwatch/erigon/wiki/Using-Postman-to-Test-TurboGeth-RPC +instructions: https://github.com/erigontech/erigon/wiki/Using-Postman-to-Test-TurboGeth-RPC The first one is used to generate help text and other documentation as well as running a sanity check against a new release. There is basically one test for each of the 81 RPC endpoints. diff --git a/cmd/rpcdaemon/rpcdaemontest/test_util.go b/cmd/rpcdaemon/rpcdaemontest/test_util.go index c5dabde4f4e..c48c5c32f1c 100644 --- a/cmd/rpcdaemon/rpcdaemontest/test_util.go +++ b/cmd/rpcdaemon/rpcdaemontest/test_util.go @@ -30,26 +30,26 @@ import ( "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/test/bufconn" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/ethdb/privateapi" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/jsonrpc/contracts" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/ethdb/privateapi" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/jsonrpc/contracts" + "github.com/erigontech/erigon/turbo/stages/mock" ) type testAddresses struct { diff --git a/cmd/rpcdaemon/rpcservices/eth_backend.go b/cmd/rpcdaemon/rpcservices/eth_backend.go index ab3d3d64b85..67eea96a16e 100644 --- a/cmd/rpcdaemon/rpcservices/eth_backend.go +++ b/cmd/rpcdaemon/rpcservices/eth_backend.go @@ -29,20 +29,20 @@ import ( "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/ethdb/privateapi" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/ethdb/privateapi" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) var _ services.FullBlockReader = &RemoteBackend{} diff --git a/cmd/rpcdaemon/rpcservices/eth_mining.go b/cmd/rpcdaemon/rpcservices/eth_mining.go index d274355a8cd..5b7cd53c92c 100644 --- a/cmd/rpcdaemon/rpcservices/eth_mining.go +++ b/cmd/rpcdaemon/rpcservices/eth_mining.go @@ -23,10 +23,10 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/ethdb/privateapi" + "github.com/erigontech/erigon-lib/gointerfaces" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/ethdb/privateapi" ) type MiningService struct { diff --git a/cmd/rpcdaemon/rpcservices/eth_txpool.go b/cmd/rpcdaemon/rpcservices/eth_txpool.go index 5abcff23706..13b7196932d 100644 --- a/cmd/rpcdaemon/rpcservices/eth_txpool.go +++ b/cmd/rpcdaemon/rpcservices/eth_txpool.go @@ -24,11 +24,11 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - txpooproto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - txpool2 "github.com/ledgerwatch/erigon-lib/txpool" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + txpooproto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/log/v3" + txpool2 "github.com/erigontech/erigon-lib/txpool" ) type TxPoolService struct { diff --git a/cmd/rpctest/main.go b/cmd/rpctest/main.go index 841a61864b5..0e3058c8cee 100644 --- a/cmd/rpctest/main.go +++ b/cmd/rpctest/main.go @@ -25,9 +25,9 @@ import ( "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpctest/rpctest" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/rpctest/rpctest" + "github.com/erigontech/erigon/turbo/logging" ) func main() { diff --git a/cmd/rpctest/rpctest/account_range_verify.go b/cmd/rpctest/rpctest/account_range_verify.go index 9218f4e9227..f1c81818f1c 100644 --- a/cmd/rpctest/rpctest/account_range_verify.go +++ b/cmd/rpctest/rpctest/account_range_verify.go @@ -28,13 +28,13 @@ import ( "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/state" ) func CompareAccountRange(logger log.Logger, erigonURL, gethURL, tmpDataDir, gethDataDir string, blockFrom uint64, notRegenerateGethData bool) { diff --git a/cmd/rpctest/rpctest/bench1.go b/cmd/rpctest/rpctest/bench1.go index 6a8d06d4b90..d394c681439 100644 --- a/cmd/rpctest/rpctest/bench1.go +++ b/cmd/rpctest/rpctest/bench1.go @@ -25,9 +25,9 @@ import ( "path/filepath" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/core/state" ) var routes map[string]string diff --git a/cmd/rpctest/rpctest/bench2.go b/cmd/rpctest/rpctest/bench2.go index da9c625a97f..6bf101dbf72 100644 --- a/cmd/rpctest/rpctest/bench2.go +++ b/cmd/rpctest/rpctest/bench2.go @@ -21,9 +21,9 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) func Bench2(erigon_url string) error { diff --git a/cmd/rpctest/rpctest/bench3.go b/cmd/rpctest/rpctest/bench3.go index de7b08826d1..b9241f1ea47 100644 --- a/cmd/rpctest/rpctest/bench3.go +++ b/cmd/rpctest/rpctest/bench3.go @@ -22,9 +22,9 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/core/state" ) func Bench3(erigon_url, geth_url string) error { diff --git a/cmd/rpctest/rpctest/bench4.go b/cmd/rpctest/rpctest/bench4.go index fffbd398830..7cdcfb84022 100644 --- a/cmd/rpctest/rpctest/bench4.go +++ b/cmd/rpctest/rpctest/bench4.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func Bench4(erigon_url string) error { diff --git a/cmd/rpctest/rpctest/bench6.go b/cmd/rpctest/rpctest/bench6.go index b4f828f90a0..587c268ec2f 100644 --- a/cmd/rpctest/rpctest/bench6.go +++ b/cmd/rpctest/rpctest/bench6.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func Bench6(erigon_url string) error { diff --git a/cmd/rpctest/rpctest/bench7.go b/cmd/rpctest/rpctest/bench7.go index a1dacda7342..8167b1c6211 100644 --- a/cmd/rpctest/rpctest/bench7.go +++ b/cmd/rpctest/rpctest/bench7.go @@ -21,7 +21,7 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func Bench7(erigonURL, gethURL string) error { diff --git a/cmd/rpctest/rpctest/bench9.go b/cmd/rpctest/rpctest/bench9.go index 246791aa0c1..610efb3cfc2 100644 --- a/cmd/rpctest/rpctest/bench9.go +++ b/cmd/rpctest/rpctest/bench9.go @@ -21,9 +21,9 @@ import ( "net/http" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/core/state" ) // bench9 tests eth_getProof diff --git a/cmd/rpctest/rpctest/bench_tracecallmany.go b/cmd/rpctest/rpctest/bench_tracecallmany.go index b82843f6416..d7a03a4fa0a 100644 --- a/cmd/rpctest/rpctest/bench_tracecallmany.go +++ b/cmd/rpctest/rpctest/bench_tracecallmany.go @@ -23,10 +23,10 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) // BenchTraceCallMany compares response of Erigon with Geth diff --git a/cmd/rpctest/rpctest/bench_tracefilter.go b/cmd/rpctest/rpctest/bench_tracefilter.go index 26c912a0e02..10ba920e324 100644 --- a/cmd/rpctest/rpctest/bench_tracefilter.go +++ b/cmd/rpctest/rpctest/bench_tracefilter.go @@ -24,7 +24,7 @@ import ( "os" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // Compares response of Erigon with OpenEthereum diff --git a/cmd/rpctest/rpctest/request_generator.go b/cmd/rpctest/rpctest/request_generator.go index f49c2a0c539..7342a8a6497 100644 --- a/cmd/rpctest/rpctest/request_generator.go +++ b/cmd/rpctest/rpctest/request_generator.go @@ -23,12 +23,12 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/valyala/fastjson" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) type CallResult struct { diff --git a/cmd/rpctest/rpctest/request_generator_test.go b/cmd/rpctest/rpctest/request_generator_test.go index 1589a951b97..06c49eda4fe 100644 --- a/cmd/rpctest/rpctest/request_generator_test.go +++ b/cmd/rpctest/rpctest/request_generator_test.go @@ -19,7 +19,7 @@ package rpctest import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/cmd/rpctest/rpctest/type.go b/cmd/rpctest/rpctest/type.go index 42d68f14dcd..765171adebb 100644 --- a/cmd/rpctest/rpctest/type.go +++ b/cmd/rpctest/rpctest/type.go @@ -19,12 +19,12 @@ package rpctest import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/core/state" ) const Geth = "geth" diff --git a/cmd/rpctest/rpctest/utils.go b/cmd/rpctest/rpctest/utils.go index 646cecb01e3..6c28b7b2eea 100644 --- a/cmd/rpctest/rpctest/utils.go +++ b/cmd/rpctest/rpctest/utils.go @@ -29,11 +29,11 @@ import ( "github.com/valyala/fastjson" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/crypto" ) func compareBlocks(b, bg *EthBlockByNumber) bool { diff --git a/cmd/sentinel/main.go b/cmd/sentinel/main.go index b1a3ff0d546..ccfcdc5a1bb 100644 --- a/cmd/sentinel/main.go +++ b/cmd/sentinel/main.go @@ -21,20 +21,20 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon/cl/phase1/core" - "github.com/ledgerwatch/erigon/cl/sentinel" - "github.com/ledgerwatch/erigon/cl/sentinel/service" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cmd/sentinel/sentinelcli" - "github.com/ledgerwatch/erigon/cmd/sentinel/sentinelflags" + "github.com/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon/cl/phase1/core" + "github.com/erigontech/erigon/cl/sentinel" + "github.com/erigontech/erigon/cl/sentinel/service" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cmd/sentinel/sentinelcli" + "github.com/erigontech/erigon/cmd/sentinel/sentinelflags" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - sentinelapp "github.com/ledgerwatch/erigon/turbo/app" + sentinelapp "github.com/erigontech/erigon/turbo/app" ) func main() { diff --git a/cmd/sentinel/sentinelcli/cliSettings.go b/cmd/sentinel/sentinelcli/cliSettings.go index 6fc9049d5a8..f65c85e0f89 100644 --- a/cmd/sentinel/sentinelcli/cliSettings.go +++ b/cmd/sentinel/sentinelcli/cliSettings.go @@ -19,17 +19,17 @@ package sentinelcli import ( "fmt" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cmd/sentinel/sentinelflags" - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cmd/sentinel/sentinelflags" + "github.com/erigontech/erigon/cmd/utils" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/logging" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type SentinelCliCfg struct { diff --git a/cmd/sentinel/sentinelflags/flags.go b/cmd/sentinel/sentinelflags/flags.go index 35b9693f1c6..5d885483827 100644 --- a/cmd/sentinel/sentinelflags/flags.go +++ b/cmd/sentinel/sentinelflags/flags.go @@ -17,7 +17,7 @@ package sentinelflags import ( - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils" "github.com/urfave/cli/v2" ) diff --git a/cmd/sentry/main.go b/cmd/sentry/main.go index 441f32696d9..aed5d2c5567 100644 --- a/cmd/sentry/main.go +++ b/cmd/sentry/main.go @@ -20,16 +20,16 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" - node2 "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" + node2 "github.com/erigontech/erigon/turbo/node" ) // generate the messages diff --git a/cmd/silkworm_api/snapshot_idx.go b/cmd/silkworm_api/snapshot_idx.go index 1c959a4848c..1d9f8e7ae29 100644 --- a/cmd/silkworm_api/snapshot_idx.go +++ b/cmd/silkworm_api/snapshot_idx.go @@ -24,15 +24,15 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/hack/tool/fromdb" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) // Build snapshot indexes for given snapshot files. diff --git a/cmd/snapshots/cmp/cmp.go b/cmd/snapshots/cmp/cmp.go index 4e22b7bb70e..f34fca1fed0 100644 --- a/cmd/snapshots/cmp/cmp.go +++ b/cmd/snapshots/cmp/cmp.go @@ -31,21 +31,21 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/snapshots/flags" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - "github.com/ledgerwatch/erigon/cmd/utils" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon/cmd/snapshots/flags" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/cmd/utils" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) var Command = cli.Command{ diff --git a/cmd/snapshots/copy/copy.go b/cmd/snapshots/copy/copy.go index e704be210f4..f3b714c5762 100644 --- a/cmd/snapshots/copy/copy.go +++ b/cmd/snapshots/copy/copy.go @@ -26,12 +26,12 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/snapshots/flags" - "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/flags" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/turbo/logging" ) var ( diff --git a/cmd/snapshots/main.go b/cmd/snapshots/main.go index ebc28389891..aa727dc1079 100644 --- a/cmd/snapshots/main.go +++ b/cmd/snapshots/main.go @@ -26,20 +26,20 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon/cmd/snapshots/cmp" - "github.com/ledgerwatch/erigon/cmd/snapshots/copy" - "github.com/ledgerwatch/erigon/cmd/snapshots/manifest" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - "github.com/ledgerwatch/erigon/cmd/snapshots/torrents" - "github.com/ledgerwatch/erigon/cmd/snapshots/verify" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon/cmd/snapshots/cmp" + "github.com/erigontech/erigon/cmd/snapshots/copy" + "github.com/erigontech/erigon/cmd/snapshots/manifest" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/cmd/snapshots/torrents" + "github.com/erigontech/erigon/cmd/snapshots/verify" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" ) func main() { diff --git a/cmd/snapshots/manifest/manifest.go b/cmd/snapshots/manifest/manifest.go index ffd18566895..2e84d0c892d 100644 --- a/cmd/snapshots/manifest/manifest.go +++ b/cmd/snapshots/manifest/manifest.go @@ -30,11 +30,11 @@ import ( "github.com/urfave/cli/v2" - "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" ) var ( diff --git a/cmd/snapshots/sync/context.go b/cmd/snapshots/sync/context.go index 18d2292eeb9..0a01a822d3f 100644 --- a/cmd/snapshots/sync/context.go +++ b/cmd/snapshots/sync/context.go @@ -19,7 +19,7 @@ package sync import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type ctxKey int diff --git a/cmd/snapshots/sync/sync.go b/cmd/snapshots/sync/sync.go index 452c2ba0a4e..fdec668f448 100644 --- a/cmd/snapshots/sync/sync.go +++ b/cmd/snapshots/sync/sync.go @@ -36,19 +36,19 @@ import ( "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/downloader/downloadernat" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon/cmd/downloader/downloadernat" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/params" ) type LType int diff --git a/cmd/snapshots/sync/util.go b/cmd/snapshots/sync/util.go index b6cf015731d..3180e72f47d 100644 --- a/cmd/snapshots/sync/util.go +++ b/cmd/snapshots/sync/util.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader" ) func CheckRemote(rcCli *downloader.RCloneClient, src string) error { diff --git a/cmd/snapshots/torrents/torrents.go b/cmd/snapshots/torrents/torrents.go index dba960cf098..b5ba219e168 100644 --- a/cmd/snapshots/torrents/torrents.go +++ b/cmd/snapshots/torrents/torrents.go @@ -27,18 +27,18 @@ import ( gosync "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/anacrolix/torrent/metainfo" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/snapshots/manifest" - "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/manifest" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/turbo/logging" ) var Command = cli.Command{ diff --git a/cmd/snapshots/verify/verify.go b/cmd/snapshots/verify/verify.go index 841c00513ac..a1e6099ea22 100644 --- a/cmd/snapshots/verify/verify.go +++ b/cmd/snapshots/verify/verify.go @@ -24,11 +24,11 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/snapshots/flags" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon/cmd/snapshots/flags" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/cmd/utils" ) var ( diff --git a/cmd/state/commands/cat_snapshot.go b/cmd/state/commands/cat_snapshot.go index 22bc5647924..cb20c9981af 100644 --- a/cmd/state/commands/cat_snapshot.go +++ b/cmd/state/commands/cat_snapshot.go @@ -27,8 +27,8 @@ import ( "github.com/c2h5oh/datasize" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/seg" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/seg" + "github.com/erigontech/erigon-lib/state" ) func init() { diff --git a/cmd/state/commands/check_enc.go b/cmd/state/commands/check_enc.go index f3a6394f2a4..b39129a6761 100644 --- a/cmd/state/commands/check_enc.go +++ b/cmd/state/commands/check_enc.go @@ -17,7 +17,7 @@ package commands import ( - "github.com/ledgerwatch/erigon/cmd/state/verify" + "github.com/erigontech/erigon/cmd/state/verify" "github.com/spf13/cobra" ) diff --git a/cmd/state/commands/check_index.go b/cmd/state/commands/check_index.go index 1dabb4014de..e1e5db6abd7 100644 --- a/cmd/state/commands/check_index.go +++ b/cmd/state/commands/check_index.go @@ -17,8 +17,8 @@ package commands import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/state/verify" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/state/verify" "github.com/spf13/cobra" ) diff --git a/cmd/state/commands/global_flags_vars.go b/cmd/state/commands/global_flags_vars.go index da70d5f766e..9549343717c 100644 --- a/cmd/state/commands/global_flags_vars.go +++ b/cmd/state/commands/global_flags_vars.go @@ -19,9 +19,9 @@ package commands import ( "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/common/paths" + "github.com/erigontech/erigon/common/paths" ) var ( diff --git a/cmd/state/commands/index_stats.go b/cmd/state/commands/index_stats.go index f54f147b1cd..195152decbd 100644 --- a/cmd/state/commands/index_stats.go +++ b/cmd/state/commands/index_stats.go @@ -17,7 +17,7 @@ package commands import ( - "github.com/ledgerwatch/erigon/cmd/state/stats" + "github.com/erigontech/erigon/cmd/state/stats" "github.com/spf13/cobra" ) diff --git a/cmd/state/commands/opcode_tracer.go b/cmd/state/commands/opcode_tracer.go index 82605149ff1..279e64a2bd1 100644 --- a/cmd/state/commands/opcode_tracer.go +++ b/cmd/state/commands/opcode_tracer.go @@ -32,25 +32,25 @@ import ( "github.com/holiman/uint256" "github.com/spf13/cobra" - datadir2 "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/log/v3" - - chain2 "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "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/eth/ethconfig" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + datadir2 "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/log/v3" + + chain2 "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) var ( diff --git a/cmd/state/commands/root.go b/cmd/state/commands/root.go index 4e0b398c2f9..2f96daf9408 100644 --- a/cmd/state/commands/root.go +++ b/cmd/state/commands/root.go @@ -22,17 +22,17 @@ import ( "os" "path/filepath" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + chain2 "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/params" ) var ( diff --git a/cmd/state/commands/verify_txlookup.go b/cmd/state/commands/verify_txlookup.go index c1cd76feab3..68c58b41469 100644 --- a/cmd/state/commands/verify_txlookup.go +++ b/cmd/state/commands/verify_txlookup.go @@ -17,8 +17,8 @@ package commands import ( - "github.com/ledgerwatch/erigon/cmd/state/verify" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon/cmd/state/verify" + "github.com/erigontech/erigon/turbo/debug" "github.com/spf13/cobra" ) diff --git a/cmd/state/exec3/calltracer_v3.go b/cmd/state/exec3/calltracer_v3.go index fd1caadf64c..8f50a1582ea 100644 --- a/cmd/state/exec3/calltracer_v3.go +++ b/cmd/state/exec3/calltracer_v3.go @@ -18,8 +18,9 @@ package exec3 import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/vm" ) type CallTracer struct { diff --git a/cmd/state/exec3/historical_trace_worker.go b/cmd/state/exec3/historical_trace_worker.go index 56682f9df5e..61deb36d05b 100644 --- a/cmd/state/exec3/historical_trace_worker.go +++ b/cmd/state/exec3/historical_trace_worker.go @@ -24,23 +24,23 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "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/eth/consensuschain" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/consensuschain" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/turbo/services" ) type HistoricalTraceWorker struct { diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index 6db8bae80cf..266a414a07e 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -22,23 +22,23 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon/eth/consensuschain" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "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/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon/eth/consensuschain" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" ) type Worker struct { diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go index bc5e7a479fb..85dd09250b4 100644 --- a/cmd/state/exec3/state_recon.go +++ b/cmd/state/exec3/state_recon.go @@ -24,24 +24,24 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/consensuschain" - - "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/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/consensuschain" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + libstate "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/turbo/services" ) type ScanWorker struct { diff --git a/cmd/state/exec3/trace_worker.go b/cmd/state/exec3/trace_worker.go index 6541b2c2f6f..3ecdcdfa1a0 100644 --- a/cmd/state/exec3/trace_worker.go +++ b/cmd/state/exec3/trace_worker.go @@ -19,18 +19,18 @@ package exec3 import ( "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "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/turbo/services" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/transactions" ) type GenericTracer interface { diff --git a/cmd/state/main.go b/cmd/state/main.go index d2e217e7970..7c6f9648667 100644 --- a/cmd/state/main.go +++ b/cmd/state/main.go @@ -17,7 +17,7 @@ package main import ( - "github.com/ledgerwatch/erigon/cmd/state/commands" + "github.com/erigontech/erigon/cmd/state/commands" ) func main() { diff --git a/cmd/state/stats/index_stats.go b/cmd/state/stats/index_stats.go index 04e5e4e9947..5569996a94d 100644 --- a/cmd/state/stats/index_stats.go +++ b/cmd/state/stats/index_stats.go @@ -28,12 +28,12 @@ import ( "strings" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) func IndexStats(chaindata string, indexBucket string, statsFile string) error { diff --git a/cmd/state/verify/check_changeset_enc.go b/cmd/state/verify/check_changeset_enc.go index fa06839def5..47f46418c62 100644 --- a/cmd/state/verify/check_changeset_enc.go +++ b/cmd/state/verify/check_changeset_enc.go @@ -25,9 +25,9 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + historyv22 "github.com/erigontech/erigon-lib/kv/temporal/historyv2" "golang.org/x/sync/errgroup" ) diff --git a/cmd/state/verify/check_indexes.go b/cmd/state/verify/check_indexes.go index 05921fa86c8..c17d169c7d5 100644 --- a/cmd/state/verify/check_indexes.go +++ b/cmd/state/verify/check_indexes.go @@ -21,12 +21,12 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon/common" ) func CheckIndex(ctx context.Context, chaindata string, changeSetBucket string, indexBucket string) error { diff --git a/cmd/state/verify/verify_txlookup.go b/cmd/state/verify/verify_txlookup.go index 29a773c97b3..4a7bb50ddf0 100644 --- a/cmd/state/verify/verify_txlookup.go +++ b/cmd/state/verify/verify_txlookup.go @@ -26,15 +26,15 @@ import ( "path/filepath" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - datadir2 "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + libcommon "github.com/erigontech/erigon-lib/common" + datadir2 "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) func blocksIO(db kv.RoDB) (services.FullBlockReader, *blockio.BlockWriter) { diff --git a/cmd/txpool/main.go b/cmd/txpool/main.go index 1cda20a60ca..adf7bd8f76b 100644 --- a/cmd/txpool/main.go +++ b/cmd/txpool/main.go @@ -26,30 +26,30 @@ import ( "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/remotedb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpooluitl" - "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - common2 "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/ethdb/privateapi" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/remotedb" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/txpool" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/txpool/txpooluitl" + "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + common2 "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/ethdb/privateapi" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" ) var ( diff --git a/cmd/txpool/readme.md b/cmd/txpool/readme.md index deb8e3cd8cc..b1c951e666a 100644 --- a/cmd/txpool/readme.md +++ b/cmd/txpool/readme.md @@ -4,9 +4,9 @@ Transaction Pool - place where living "not-included-to-block-yet transactions". Erigon's TxPool can work inside Erigon (default) and as separated process. Erigon's pool implementation is not fork of Geth’s - Design -docs: https://github.com/ledgerwatch/erigon/wiki/Transaction-Pool-Design +docs: https://github.com/erigontech/erigon/wiki/Transaction-Pool-Design 95% of pool-related code (from p2p message parsing, to sorting logic) is inside this -folder: https://github.com/ledgerwatch/erigon-lib/tree/main/txpool +folder: https://github.com/erigontech/erigon-lib/tree/main/txpool ## Internal mode diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index cbf6918174a..a6bc4057a1b 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -35,37 +35,37 @@ import ( "github.com/spf13/pflag" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/metrics" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/direct" - downloadercfg2 "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - - "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/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/log/v3" + + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/metrics" + libkzg "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/direct" + downloadercfg2 "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cmd/downloader/downloadernat" + "github.com/erigontech/erigon/cmd/utils/flags" + common2 "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/p2p/netutil" + "github.com/erigontech/erigon/params" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/logging" ) // These are all the command line flags we support. diff --git a/cmd/utils/flags/flags.go b/cmd/utils/flags/flags.go index 604fc2c7e83..aa772421022 100644 --- a/cmd/utils/flags/flags.go +++ b/cmd/utils/flags/flags.go @@ -31,7 +31,7 @@ import ( "strings" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common/math" "github.com/urfave/cli/v2" ) diff --git a/cmd/verkle/main.go b/cmd/verkle/main.go index 1184440129a..b48b25e2424 100644 --- a/cmd/verkle/main.go +++ b/cmd/verkle/main.go @@ -24,21 +24,21 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" "github.com/c2h5oh/datasize" "go.uber.org/zap/buffer" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/verkle/verkletrie" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/cmd/verkle/verkletrie" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) type optionsCfg struct { diff --git a/cmd/verkle/verkletrie/incrementAccount.go b/cmd/verkle/verkletrie/incrementAccount.go index f472a737320..863bd47c687 100644 --- a/cmd/verkle/verkletrie/incrementAccount.go +++ b/cmd/verkle/verkletrie/incrementAccount.go @@ -22,14 +22,14 @@ import ( "sync" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/types/accounts" ) func IncrementAccount(vTx kv.RwTx, tx kv.Tx, workers uint64, verkleWriter *VerkleTreeWriter, from, to uint64, tmpdir string) error { diff --git a/cmd/verkle/verkletrie/incrementStorage.go b/cmd/verkle/verkletrie/incrementStorage.go index 4947e6d6d32..f1641e40f88 100644 --- a/cmd/verkle/verkletrie/incrementStorage.go +++ b/cmd/verkle/verkletrie/incrementStorage.go @@ -23,15 +23,15 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/rawdb" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/rawdb" ) func IncrementStorage(vTx kv.RwTx, tx kv.Tx, workers uint64, verkleWriter *VerkleTreeWriter, from, to uint64, tmpdir string) (libcommon.Hash, error) { diff --git a/cmd/verkle/verkletrie/pedersen_hashstate.go b/cmd/verkle/verkletrie/pedersen_hashstate.go index 23443d87a86..9ee1191bc7f 100644 --- a/cmd/verkle/verkletrie/pedersen_hashstate.go +++ b/cmd/verkle/verkletrie/pedersen_hashstate.go @@ -25,13 +25,13 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/types/accounts" ) func RegeneratePedersenAccounts(outTx kv.RwTx, readTx kv.Tx, workers uint64, verkleWriter *VerkleTreeWriter) error { diff --git a/cmd/verkle/verkletrie/verkle_marker.go b/cmd/verkle/verkletrie/verkle_marker.go index 3378d20e256..215b24eb647 100644 --- a/cmd/verkle/verkletrie/verkle_marker.go +++ b/cmd/verkle/verkletrie/verkle_marker.go @@ -19,8 +19,8 @@ package verkletrie import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" ) type VerkleMarker struct { diff --git a/cmd/verkle/verkletrie/verkle_tree_writer.go b/cmd/verkle/verkletrie/verkle_tree_writer.go index a74a086668c..eb4c3bbdd7b 100644 --- a/cmd/verkle/verkletrie/verkle_tree_writer.go +++ b/cmd/verkle/verkletrie/verkle_tree_writer.go @@ -25,15 +25,15 @@ import ( "github.com/gballet/go-verkle" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/trie/vtree" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/trie/vtree" ) func int256ToVerkleFormat(x *uint256.Int, buffer []byte) { diff --git a/cmd/verkle/verkletrie/workers.go b/cmd/verkle/verkletrie/workers.go index 57e3bf73e39..0bd66244225 100644 --- a/cmd/verkle/verkletrie/workers.go +++ b/cmd/verkle/verkletrie/workers.go @@ -19,11 +19,11 @@ package verkletrie import ( "context" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/trie/vtree" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/trie/vtree" ) type regeneratePedersenAccountsJob struct { diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index f8d8b53b716..b539b39aabd 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -24,9 +24,9 @@ import ( "math/rand" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/bytes.go b/common/bytes.go index 1e386278414..5b9d1306e27 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -24,7 +24,7 @@ import ( "bytes" "encoding/hex" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // FromHex returns the bytes represented by the hexadecimal string s. diff --git a/common/bytes_test.go b/common/bytes_test.go index 2b82d63afaa..50178a5edf2 100644 --- a/common/bytes_test.go +++ b/common/bytes_test.go @@ -23,7 +23,7 @@ import ( "bytes" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) func TestCopyBytes(t *testing.T) { diff --git a/common/changeset/accs.go b/common/changeset/accs.go index 270d7965444..4ce76c693a0 100644 --- a/common/changeset/accs.go +++ b/common/changeset/accs.go @@ -17,14 +17,14 @@ package changeset import ( - common2 "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + common2 "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon/ethdb" + "github.com/erigontech/erigon/ethdb" ) // GetModifiedAccounts returns a list of addresses that were modified in the block range diff --git a/common/changeset/storage_changeset_test.go b/common/changeset/storage_changeset_test.go index 3f40b387e2d..c14bb242acd 100644 --- a/common/changeset/storage_changeset_test.go +++ b/common/changeset/storage_changeset_test.go @@ -24,16 +24,16 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + historyv22 "github.com/erigontech/erigon-lib/kv/temporal/historyv2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) const ( diff --git a/common/compiler/solidity.go b/common/compiler/solidity.go index 1817b380006..740d07ea091 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // Solidity contains information about the solidity compiler. diff --git a/common/debug/log_panic.go b/common/debug/log_panic.go index 27df83f9f42..e5bdb079b16 100644 --- a/common/debug/log_panic.go +++ b/common/debug/log_panic.go @@ -21,8 +21,8 @@ import ( "sync/atomic" "syscall" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" ) var sigc atomic.Value diff --git a/common/debug/memstats.go b/common/debug/memstats.go index add0a8dc978..73f3146a87c 100644 --- a/common/debug/memstats.go +++ b/common/debug/memstats.go @@ -20,7 +20,7 @@ import ( "fmt" "runtime" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dbg" ) func PrintMemStats(short bool) { diff --git a/common/debugprint/receipts.go b/common/debugprint/receipts.go index c17cb2c2287..7df4ec6075e 100644 --- a/common/debugprint/receipts.go +++ b/common/debugprint/receipts.go @@ -19,7 +19,7 @@ package debugprint import ( "fmt" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // nolint diff --git a/common/math/big_test.go b/common/math/big_test.go index 3d183ed319d..bf53d82469c 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -25,7 +25,7 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/math/modexp.go b/common/math/modexp.go index b2a4f1bf0f9..056acd50e47 100644 --- a/common/math/modexp.go +++ b/common/math/modexp.go @@ -8,7 +8,7 @@ import ( "math/big" "math/bits" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // FastExp is semantically equivalent to x.Exp(x,y, m), but is faster for even diff --git a/common/paths/paths.go b/common/paths/paths.go index 599a9295e26..14ce226a3e6 100644 --- a/common/paths/paths.go +++ b/common/paths/paths.go @@ -23,8 +23,8 @@ import ( "runtime" "strings" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/log/v3" ) const dirname = "Erigon" diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go index 197ed18c12d..00ed608ba31 100644 --- a/common/prque/lazyqueue.go +++ b/common/prque/lazyqueue.go @@ -23,7 +23,7 @@ import ( "container/heap" "time" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) // LazyQueue is a priority queue data structure where priorities can change over diff --git a/common/prque/lazyqueue_test.go b/common/prque/lazyqueue_test.go index e7edfc64bc1..c4133970375 100644 --- a/common/prque/lazyqueue_test.go +++ b/common/prque/lazyqueue_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) const ( diff --git a/common/types.go b/common/types.go index dac051aec3a..8f8dfee50f4 100644 --- a/common/types.go +++ b/common/types.go @@ -28,10 +28,10 @@ import ( "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" ) // Lengths of hashes and addresses in bytes. diff --git a/common/types_test.go b/common/types_test.go index 26dd0810256..7918817aef7 100644 --- a/common/types_test.go +++ b/common/types_test.go @@ -29,7 +29,7 @@ import ( "strings" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func TestBytesConversion(t *testing.T) { diff --git a/consensus/aura/aura.go b/consensus/aura/aura.go index d48f580e3c8..6cf3b41202c 100644 --- a/consensus/aura/aura.go +++ b/consensus/aura/aura.go @@ -26,22 +26,22 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/dbg" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/clique" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/common/dbg" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/clique" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" ) var DEBUG_LOG_FROM = uint64(dbg.EnvInt("AURA_DEBUG_FROM", 999_999_999)) diff --git a/consensus/aura/aura_test.go b/consensus/aura/aura_test.go index 30454459ff0..5aae977aefb 100644 --- a/consensus/aura/aura_test.go +++ b/consensus/aura/aura_test.go @@ -23,17 +23,17 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/consensus/aura" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/trie" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/memdb" + + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/consensus/aura" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/trie" ) // Check that the first block of Gnosis Chain, which doesn't have any transactions, diff --git a/consensus/aura/auraabi/gen_block_reward.go b/consensus/aura/auraabi/gen_block_reward.go index 4137b58f952..0b1918fd00c 100644 --- a/consensus/aura/auraabi/gen_block_reward.go +++ b/consensus/aura/auraabi/gen_block_reward.go @@ -10,12 +10,12 @@ import ( "fmt" "reflect" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/consensus/aura/auraabi/gen_validator_set.go b/consensus/aura/auraabi/gen_validator_set.go index b16614af7d3..4e73d18f816 100644 --- a/consensus/aura/auraabi/gen_validator_set.go +++ b/consensus/aura/auraabi/gen_validator_set.go @@ -7,12 +7,12 @@ import ( "math/big" "strings" - ethereum "github.com/ledgerwatch/erigon" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + ethereum "github.com/erigontech/erigon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/consensus/aura/aurainterfaces/interface.go b/consensus/aura/aurainterfaces/interface.go index 21be4dcac71..7d401bd9a7f 100644 --- a/consensus/aura/aurainterfaces/interface.go +++ b/consensus/aura/aurainterfaces/interface.go @@ -18,8 +18,9 @@ package aurainterfaces import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus" ) // see openethereum/crates/ethcore/res/contracts/block_reward.json diff --git a/consensus/aura/config.go b/consensus/aura/config.go index 53672d24bda..4ed031fcb09 100644 --- a/consensus/aura/config.go +++ b/consensus/aura/config.go @@ -23,11 +23,11 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus" ) // Draws an validator nonce modulo number of validators. diff --git a/consensus/aura/config_test.go b/consensus/aura/config_test.go index 3c98144cfa7..9abe7a23899 100644 --- a/consensus/aura/config_test.go +++ b/consensus/aura/config_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) func TestGnosisBlockRewardContractTransitions(t *testing.T) { diff --git a/consensus/aura/contract_abi.go b/consensus/aura/contract_abi.go index 0e2ea6de812..4cc47d675bc 100644 --- a/consensus/aura/contract_abi.go +++ b/consensus/aura/contract_abi.go @@ -22,11 +22,11 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/aura/contracts" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/aura/contracts" ) func callBlockRewardAbi(contractAddr libcommon.Address, syscall consensus.SystemCall, beneficiaries []libcommon.Address, rewardKind []consensus.RewardKind) ([]libcommon.Address, []*uint256.Int) { diff --git a/consensus/aura/empty_step.go b/consensus/aura/empty_step.go index dfcd358b418..bbffbc3564e 100644 --- a/consensus/aura/empty_step.go +++ b/consensus/aura/empty_step.go @@ -23,10 +23,10 @@ import ( "github.com/erigontech/secp256k1" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // A message broadcast by authorities when it's their turn to seal a block but there are no diff --git a/consensus/aura/epoch.go b/consensus/aura/epoch.go index 81b557e199b..5012b427c62 100644 --- a/consensus/aura/epoch.go +++ b/consensus/aura/epoch.go @@ -19,10 +19,10 @@ package aura import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb" ) type NonTransactionalEpochReader struct { diff --git a/consensus/aura/finality_test.go b/consensus/aura/finality_test.go index 68b1b95ca86..452b673d786 100644 --- a/consensus/aura/finality_test.go +++ b/consensus/aura/finality_test.go @@ -19,7 +19,7 @@ package aura import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/consensus/aura/gaslimit_override.go b/consensus/aura/gaslimit_override.go index 9a28663650f..f8e2b919f53 100644 --- a/consensus/aura/gaslimit_override.go +++ b/consensus/aura/gaslimit_override.go @@ -18,16 +18,15 @@ package aura import ( lru "github.com/hashicorp/golang-lru/v2" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" ) type GasLimitOverride struct { diff --git a/consensus/aura/rolling_finality.go b/consensus/aura/rolling_finality.go index 5b503088d8c..3071fefafe7 100644 --- a/consensus/aura/rolling_finality.go +++ b/consensus/aura/rolling_finality.go @@ -20,7 +20,7 @@ import ( "container/list" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // RollingFinality checker for authority round consensus. diff --git a/consensus/aura/types.go b/consensus/aura/types.go index 094f36897e4..1716010c01d 100644 --- a/consensus/aura/types.go +++ b/consensus/aura/types.go @@ -19,8 +19,8 @@ package aura import ( "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" ) type StepDurationInfo struct { diff --git a/consensus/aura/unassemble.go b/consensus/aura/unassemble.go index b921ad60a97..6b731b2bde8 100644 --- a/consensus/aura/unassemble.go +++ b/consensus/aura/unassemble.go @@ -19,7 +19,7 @@ package aura import ( "container/list" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // nolint diff --git a/consensus/aura/validators.go b/consensus/aura/validators.go index 23ff292b849..a3c63044037 100644 --- a/consensus/aura/validators.go +++ b/consensus/aura/validators.go @@ -26,18 +26,19 @@ import ( "sync/atomic" lru "github.com/hashicorp/golang-lru/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/aura/auraabi" - "github.com/ledgerwatch/erigon/consensus/aura/aurainterfaces" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/aura/auraabi" + "github.com/erigontech/erigon/consensus/aura/aurainterfaces" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // nolint diff --git a/consensus/chain_header_reader_mock.go b/consensus/chain_header_reader_mock.go index e2c863744a4..be54e66f076 100644 --- a/consensus/chain_header_reader_mock.go +++ b/consensus/chain_header_reader_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/consensus (interfaces: ChainHeaderReader) +// Source: github.com/erigontech/erigon/consensus (interfaces: ChainHeaderReader) // // Generated by this command: // @@ -13,9 +13,9 @@ import ( big "math/big" reflect "reflect" - chain "github.com/ledgerwatch/erigon-lib/chain" - common "github.com/ledgerwatch/erigon-lib/common" - types "github.com/ledgerwatch/erigon/core/types" + chain "github.com/erigontech/erigon-lib/chain" + common "github.com/erigontech/erigon-lib/common" + types "github.com/erigontech/erigon/core/types" gomock "go.uber.org/mock/gomock" ) diff --git a/consensus/clique/api.go b/consensus/clique/api.go index d95707bc51b..ed37e677fb6 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -23,14 +23,14 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon/eth/consensuschain" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon/eth/consensuschain" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/services" ) // API is a user facing RPC API to allow controlling the signer and voting diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go index 8b23e68812d..3868d97418e 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -34,28 +34,28 @@ import ( "github.com/goccy/go-json" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon/turbo/services" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/cryptopool" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/turbo/services" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" ) const ( diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index c70c81ea086..5a9f44795d1 100644 --- a/consensus/clique/clique_test.go +++ b/consensus/clique/clique_test.go @@ -25,18 +25,18 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus/clique" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus/clique" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" ) // This test case is a repro of an annoying bug that took us forever to catch. diff --git a/consensus/clique/keys.go b/consensus/clique/keys.go index 137437b1799..d258de7c874 100644 --- a/consensus/clique/keys.go +++ b/consensus/clique/keys.go @@ -19,7 +19,7 @@ package clique import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // SnapshotFullKey = SnapshotBucket + num (uint64 big endian) + hash diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index 57e394483ce..5795dc71b9f 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -27,19 +27,19 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/goccy/go-json" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" ) // Vote represents a single vote that an authorized signer made to modify the diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index 7dc0fb48918..49d6b5443d5 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -26,21 +26,21 @@ import ( "sort" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "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/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/consensus/clique" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/consensus/clique" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/testlog" ) // testerAccountPool is a pool to maintain currently active tester accounts, @@ -377,7 +377,7 @@ func TestClique(t *testing.T) { failure: clique.ErrRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/ledgerwatch/erigon/issues/17593). Whilst this + // batch (https://github.com/erigontech/erigon/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. name: "Recent signatures should not reset on checkpoint blocks imported in a new batch", epoch: 3, diff --git a/consensus/clique/verifier.go b/consensus/clique/verifier.go index e3642edf3df..9c0fe04b826 100644 --- a/consensus/clique/verifier.go +++ b/consensus/clique/verifier.go @@ -21,13 +21,13 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) // verifyHeader checks whether a header conforms to the consensus rules.The diff --git a/consensus/consensus.go b/consensus/consensus.go index a21eb75f471..0e5459630c3 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -25,16 +25,16 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" ) // ChainHeaderReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/algorithm.go b/consensus/ethash/algorithm.go index 00c2b207dfb..0cca67bb8de 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -30,18 +30,18 @@ import ( "time" "unsafe" - common2 "github.com/ledgerwatch/erigon-lib/common" + common2 "github.com/erigontech/erigon-lib/common" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/bitutil" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/bitutil" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/crypto" ) const ( diff --git a/consensus/ethash/algorithm_test.go b/consensus/ethash/algorithm_test.go index f25d55ed65e..3684dd0a7fa 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -26,9 +26,9 @@ import ( "reflect" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) // prepare converts an ethash cache or dataset from a byte stream into the internal diff --git a/consensus/ethash/api.go b/consensus/ethash/api.go index b4b678bda14..403a5ed4057 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -22,11 +22,11 @@ package ethash import ( "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) var errEthashStopped = errors.New("ethash stopped") diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index b3f641ec98d..001758cbf0c 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -31,20 +31,20 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) // Ethash proof-of-work protocol constants. diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index 0cbe8bc5c24..17e6f0082a9 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -28,12 +28,13 @@ import ( "testing" "github.com/goccy/go-json" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) type diffTest struct { diff --git a/consensus/ethash/difficulty.go b/consensus/ethash/difficulty.go index 6368d79e580..51b5e3c9020 100644 --- a/consensus/ethash/difficulty.go +++ b/consensus/ethash/difficulty.go @@ -23,7 +23,8 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/core/types" + + "github.com/erigontech/erigon/core/types" ) const ( diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index e416ad4bc65..00beccf4941 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -37,14 +37,14 @@ import ( "github.com/edsrzf/mmap-go" "github.com/hashicorp/golang-lru/v2/simplelru" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common/debug" - cmath "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common/debug" + cmath "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/rpc" ) const doNotStoreCachesOnDisk = "" diff --git a/consensus/ethash/ethash_test.go b/consensus/ethash/ethash_test.go index 5a206646feb..5a409beb7fe 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -24,11 +24,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) func TestRemoteSealer(t *testing.T) { diff --git a/consensus/ethash/ethashcfg/ethashcfg.go b/consensus/ethash/ethashcfg/ethashcfg.go index 7d26c16a127..976c12905b3 100644 --- a/consensus/ethash/ethashcfg/ethashcfg.go +++ b/consensus/ethash/ethashcfg/ethashcfg.go @@ -17,7 +17,7 @@ package ethashcfg import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // Config are the configuration parameters of the ethash. diff --git a/consensus/ethash/fake.go b/consensus/ethash/fake.go index 5ff5429710f..8578f19fac4 100644 --- a/consensus/ethash/fake.go +++ b/consensus/ethash/fake.go @@ -21,12 +21,12 @@ import ( mapset "github.com/deckarep/golang-set/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" ) type FakeEthash struct { diff --git a/consensus/ethash/meter.go b/consensus/ethash/meter.go index 85b1e2dc504..1414dac98fb 100644 --- a/consensus/ethash/meter.go +++ b/consensus/ethash/meter.go @@ -22,7 +22,7 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon/common/debug" + "github.com/erigontech/erigon/common/debug" ) func newHashRateMeter() *hashRateMeter { diff --git a/consensus/ethash/sealer.go b/consensus/ethash/sealer.go index 209c81d9fc0..53b4e003960 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -31,14 +31,14 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/goccy/go-json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" ) const ( diff --git a/consensus/ethash/sealer_test.go b/consensus/ethash/sealer_test.go index 07b65125024..31f31406326 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -30,14 +30,14 @@ import ( "github.com/goccy/go-json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon/turbo/testlog" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // Tests whether remote HTTP servers are correctly notified of new work. diff --git a/consensus/merge/merge.go b/consensus/merge/merge.go index d110db06b42..3c3f5a51f3f 100644 --- a/consensus/merge/merge.go +++ b/consensus/merge/merge.go @@ -25,19 +25,19 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/aura" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/aura" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" ) // Constants for The Merge as specified by EIP-3675: Upgrade consensus to Proof-of-Stake diff --git a/consensus/merge/merge_test.go b/consensus/merge/merge_test.go index a5f2def0e47..46a27f9050c 100644 --- a/consensus/merge/merge_test.go +++ b/consensus/merge/merge_test.go @@ -20,11 +20,11 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" ) type readerMock struct{} diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index 98536d151bd..fd02f56bfdc 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -25,12 +25,13 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) var ( diff --git a/consensus/misc/eip1559.go b/consensus/misc/eip1559.go index ba23002226e..1035df0fe29 100644 --- a/consensus/misc/eip1559.go +++ b/consensus/misc/eip1559.go @@ -23,15 +23,15 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/polygon/bor/borcfg" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) // VerifyEip1559Header verifies some header attributes which were changed in EIP-1559, diff --git a/consensus/misc/eip1559_test.go b/consensus/misc/eip1559_test.go index e443ab664ec..f467a6a3a31 100644 --- a/consensus/misc/eip1559_test.go +++ b/consensus/misc/eip1559_test.go @@ -23,11 +23,11 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) // copyConfig does a _shallow_ copy of a given config. Safe to set new values, but diff --git a/consensus/misc/eip2935.go b/consensus/misc/eip2935.go index 44c32e0ca38..887d30d4749 100644 --- a/consensus/misc/eip2935.go +++ b/consensus/misc/eip2935.go @@ -19,13 +19,13 @@ package misc import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func StoreBlockHashesEip2935(header *types.Header, state *state.IntraBlockState, config *chain.Config, headerReader consensus.ChainHeaderReader) { diff --git a/consensus/misc/eip4788.go b/consensus/misc/eip4788.go index bc718e09748..04fa4bc806e 100644 --- a/consensus/misc/eip4788.go +++ b/consensus/misc/eip4788.go @@ -17,12 +17,12 @@ package misc import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/params" ) func ApplyBeaconRootEip4788(parentBeaconBlockRoot *libcommon.Hash, syscall consensus.SystemCall, tracer *tracing.Hooks) { diff --git a/consensus/misc/eip4844.go b/consensus/misc/eip4844.go index 44d2d2921d5..076947788a4 100644 --- a/consensus/misc/eip4844.go +++ b/consensus/misc/eip4844.go @@ -24,10 +24,10 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // CalcExcessBlobGas implements calc_excess_blob_gas from EIP-4844 diff --git a/consensus/misc/eip7002.go b/consensus/misc/eip7002.go index da9884537b7..8072f3c5273 100644 --- a/consensus/misc/eip7002.go +++ b/consensus/misc/eip7002.go @@ -19,11 +19,11 @@ package misc import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) // Configuration related to EIP-7002 diff --git a/consensus/misc/eip7251.go b/consensus/misc/eip7251.go index d433553580d..4b40e9b5f5e 100644 --- a/consensus/misc/eip7251.go +++ b/consensus/misc/eip7251.go @@ -17,11 +17,11 @@ package misc import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func DequeueConsolidationRequests7251(syscall consensus.SystemCall) types.Requests { diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go index 17590afecda..b559e44f493 100644 --- a/consensus/misc/gaslimit.go +++ b/consensus/misc/gaslimit.go @@ -22,7 +22,7 @@ package misc import ( "fmt" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) // VerifyGaslimit verifies the header gas limit according increase/decrease diff --git a/consensus/misc/pos.go b/consensus/misc/pos.go index a844ebb5869..444e6ca5e65 100644 --- a/consensus/misc/pos.go +++ b/consensus/misc/pos.go @@ -17,8 +17,8 @@ package misc import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" ) // Constants for The Merge as specified by EIP-3675: Upgrade consensus to Proof-of-Stake diff --git a/consensus/result.go b/consensus/result.go index b3c7aa1852b..2bf12da0a6e 100644 --- a/consensus/result.go +++ b/consensus/result.go @@ -19,9 +19,9 @@ package consensus import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/types" ) type ResultWithContext struct { diff --git a/core/asm/asm.go b/core/asm/asm.go index 02ad6f1deca..fd3ead7b446 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -24,7 +24,7 @@ import ( "encoding/hex" "fmt" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index beb470faf2e..49da9760482 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -26,8 +26,8 @@ import ( "os" "strings" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/block_builder_parameters.go b/core/block_builder_parameters.go index c5c91761692..f3b3f99344a 100644 --- a/core/block_builder_parameters.go +++ b/core/block_builder_parameters.go @@ -17,9 +17,9 @@ package core import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // Parameters for PoS block building diff --git a/core/block_validator.go b/core/block_validator.go index 33b7bd753ff..189e8d5a15f 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -20,7 +20,7 @@ package core import ( - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) // CalcGasLimit computes the gas limit of the next block after parent. It aims diff --git a/core/block_validator_test.go b/core/block_validator_test.go index eef98578457..86ea15f66d8 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -23,17 +23,17 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/testlog" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index e54a803d588..f376b37c26e 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -29,25 +29,25 @@ import ( "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus" - - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/ethutils" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus" + + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/ethutils" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/core/blocks.go b/core/blocks.go index a11f3c4b687..b46500f1a45 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -20,7 +20,7 @@ package core import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // BadHashes represent a set of manually tracked bad hashes (usually hard forks) diff --git a/core/chain_makers.go b/core/chain_makers.go index 41f3252341e..dd1aa555b3a 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -25,23 +25,23 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/config3" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) // BlockGen creates blocks for testing. diff --git a/core/error.go b/core/error.go index 7957ff032e1..4bb7b476b45 100644 --- a/core/error.go +++ b/core/error.go @@ -22,7 +22,7 @@ package core import ( "errors" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) var ( diff --git a/core/events.go b/core/events.go index 2b3884e2701..7f73ac187bb 100644 --- a/core/events.go +++ b/core/events.go @@ -20,9 +20,9 @@ package core import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index ac1f79b742e..19a6a9af169 100644 --- a/core/evm.go +++ b/core/evm.go @@ -25,14 +25,14 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" ) // NewEVMBlockContext creates a new context for use in the EVM. diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go index 53a42d8e4ea..954902a9064 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -30,10 +30,10 @@ import ( "slices" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index a04d845c311..d54e10cb6fe 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -24,11 +24,11 @@ import ( "math" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) // TestCreation tests that different genesis and fork rule combinations result in diff --git a/core/genesis_test.go b/core/genesis_test.go index f861aac5a80..9f11709c624 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -25,21 +25,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages/mock" + + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func TestGenesisBlockHashes(t *testing.T) { diff --git a/core/genesis_write.go b/core/genesis_write.go index 4ea84d77635..8df012674db 100644 --- a/core/genesis_write.go +++ b/core/genesis_write.go @@ -33,29 +33,29 @@ import ( "github.com/holiman/uint256" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - state2 "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + state2 "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) //go:embed allocs diff --git a/core/mkalloc.go b/core/mkalloc.go index 5d8846805f7..184187cef44 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -35,8 +35,8 @@ import ( "sort" "strconv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" ) type allocItem struct{ Addr, Balance *big.Int } diff --git a/core/rawdb/accessors_canonical_reader.go b/core/rawdb/accessors_canonical_reader.go index d9cf2a8bc88..df0554c953b 100644 --- a/core/rawdb/accessors_canonical_reader.go +++ b/core/rawdb/accessors_canonical_reader.go @@ -20,12 +20,12 @@ import ( "encoding/binary" "fmt" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/stream" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/stream" ) type CanonicalTxnIds struct { diff --git a/core/rawdb/accessors_canonical_reader_test.go b/core/rawdb/accessors_canonical_reader_test.go index baafae21fe0..3003f139706 100644 --- a/core/rawdb/accessors_canonical_reader_test.go +++ b/core/rawdb/accessors_canonical_reader_test.go @@ -24,13 +24,13 @@ import ( "sort" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/stages/mock" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index d628074020c..b5603c81129 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -31,19 +31,19 @@ import ( "github.com/gballet/go-verkle" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/ethdb/cbor" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/ethdb/cbor" + "github.com/erigontech/erigon/rlp" ) // ReadCanonicalHash retrieves the hash assigned to a canonical block number. diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index cc50f731ed2..a66fff468dd 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -30,21 +30,21 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - // "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + // "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) // Tests block header storage and retrieval operations. diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index f08b63cb8ad..b848d3e10d8 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -22,11 +22,11 @@ package rawdb import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // TxLookupEntry is a positional metadata to help looking up the data content of diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index b8155a700d1..7ba5587b2f5 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -27,13 +27,13 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" ) // Tests that positional lookup metadata can be stored and retrieved. diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index a0eff1430f2..4d36344bf71 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -23,12 +23,12 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) // ReadChainConfig retrieves the consensus settings based on the given genesis hash. diff --git a/core/rawdb/blockio/block_writer.go b/core/rawdb/blockio/block_writer.go index d0ce249fe36..5898143a487 100644 --- a/core/rawdb/blockio/block_writer.go +++ b/core/rawdb/blockio/block_writer.go @@ -22,19 +22,19 @@ import ( "errors" "time" - "github.com/ledgerwatch/erigon-lib/kv/backup" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/metrics" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/polygon/bor/bordb" + "github.com/erigontech/erigon-lib/kv/backup" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/metrics" + + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/polygon/bor/bordb" ) //Naming: diff --git a/core/rawdb/bor_receipts.go b/core/rawdb/bor_receipts.go index fde7caf3e43..1a400e4ead7 100644 --- a/core/rawdb/bor_receipts.go +++ b/core/rawdb/bor_receipts.go @@ -21,16 +21,16 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/ethdb/cbor" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/ethdb/cbor" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/core/rawdb/rawdbhelpers/rawdbhelpers.go b/core/rawdb/rawdbhelpers/rawdbhelpers.go index d883f9e1761..c5af8c22080 100644 --- a/core/rawdb/rawdbhelpers/rawdbhelpers.go +++ b/core/rawdb/rawdbhelpers/rawdbhelpers.go @@ -19,8 +19,8 @@ package rawdbhelpers import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" ) func IdxStepsCountV3(tx kv.Tx) float64 { diff --git a/core/rawdb/rawdbreset/reset_stages.go b/core/rawdb/rawdbreset/reset_stages.go index f1d11dc5406..c5b807c279c 100644 --- a/core/rawdb/rawdbreset/reset_stages.go +++ b/core/rawdb/rawdbreset/reset_stages.go @@ -20,17 +20,17 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/backup" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/backup" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/services" ) func ResetState(db kv.RwDB, ctx context.Context, chain string, tmpDir string, logger log.Logger) error { diff --git a/core/rawdb/state_version.go b/core/rawdb/state_version.go index abcaf7fb4ef..a42cf7faaf6 100644 --- a/core/rawdb/state_version.go +++ b/core/rawdb/state_version.go @@ -19,7 +19,7 @@ package rawdb import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) func GetStateVersion(tx kv.Tx) (uint64, error) { diff --git a/core/rlp_test.go b/core/rlp_test.go index d0ae0449e28..646fc3aa84b 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -27,17 +27,17 @@ import ( "golang.org/x/crypto/sha3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) func getBlock(tb testing.TB, transactions int, uncles int, dataSize int, tmpDir string, logger log.Logger) *types.Block { diff --git a/core/skip_analysis.go b/core/skip_analysis.go index 742683a6bd9..a6afb6637f5 100644 --- a/core/skip_analysis.go +++ b/core/skip_analysis.go @@ -19,8 +19,8 @@ package core import ( "sort" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" ) // SkipAnalysis function tells us whether we can skip performing jumpdest analysis diff --git a/core/snaptype/block_types.go b/core/snaptype/block_types.go index 96c637485ca..5a5c567a01e 100644 --- a/core/snaptype/block_types.go +++ b/core/snaptype/block_types.go @@ -25,21 +25,21 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "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/background" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/cryptopool" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/rlp" ) func init() { diff --git a/core/snaptype/block_types_test.go b/core/snaptype/block_types_test.go index a49a4cc9822..a6508b66682 100644 --- a/core/snaptype/block_types_test.go +++ b/core/snaptype/block_types_test.go @@ -19,7 +19,7 @@ package snaptype_test import ( "testing" - "github.com/ledgerwatch/erigon/core/snaptype" + "github.com/erigontech/erigon/core/snaptype" ) func TestEnumeration(t *testing.T) { diff --git a/core/state/access_list.go b/core/state/access_list.go index def16c023ae..88630112419 100644 --- a/core/state/access_list.go +++ b/core/state/access_list.go @@ -20,7 +20,7 @@ package state import ( - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) type accessList struct { diff --git a/core/state/access_list_test.go b/core/state/access_list_test.go index 33304b5f372..cc72a272fef 100644 --- a/core/state/access_list_test.go +++ b/core/state/access_list_test.go @@ -21,11 +21,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - stateLib "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + stateLib "github.com/erigontech/erigon-lib/state" ) func verifyAddrs(t *testing.T, s *IntraBlockState, astrings ...string) { diff --git a/core/state/cached_reader.go b/core/state/cached_reader.go index 791f1ad15c7..22972493a2b 100644 --- a/core/state/cached_reader.go +++ b/core/state/cached_reader.go @@ -19,10 +19,10 @@ package state import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/shards" ) // CachedReader is a wrapper for an instance of type StateReader diff --git a/core/state/cached_reader3.go b/core/state/cached_reader3.go index d79212a51b1..192c145bef5 100644 --- a/core/state/cached_reader3.go +++ b/core/state/cached_reader3.go @@ -19,11 +19,11 @@ package state import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) // CachedReader3 is a wrapper for an instance of type StateReader diff --git a/core/state/cached_writer.go b/core/state/cached_writer.go index 11fe169bbcc..db832e4475f 100644 --- a/core/state/cached_writer.go +++ b/core/state/cached_writer.go @@ -18,10 +18,11 @@ package state import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/shards" ) // CachedWriter is a wrapper for an instance of type StateWriter diff --git a/core/state/contracts/gen_changer.go b/core/state/contracts/gen_changer.go index ffe8ef43dc9..7b78acb2399 100644 --- a/core/state/contracts/gen_changer.go +++ b/core/state/contracts/gen_changer.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/core/state/contracts/gen_phoenix.go b/core/state/contracts/gen_phoenix.go index e26dfa963ec..4d683e4f3fa 100644 --- a/core/state/contracts/gen_phoenix.go +++ b/core/state/contracts/gen_phoenix.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/core/state/contracts/gen_poly.go b/core/state/contracts/gen_poly.go index 8da9b79bf02..4a672411d4e 100644 --- a/core/state/contracts/gen_poly.go +++ b/core/state/contracts/gen_poly.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/core/state/contracts/gen_revive.go b/core/state/contracts/gen_revive.go index f769b92726f..64e4dbfaebe 100644 --- a/core/state/contracts/gen_revive.go +++ b/core/state/contracts/gen_revive.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/core/state/contracts/gen_revive2.go b/core/state/contracts/gen_revive2.go index d7dbfe85054..b017e744d5d 100644 --- a/core/state/contracts/gen_revive2.go +++ b/core/state/contracts/gen_revive2.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/core/state/contracts/gen_selfdestruct.go b/core/state/contracts/gen_selfdestruct.go index 1049bda856c..15257b0259d 100644 --- a/core/state/contracts/gen_selfdestruct.go +++ b/core/state/contracts/gen_selfdestruct.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/core/state/database.go b/core/state/database.go index 2789e1cd86f..b32feaa476d 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -22,9 +22,10 @@ package state import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/types/accounts" ) const ( diff --git a/core/state/database_test.go b/core/state/database_test.go index 41ac0244a54..5eb043613c4 100644 --- a/core/state/database_test.go +++ b/core/state/database_test.go @@ -30,23 +30,23 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - state3 "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/state/contracts" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + state3 "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/state/contracts" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" ) // Create revival problem diff --git a/core/state/dump.go b/core/state/dump.go index dbeec3a2961..407fcf9d809 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -23,16 +23,16 @@ import ( "encoding/json" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/trie" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/trie" ) type Dumper struct { diff --git a/core/state/history_reader_inc.go b/core/state/history_reader_inc.go index 72604fccdfb..4046b27ba34 100644 --- a/core/state/history_reader_inc.go +++ b/core/state/history_reader_inc.go @@ -20,11 +20,11 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + libstate "github.com/erigontech/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) type RequiredStateError struct { diff --git a/core/state/history_reader_v3.go b/core/state/history_reader_v3.go index 46af4edb5e2..e971215628f 100644 --- a/core/state/history_reader_v3.go +++ b/core/state/history_reader_v3.go @@ -19,10 +19,10 @@ package state import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/types/accounts" ) // HistoryReaderV3 Implements StateReader and StateWriter diff --git a/core/state/historyv2read/history.go b/core/state/historyv2read/history.go index 537e28b6eb4..fbf3c4efe19 100644 --- a/core/state/historyv2read/history.go +++ b/core/state/historyv2read/history.go @@ -19,11 +19,11 @@ package historyv2read import ( "encoding/binary" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon/core/types/accounts" ) const DefaultIncarnation = uint64(1) diff --git a/core/state/intra_block_state.go b/core/state/intra_block_state.go index cb9ca232eb6..5cec10b79f1 100644 --- a/core/state/intra_block_state.go +++ b/core/state/intra_block_state.go @@ -25,16 +25,17 @@ import ( "sort" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/trie" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/trie" ) var _ evmtypes.IntraBlockState = new(IntraBlockState) // compile-time interface-check diff --git a/core/state/intra_block_state_test.go b/core/state/intra_block_state_test.go index 256637b35a1..a855da42f33 100644 --- a/core/state/intra_block_state_test.go +++ b/core/state/intra_block_state_test.go @@ -36,17 +36,17 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - stateLib "github.com/ledgerwatch/erigon-lib/state" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + stateLib "github.com/erigontech/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" ) func TestSnapshotRandom(t *testing.T) { diff --git a/core/state/journal.go b/core/state/journal.go index becb6a400a7..fb5dab3f3b3 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -21,7 +21,8 @@ package state import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + + libcommon "github.com/erigontech/erigon-lib/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/plain_state_reader.go b/core/state/plain_state_reader.go index b922889760c..a2621e15814 100644 --- a/core/state/plain_state_reader.go +++ b/core/state/plain_state_reader.go @@ -20,12 +20,12 @@ import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) var _ StateReader = (*PlainStateReader)(nil) diff --git a/core/state/plain_state_writer.go b/core/state/plain_state_writer.go index c8cf347a2ab..967aae631ae 100644 --- a/core/state/plain_state_writer.go +++ b/core/state/plain_state_writer.go @@ -17,7 +17,7 @@ package state import ( - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) type putDel interface { diff --git a/core/state/recon_state.go b/core/state/recon_state.go index b28b36a5489..1e7bbea1db9 100644 --- a/core/state/recon_state.go +++ b/core/state/recon_state.go @@ -30,7 +30,7 @@ import ( btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) type reconPair struct { diff --git a/core/state/recon_writer_inc.go b/core/state/recon_writer_inc.go index ab39c5ee56d..f9f97b55136 100644 --- a/core/state/recon_writer_inc.go +++ b/core/state/recon_writer_inc.go @@ -19,14 +19,14 @@ package state import ( "bytes" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + libstate "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/core/types/accounts" ) type StateReconWriterInc struct { diff --git a/core/state/rw_v3.go b/core/state/rw_v3.go index 24b106affff..8e656c404a9 100644 --- a/core/state/rw_v3.go +++ b/core/state/rw_v3.go @@ -25,18 +25,18 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon-lib/state" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/state" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/shards" ) var execTxsDone = metrics.NewCounter(`exec_txs_done`) diff --git a/core/state/state_object.go b/core/state/state_object.go index c255fe3ee31..5df5b928964 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -28,13 +28,13 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/trie" ) var emptyCodeHash = crypto.Keccak256(nil) diff --git a/core/state/state_object_test.go b/core/state/state_object_test.go index ed7457a8ad0..9a77541b6a3 100644 --- a/core/state/state_object_test.go +++ b/core/state/state_object_test.go @@ -23,8 +23,8 @@ import ( "bytes" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/common" ) func BenchmarkCutOriginal(b *testing.B) { diff --git a/core/state/state_reader_v4.go b/core/state/state_reader_v4.go index ccc33f8248d..da618504ec7 100644 --- a/core/state/state_reader_v4.go +++ b/core/state/state_reader_v4.go @@ -17,9 +17,9 @@ package state import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types/accounts" ) var _ StateReader = (*ReaderV4)(nil) diff --git a/core/state/state_test.go b/core/state/state_test.go index bd388d6953e..d857cd2727b 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -28,21 +28,21 @@ import ( "github.com/stretchr/testify/require" checker "gopkg.in/check.v1" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - stateLib "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + stateLib "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" ) var toAddr = common.BytesToAddress diff --git a/core/state/state_types.go b/core/state/state_types.go index 1b81e9c002c..e834295cccb 100644 --- a/core/state/state_types.go +++ b/core/state/state_types.go @@ -20,7 +20,8 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + + "github.com/erigontech/erigon-lib/common" ) type ( diff --git a/core/state/state_writer_v4.go b/core/state/state_writer_v4.go index 95cca80b6d2..12654ea5298 100644 --- a/core/state/state_writer_v4.go +++ b/core/state/state_writer_v4.go @@ -21,9 +21,9 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types/accounts" ) var _ StateWriter = (*WriterV4)(nil) diff --git a/core/state/transient_storage.go b/core/state/transient_storage.go index 898c0cf7b85..0908c3888e1 100644 --- a/core/state/transient_storage.go +++ b/core/state/transient_storage.go @@ -22,7 +22,7 @@ package state import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // transientStorage is a representation of EIP-1153 "Transient Storage". diff --git a/core/state/txtask.go b/core/state/txtask.go index cf2ee0f7c77..b82ef4bff4d 100644 --- a/core/state/txtask.go +++ b/core/state/txtask.go @@ -24,12 +24,12 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm/evmtypes" ) // ReadWriteSet contains ReadSet, WriteSet and BalanceIncrease of a transaction, diff --git a/core/state_processor.go b/core/state_processor.go index 7816ab570c7..86278d21f15 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -20,15 +20,15 @@ package core import ( - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "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/crypto" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" ) // applyTransaction attempts to apply a transaction to the given state database diff --git a/core/state_transition.go b/core/state_transition.go index 82e752359b3..a08fae912e6 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -25,21 +25,21 @@ import ( "slices" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types2 "github.com/ledgerwatch/erigon-lib/types" - - cmath "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + types2 "github.com/erigontech/erigon-lib/types" + + cmath "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) var emptyCodeHash = crypto.Keccak256Hash(nil) diff --git a/core/system_contract_lookup.go b/core/system_contract_lookup.go index 2a800c4322c..e2d666901c2 100644 --- a/core/system_contract_lookup.go +++ b/core/system_contract_lookup.go @@ -20,14 +20,14 @@ import ( "fmt" "strconv" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/core/systemcontracts" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/systemcontracts" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func init() { diff --git a/core/systemcontracts/upgrade.go b/core/systemcontracts/upgrade.go index c4c4ab3477f..2fe052020f1 100644 --- a/core/systemcontracts/upgrade.go +++ b/core/systemcontracts/upgrade.go @@ -17,7 +17,7 @@ package systemcontracts import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/core/test/domains_restart_test.go b/core/test/domains_restart_test.go index 144aa747a51..fb9486d9933 100644 --- a/core/test/domains_restart_test.go +++ b/core/test/domains_restart_test.go @@ -29,30 +29,30 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb" "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/state" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/core" - reset2 "github.com/ledgerwatch/erigon/core/rawdb/rawdbreset" - state2 "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/state" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/core" + reset2 "github.com/erigontech/erigon/core/rawdb/rawdbreset" + state2 "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) // if fpath is empty, tempDir is used, otherwise fpath is reused diff --git a/core/tracing/hooks.go b/core/tracing/hooks.go index 84954d0fff0..feed8a65cc9 100644 --- a/core/tracing/hooks.go +++ b/core/tracing/hooks.go @@ -22,10 +22,10 @@ package tracing import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon/core/types" "github.com/holiman/uint256" ) diff --git a/core/tx_cacher.go b/core/tx_cacher.go index 9fedd04b89d..0bdb67c5a9e 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -22,9 +22,9 @@ package core import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/types" ) // txSenderCacherRequest is a request for recovering transaction senders with a diff --git a/core/types/access_list_tx.go b/core/types/access_list_tx.go index 7d325c3554e..a14873353de 100644 --- a/core/types/access_list_tx.go +++ b/core/types/access_list_tx.go @@ -29,13 +29,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/rlp" ) // AccessListTx is the data of EIP-2930 access list transactions. diff --git a/core/types/accounts/account.go b/core/types/accounts/account.go index baf3274429e..6c1ac11d427 100644 --- a/core/types/accounts/account.go +++ b/core/types/accounts/account.go @@ -23,11 +23,12 @@ import ( "sync" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // Account is the Ethereum consensus representation of accounts. diff --git a/core/types/accounts/account_benchmark_test.go b/core/types/accounts/account_benchmark_test.go index 69ead55c63c..aa90ba1d800 100644 --- a/core/types/accounts/account_benchmark_test.go +++ b/core/types/accounts/account_benchmark_test.go @@ -22,9 +22,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/crypto" ) func BenchmarkEncodingLengthForStorage(b *testing.B) { diff --git a/core/types/accounts/account_proof.go b/core/types/accounts/account_proof.go index 93fccfc3aea..5578f05f76b 100644 --- a/core/types/accounts/account_proof.go +++ b/core/types/accounts/account_proof.go @@ -17,9 +17,9 @@ package accounts import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" ) // Result structs for GetProof diff --git a/core/types/accounts/account_test.go b/core/types/accounts/account_test.go index b9738be3a66..23acce4bc69 100644 --- a/core/types/accounts/account_test.go +++ b/core/types/accounts/account_test.go @@ -20,9 +20,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/crypto" ) func TestEmptyAccount(t *testing.T) { diff --git a/core/types/authorization.go b/core/types/authorization.go index d1e30460bd4..3cd545e59a4 100644 --- a/core/types/authorization.go +++ b/core/types/authorization.go @@ -7,13 +7,14 @@ import ( "io" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) type Authorization struct { diff --git a/core/types/blacklist.go b/core/types/blacklist.go index 17f5b5fe2b8..f77e82a42d2 100644 --- a/core/types/blacklist.go +++ b/core/types/blacklist.go @@ -17,7 +17,7 @@ package types import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // This is introduced because of the Tendermint IAVL Merkle Proof verification exploitation. diff --git a/core/types/blob_tx.go b/core/types/blob_tx.go index a960295805f..fad937dc37b 100644 --- a/core/types/blob_tx.go +++ b/core/types/blob_tx.go @@ -24,13 +24,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + rlp2 "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) type BlobTx struct { diff --git a/core/types/blob_tx_wrapper.go b/core/types/blob_tx_wrapper.go index 2b5e72a0e89..f55a5064e3c 100644 --- a/core/types/blob_tx_wrapper.go +++ b/core/types/blob_tx_wrapper.go @@ -25,13 +25,13 @@ import ( gokzg4844 "github.com/crate-crypto/go-kzg-4844" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + libkzg "github.com/erigontech/erigon-lib/crypto/kzg" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) const ( diff --git a/core/types/block.go b/core/types/block.go index e32148d122b..d379550f274 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -32,12 +32,12 @@ import ( "github.com/gballet/go-verkle" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/core/types/block_test.go b/core/types/block_test.go index d5d4a47ec03..fd9b7c44888 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -31,17 +31,17 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/log/v3" - types2 "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/log/v3" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) // the following 2 functions are replica for the test diff --git a/core/types/bloom9.go b/core/types/bloom9.go index 0255eff1d2b..e8ca3008717 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -25,10 +25,10 @@ import ( "math/big" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/cryptopool" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index 3e225232b91..78656ab9689 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -25,9 +25,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/crypto" ) func TestBloom(t *testing.T) { diff --git a/core/types/consolidation_request.go b/core/types/consolidation_request.go index 04a5f20bac2..c2e73b9dd67 100644 --- a/core/types/consolidation_request.go +++ b/core/types/consolidation_request.go @@ -20,9 +20,9 @@ import ( "bytes" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon/rlp" ) // EIP-7251 Consolidation Request see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7251.md diff --git a/core/types/deposit_request.go b/core/types/deposit_request.go index af522fdffba..d8e3d339137 100644 --- a/core/types/deposit_request.go +++ b/core/types/deposit_request.go @@ -22,10 +22,10 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/rlp" ) const ( diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go index bafd1189935..7cd85881e08 100644 --- a/core/types/dynamic_fee_tx.go +++ b/core/types/dynamic_fee_tx.go @@ -27,13 +27,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/rlp" ) type DynamicFeeTransaction struct { diff --git a/core/types/encdec_test.go b/core/types/encdec_test.go index a764d85cbc1..8ce9fb84812 100644 --- a/core/types/encdec_test.go +++ b/core/types/encdec_test.go @@ -26,9 +26,10 @@ import ( "time" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/rlp" + + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/rlp" ) const RUNS = 100 // for local tests increase this number diff --git a/core/types/gen_erigon_log_json.go b/core/types/gen_erigon_log_json.go index 02e6505047c..37d2a1b6d00 100644 --- a/core/types/gen_erigon_log_json.go +++ b/core/types/gen_erigon_log_json.go @@ -5,10 +5,10 @@ package types import ( "encoding/json" "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_genesis.go b/core/types/gen_genesis.go index 75d8afa288d..53e7bc3c7fe 100644 --- a/core/types/gen_genesis.go +++ b/core/types/gen_genesis.go @@ -7,11 +7,11 @@ import ( "errors" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - common0 "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + common0 "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/types/gen_genesis_account.go b/core/types/gen_genesis_account.go index 858502cbdbb..a3e78cbb22c 100644 --- a/core/types/gen_genesis_account.go +++ b/core/types/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index 4b85e184c19..1f68a0821ea 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -8,9 +8,10 @@ import ( "math/big" "github.com/gballet/go-verkle" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index abd1dfd2ebe..53461e78534 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -5,10 +5,10 @@ package types import ( "encoding/json" "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 34b64b591b7..fee5af5ea9b 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -5,11 +5,11 @@ package types import ( "encoding/json" "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_withdrawal_json.go b/core/types/gen_withdrawal_json.go index 64d39fba79e..9f85a108467 100644 --- a/core/types/gen_withdrawal_json.go +++ b/core/types/gen_withdrawal_json.go @@ -5,8 +5,8 @@ package types import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" ) var _ = (*withdrawalMarshaling)(nil) diff --git a/core/types/genesis.go b/core/types/genesis.go index 0d8c509d27b..59895d2090e 100644 --- a/core/types/genesis.go +++ b/core/types/genesis.go @@ -27,13 +27,13 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - common2 "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/params" + common2 "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/params" ) //go:generate gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/types/hashing.go b/core/types/hashing.go index 8b345893270..bf5b9c336c7 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -24,14 +24,14 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/protolambda/ztyp/codec" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/cryptopool" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/rlphacks" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/rlphacks" + "github.com/erigontech/erigon/turbo/trie" ) type DerivableList interface { diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index da90a3b2368..9898267f02d 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -22,10 +22,11 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/trie" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/trie" ) func genTransactions(n uint64) Transactions { diff --git a/core/types/legacy_tx.go b/core/types/legacy_tx.go index f20700f648b..b44e9c2df8e 100644 --- a/core/types/legacy_tx.go +++ b/core/types/legacy_tx.go @@ -26,13 +26,14 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/rlp" ) type CommonTx struct { diff --git a/core/types/log.go b/core/types/log.go index df5073a4d5d..b137e1d79e6 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -22,12 +22,12 @@ package types import ( "io" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) // go:generate gencodec -type Log -field-override logMarshaling -out gen_log_json.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 2df0e6e9f4d..1ea5275c671 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -25,10 +25,10 @@ import ( "reflect" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index 1704f1bdc02..bfbfb0701a3 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -26,11 +26,11 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // go:generate gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go index 6ff2e2d9076..c9da6d1cb12 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -27,14 +27,15 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) func TestDecodeEmptyTypedReceipt(t *testing.T) { diff --git a/core/types/request.go b/core/types/request.go index f9e597ed083..c34aae02183 100644 --- a/core/types/request.go +++ b/core/types/request.go @@ -23,9 +23,9 @@ import ( "io" "math/bits" - "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon/rlp" ) const WithdrawalRequestType byte = 0x01 diff --git a/core/types/set_code_tx.go b/core/types/set_code_tx.go index 937e05a959d..aeb0f71d10a 100644 --- a/core/types/set_code_tx.go +++ b/core/types/set_code_tx.go @@ -7,12 +7,13 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/rlp" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/rlp" ) type SetCodeTransaction struct { diff --git a/core/types/state_data.go b/core/types/state_data.go index cf4af031799..dd3ab5bedf4 100644 --- a/core/types/state_data.go +++ b/core/types/state_data.go @@ -17,7 +17,7 @@ package types import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // StateSyncData represents state received from Ethereum Blockchain diff --git a/core/types/transaction.go b/core/types/transaction.go index 369276467e0..0b7a413d552 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -30,16 +30,16 @@ import ( "github.com/holiman/uint256" "github.com/protolambda/ztyp/codec" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index 8774552117e..ccd4263ef3c 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -25,14 +25,14 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" "github.com/valyala/fastjson" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - types2 "github.com/ledgerwatch/erigon-lib/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + types2 "github.com/erigontech/erigon-lib/types" ) // txJSON is the JSON representation of transactions. diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index b558904d6d6..737f2086816 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -29,11 +29,11 @@ import ( "github.com/erigontech/secp256k1" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/crypto" ) var ErrInvalidChainId = errors.New("invalid chain id for signer") diff --git a/core/types/transaction_signing_test.go b/core/types/transaction_signing_test.go index 63ab9cc86e3..f0c809c5fb9 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -24,9 +24,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/crypto" ) func TestEIP1559Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 8528b64aad8..60d4ecac042 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -36,17 +36,17 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/txpool" - libtypes "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/txpool" + libtypes "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/types/withdrawal.go b/core/types/withdrawal.go index 0600cc209c2..a38d9542db8 100644 --- a/core/types/withdrawal.go +++ b/core/types/withdrawal.go @@ -24,11 +24,11 @@ import ( "fmt" "io" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/types/clonable" + "github.com/erigontech/erigon/rlp" ) //go:generate gencodec -type Withdrawal -field-override withdrawalMarshaling -out gen_withdrawal_json.go diff --git a/core/types/withdrawal_request.go b/core/types/withdrawal_request.go index 28d180eea5b..e8e491811ea 100644 --- a/core/types/withdrawal_request.go +++ b/core/types/withdrawal_request.go @@ -21,9 +21,9 @@ import ( // "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon/rlp" ) // EIP-7002 Withdrawal Request see https://github.com/ethereum/EIPs/blob/master/EIPS/eip-7002.md diff --git a/core/types/withdrawal_test.go b/core/types/withdrawal_test.go index d488ded3a03..8eda45a1c3b 100644 --- a/core/types/withdrawal_test.go +++ b/core/types/withdrawal_test.go @@ -19,7 +19,7 @@ package types import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index 888d262d603..c9c6acd8f07 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -23,9 +23,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 5182ce8f7fa..214ed1c1eb0 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -22,8 +22,8 @@ package vm import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" ) // calcMemSize64 calculates the required memory size, and returns diff --git a/core/vm/contract.go b/core/vm/contract.go index 7c86c5b1c12..65a17f37861 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -21,9 +21,10 @@ package vm import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/tracing" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/tracing" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index b9c182f1e29..5fa22b34c76 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -31,17 +31,17 @@ import ( "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/crypto/blake2b" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/bn256" - "github.com/ledgerwatch/erigon/crypto/secp256r1" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/crypto/blake2b" + libkzg "github.com/erigontech/erigon-lib/crypto/kzg" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/bn256" + "github.com/erigontech/erigon/crypto/secp256r1" + "github.com/erigontech/erigon/params" //lint:ignore SA1019 Needed for precompile "golang.org/x/crypto/ripemd160" diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 09cc20bccfb..a7c466677d8 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -27,9 +27,9 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/eips.go b/core/vm/eips.go index 064b5048b1e..4ed10b4cf0d 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -25,9 +25,9 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) var activators = map[int]func(*JumpTable){ diff --git a/core/vm/evm.go b/core/vm/evm.go index 5f57e0547cf..7a368e2c374 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -24,14 +24,14 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) // emptyCodeHash is used by create to ensure deployment is disallowed to already diff --git a/core/vm/evm_test.go b/core/vm/evm_test.go index 42524dfa780..bfa90e372b8 100644 --- a/core/vm/evm_test.go +++ b/core/vm/evm_test.go @@ -20,9 +20,9 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/params" "github.com/holiman/uint256" "pgregory.net/rapid" diff --git a/core/vm/evmtypes/evmtypes.go b/core/vm/evmtypes/evmtypes.go index dedb299bae6..15e8e049ea5 100644 --- a/core/vm/evmtypes/evmtypes.go +++ b/core/vm/evmtypes/evmtypes.go @@ -21,12 +21,12 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" ) // BlockContext provides the EVM with auxiliary information. Once provided diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 189d6ecc370..c8e4d2d0cfe 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -24,11 +24,11 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/math" - "github.com/ledgerwatch/erigon/core/vm/stack" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/vm/stack" + "github.com/erigontech/erigon/params" ) // memoryGasCost calculates the quadratic gas for memory expansion. It does so diff --git a/core/vm/gas_table_test.go b/core/vm/gas_table_test.go index e7e19c1c686..c067d6df5b0 100644 --- a/core/vm/gas_table_test.go +++ b/core/vm/gas_table_test.go @@ -29,22 +29,22 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" - state3 "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/core/rawdb" - - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" + state3 "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/core/rawdb" + + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/rpchelper" ) func TestMemoryGasCost(t *testing.T) { diff --git a/core/vm/instructions.go b/core/vm/instructions.go index ebac3c6d212..4ccdd164aaf 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -26,14 +26,14 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func opAdd(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 18c63c8e4c6..526dbddd1b9 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -30,16 +30,16 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/core/vm/stack" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/math" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/core/vm/stack" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) const opTestArg = "ABCDEF090807060504030201ffffffffffffffffffffffffffffffffffffffff" diff --git a/core/vm/interface.go b/core/vm/interface.go index 2a8934b3712..16233ab5b2f 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -23,10 +23,11 @@ import ( "math/big" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/vm/evmtypes" ) // CallContext provides a basic interface for the EVM calling conventions. The EVM diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index ad5ab585bf3..4f5ec0c706e 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -23,14 +23,14 @@ import ( "hash" "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/math" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/vm/stack" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/vm/stack" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 15c4fbe43fd..f04fab13c03 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -22,8 +22,8 @@ package vm import ( "fmt" - "github.com/ledgerwatch/erigon/core/vm/stack" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/vm/stack" + "github.com/erigontech/erigon/params" ) type ( diff --git a/core/vm/logger.go b/core/vm/logger.go index 28778787950..9c2579c83eb 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -21,9 +21,10 @@ package vm import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/types" ) // EVMLogger is used to collect execution traces from an EVM transaction diff --git a/core/vm/memory_table.go b/core/vm/memory_table.go index e3cb1355632..3cf5cc10f85 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -19,7 +19,7 @@ package vm -import "github.com/ledgerwatch/erigon/core/vm/stack" +import "github.com/erigontech/erigon/core/vm/stack" func memoryKeccak256(stack *stack.Stack) (uint64, bool) { return calcMemSize64(stack.Back(0), stack.Back(1)) diff --git a/core/vm/memory_test.go b/core/vm/memory_test.go index 498790d17de..b87f1089705 100644 --- a/core/vm/memory_test.go +++ b/core/vm/memory_test.go @@ -21,7 +21,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) func TestMemoryCopy(t *testing.T) { diff --git a/core/vm/mock_vm.go b/core/vm/mock_vm.go index c7042552816..2888a738edc 100644 --- a/core/vm/mock_vm.go +++ b/core/vm/mock_vm.go @@ -21,9 +21,10 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/state" ) type readonlyGetSetter interface { diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index 98f2c2d23d3..1b313c7cac9 100644 --- a/core/vm/operations_acl.go +++ b/core/vm/operations_acl.go @@ -23,12 +23,13 @@ import ( "errors" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/vm/stack" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/math" + + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/vm/stack" + "github.com/erigontech/erigon/params" ) func makeGasSStoreFunc(clearingRefund uint64) gasFunc { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index afead15ddd0..ccea1b576ec 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -20,10 +20,10 @@ package runtime import ( - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 7d58a476ef0..6bcc709fee0 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -27,22 +27,22 @@ import ( "path/filepath" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - state3 "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/temporal" + state3 "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" ) // Config is a basic type specifying certain configuration flags for running diff --git a/core/vm/runtime/runtime_example_test.go b/core/vm/runtime/runtime_example_test.go index bb029e24a79..d9442fb0030 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -22,9 +22,9 @@ package runtime_test import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm/runtime" + "github.com/erigontech/erigon/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index a91e59cc314..0f43d94d9d3 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -30,27 +30,27 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - stateLib "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/asm" - "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/eth/tracers/logger" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + stateLib "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/asm" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/rlp" ) func NewTestTemporalDb(tb testing.TB) (kv.RwDB, kv.RwTx, *stateLib.Aggregator) { diff --git a/core/vm/stack/stack.go b/core/vm/stack/stack.go index 23b039afab0..368f4e522e4 100644 --- a/core/vm/stack/stack.go +++ b/core/vm/stack/stack.go @@ -25,7 +25,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var stackPool = sync.Pool{ diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index beec375aa14..f34347f935d 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -20,7 +20,7 @@ package vm import ( - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) func maxStack(pop, push int) int { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index 6d27fffd8d3..042cb29987e 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -8,7 +8,7 @@ package bn256 import ( - bn256cf "github.com/ledgerwatch/erigon/crypto/bn256/cloudflare" + bn256cf "github.com/erigontech/erigon/crypto/bn256/cloudflare" ) // G1 is an abstract cyclic group. The zero value is suitable for use as the diff --git a/crypto/bn256/bn256_slow.go b/crypto/bn256/bn256_slow.go index e8ed4971aff..0aac9d91684 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -7,7 +7,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import bn256 "github.com/ledgerwatch/erigon/crypto/bn256/google" +import bn256 "github.com/erigontech/erigon/crypto/bn256/google" // G1 is an abstract cyclic group. The zero value is suitable for use as the // output of an operation, but cannot be used as an input. diff --git a/crypto/crypto.go b/crypto/crypto.go index c8948fa0008..a0e8ebc4e0e 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -35,13 +35,13 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/crypto/cryptopool" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/rlp" ) // SignatureLength indicates the byte length required to carry a signature with recovery id. diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index 649000b031e..0c5dd29aaa6 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -27,14 +27,14 @@ import ( "reflect" "testing" + "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/u256" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/u256" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies.go b/crypto/ecies/ecies.go index c5050095315..abb1c7ffa0e 100644 --- a/crypto/ecies/ecies.go +++ b/crypto/ecies/ecies.go @@ -41,7 +41,7 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index bd4ecfb087d..a0780f2a637 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -41,7 +41,7 @@ import ( "os" "testing" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) var dumpEnc bool diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index 0c63c138196..756f5343be4 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -42,7 +42,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ledgerwatch/erigon/crypto" + ethcrypto "github.com/erigontech/erigon/crypto" ) var ( diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 18bb7f9c4df..f45d44d2e06 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -28,7 +28,7 @@ import ( "github.com/erigontech/secp256k1" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common/math" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index 98f63301821..0e63b1b9623 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -25,10 +25,10 @@ import ( "reflect" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common/math" ) var ( diff --git a/debug.Dockerfile b/debug.Dockerfile index e5c7b08ff5f..0a76f6cd8d5 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -87,7 +87,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 diff --git a/diagnostics/block_body_download_stats.go b/diagnostics/block_body_download_stats.go index ba72e90490b..719d4019313 100644 --- a/diagnostics/block_body_download_stats.go +++ b/diagnostics/block_body_download_stats.go @@ -22,7 +22,7 @@ import ( "net/http" "strconv" - "github.com/ledgerwatch/erigon/dataflow" + "github.com/erigontech/erigon/dataflow" ) func SetupBlockBodyDownload(metricsMux *http.ServeMux) { diff --git a/diagnostics/bodies_info.go b/diagnostics/bodies_info.go index 6a656a0c339..a919a1f279a 100644 --- a/diagnostics/bodies_info.go +++ b/diagnostics/bodies_info.go @@ -19,7 +19,7 @@ package diagnostics import ( "net/http" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" + diaglib "github.com/erigontech/erigon-lib/diagnostics" ) func SetupBodiesAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient) { diff --git a/diagnostics/bootnodes.go b/diagnostics/bootnodes.go index 06e9a766cce..7a9d5a83862 100644 --- a/diagnostics/bootnodes.go +++ b/diagnostics/bootnodes.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon/turbo/node" ) func SetupBootnodesAccess(metricsMux *http.ServeMux, node *node.ErigonNode) { diff --git a/diagnostics/db.go b/diagnostics/db.go index 80d1eb53275..223454f6bad 100644 --- a/diagnostics/db.go +++ b/diagnostics/db.go @@ -25,9 +25,9 @@ import ( "path/filepath" "strings" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/common/paths" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon/common/paths" "github.com/urfave/cli/v2" ) diff --git a/diagnostics/header_downloader_stats.go b/diagnostics/header_downloader_stats.go index 74c84b114e2..d53bfafd0fe 100644 --- a/diagnostics/header_downloader_stats.go +++ b/diagnostics/header_downloader_stats.go @@ -22,7 +22,7 @@ import ( "net/http" "strconv" - "github.com/ledgerwatch/erigon/dataflow" + "github.com/erigontech/erigon/dataflow" ) func SetupHeaderDownloadStats(metricsMux *http.ServeMux) { diff --git a/diagnostics/headers.go b/diagnostics/headers.go index da861ed9902..683352f630c 100644 --- a/diagnostics/headers.go +++ b/diagnostics/headers.go @@ -19,7 +19,7 @@ package diagnostics import ( "net/http" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" + diaglib "github.com/erigontech/erigon-lib/diagnostics" ) func SetupHeadersAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient) { diff --git a/diagnostics/logs.go b/diagnostics/logs.go index 23933adaf7b..8cb090020e5 100644 --- a/diagnostics/logs.go +++ b/diagnostics/logs.go @@ -31,8 +31,8 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon/turbo/logging" ) func SetupLogsAccess(ctx *cli.Context, metricsMux *http.ServeMux) { diff --git a/diagnostics/mem.go b/diagnostics/mem.go index 32e2c8639ae..a4364338eec 100644 --- a/diagnostics/mem.go +++ b/diagnostics/mem.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - "github.com/ledgerwatch/erigon-lib/common/mem" + "github.com/erigontech/erigon-lib/common/mem" ) func SetupMemAccess(metricsMux *http.ServeMux) { diff --git a/diagnostics/nodeinfo.go b/diagnostics/nodeinfo.go index 9fd2bb49d8a..474bbb9d593 100644 --- a/diagnostics/nodeinfo.go +++ b/diagnostics/nodeinfo.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon/turbo/node" ) func SetupNodeInfoAccess(metricsMux *http.ServeMux, node *node.ErigonNode) { diff --git a/diagnostics/peers.go b/diagnostics/peers.go index 2a5122a95c0..aa84fcb6cfc 100644 --- a/diagnostics/peers.go +++ b/diagnostics/peers.go @@ -20,8 +20,8 @@ import ( "encoding/json" "net/http" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon/turbo/node" + diaglib "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon/turbo/node" "github.com/urfave/cli/v2" ) diff --git a/diagnostics/setup.go b/diagnostics/setup.go index de5c21c215d..5958f81f009 100644 --- a/diagnostics/setup.go +++ b/diagnostics/setup.go @@ -23,11 +23,11 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - libcommon "github.com/ledgerwatch/erigon-lib/common" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon-lib/chain/snapcfg" + libcommon "github.com/erigontech/erigon-lib/common" + diaglib "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/node" ) var ( diff --git a/diagnostics/snapshot_sync.go b/diagnostics/snapshot_sync.go index a65ca373085..a85b24eeaf6 100644 --- a/diagnostics/snapshot_sync.go +++ b/diagnostics/snapshot_sync.go @@ -19,7 +19,7 @@ package diagnostics import ( "net/http" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" + diaglib "github.com/erigontech/erigon-lib/diagnostics" ) func SetupStagesAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient) { diff --git a/diagnostics/version.go b/diagnostics/version.go index 742056b9430..cc94b930a31 100644 --- a/diagnostics/version.go +++ b/diagnostics/version.go @@ -20,7 +20,7 @@ import ( "encoding/json" "net/http" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) const Version = 3 diff --git a/docs/programmers_guide/dupsort.md b/docs/programmers_guide/dupsort.md index d652d6f82c4..aa6086e96bd 100644 --- a/docs/programmers_guide/dupsort.md +++ b/docs/programmers_guide/dupsort.md @@ -154,7 +154,7 @@ This article target is to show tricky concepts on examples. Future reading [here](./db_walkthrough.MD#table-history-of-accounts) Erigon supports multiple typed cursors, see the [KV -Readme.md](https://github.com/ledgerwatch/erigon-lib/tree/main/kv) +Readme.md](https://github.com/erigontech/erigon-lib/tree/main/kv) diff --git a/docs/readthedocs/source/etl.rst b/docs/readthedocs/source/etl.rst index e72fce050d4..9169353b58a 100644 --- a/docs/readthedocs/source/etl.rst +++ b/docs/readthedocs/source/etl.rst @@ -125,7 +125,7 @@ function. ====================== If you want a more modular behaviour instead of just reading from the DB (like -generating intermediate hashes in https://github.com/ledgerwatch/erigon/blob/master/core/chain_makers.go, you can use +generating intermediate hashes in https://github.com/erigontech/erigon/blob/master/core/chain_makers.go, you can use `etl.Collector` struct directly. It has a `.Collect()` method that you can provide your data to. diff --git a/docs/readthedocs/source/installation.rst b/docs/readthedocs/source/installation.rst index d7df96d787f..932b5310dad 100644 --- a/docs/readthedocs/source/installation.rst +++ b/docs/readthedocs/source/installation.rst @@ -16,7 +16,7 @@ In order to download the code and compile you need the following commands: .. code-block:: sh - $ git clone https://github.com/ledgerwatch/erigon + $ git clone https://github.com/erigontech/erigon $ cd erigon diff --git a/docs/readthedocs/source/rpc/tutorial.rst b/docs/readthedocs/source/rpc/tutorial.rst index 45bc9d4eee3..2c667e88db0 100644 --- a/docs/readthedocs/source/rpc/tutorial.rst +++ b/docs/readthedocs/source/rpc/tutorial.rst @@ -14,9 +14,9 @@ our daemon will only contain one method: `myNamespace_getBlockNumberByHash` whic import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/rawdb" ) type API struct { @@ -58,11 +58,11 @@ Now we are going to make our `main.go` where we are going to serve the api we ma import ( "os" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" ) diff --git a/docs/readthedocs/source/stagedsync.rst b/docs/readthedocs/source/stagedsync.rst index 453040ca15a..6484d3986f1 100644 --- a/docs/readthedocs/source/stagedsync.rst +++ b/docs/readthedocs/source/stagedsync.rst @@ -3,7 +3,7 @@ StagedSync ========== We tried to maximally decompose the sync process into stages, and perform them sequentially. From the first sight, it might sound like a bad idea - why not use concurrency? However, we noticed that running many things concurrently obscured our ability to profile and optimise code - there is simply too much going on. Decomposition allowed us to optimise each stage in separation, which is much more tractable. We also noticed the benefit of improved code structure. -All of the stages are declared in https://github.com/ledgerwatch/erigon/blob/master/eth/stagedsync/stagebuilder.go +All of the stages are declared in https://github.com/erigontech/erigon/blob/master/eth/stagedsync/stagebuilder.go Stage 1 : Download Block Headers ================================ diff --git a/docs/readthedocs/source/types.rst b/docs/readthedocs/source/types.rst index 2a0811380cf..a947eebb768 100644 --- a/docs/readthedocs/source/types.rst +++ b/docs/readthedocs/source/types.rst @@ -3,12 +3,12 @@ Erigon Types ================ This document will list each major types defined and used by Erigon. -They are found in `github.com/ledgerwatch/erigon/core/types` and `github.com/ledgerwatch/erigon/common` +They are found in `github.com/erigontech/erigon/core/types` and `github.com/erigontech/erigon/common` Address and Hash ================ -package: `github.com/ledgerwatch/erigon/common` +package: `github.com/erigontech/erigon/common` .. code-block:: go @@ -130,7 +130,7 @@ represent an Ethereum Transaction. Block Header ============ -package: `github.com/ledgerwatch/erigon/core/types` +package: `github.com/erigontech/erigon/core/types` .. code-block:: go @@ -239,7 +239,7 @@ total difficulty accumulated up to the block. sum of all prev blocks difficultie Account ======= -package: `github.com/ledgerwatch/erigon/core/types/accounts` +package: `github.com/erigontech/erigon/core/types/accounts` .. code-block:: go diff --git a/erigon-lib/Makefile b/erigon-lib/Makefile index a73cab47c4e..abff3d7e00d 100644 --- a/erigon-lib/Makefile +++ b/erigon-lib/Makefile @@ -66,8 +66,8 @@ grpc: protoc-all --go_opt=Mtypes/types.proto=./typesproto \ types/types.proto PATH="$(GOBIN):$(PATH)" protoc --proto_path=$(PROTO_PATH) --go_out=gointerfaces --go-grpc_out=gointerfaces -I=$(PROTOC_INCLUDE) \ - --go_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto \ - --go-grpc_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto \ + --go_opt=Mtypes/types.proto=github.com/erigontech/erigon-lib/gointerfaces/typesproto \ + --go-grpc_opt=Mtypes/types.proto=github.com/erigontech/erigon-lib/gointerfaces/typesproto \ --go_opt=Mp2psentry/sentry.proto=./sentryproto \ --go-grpc_opt=Mp2psentry/sentry.proto=./sentryproto \ --go_opt=Mp2psentinel/sentinel.proto=./sentinelproto \ diff --git a/erigon-lib/chain/aura_config.go b/erigon-lib/chain/aura_config.go index c2460a9276d..4cab5534989 100644 --- a/erigon-lib/chain/aura_config.go +++ b/erigon-lib/chain/aura_config.go @@ -17,8 +17,8 @@ package chain import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) // Different ways of specifying validators. diff --git a/erigon-lib/chain/chain_config.go b/erigon-lib/chain/chain_config.go index 87017452f8a..8b2479945d2 100644 --- a/erigon-lib/chain/chain_config.go +++ b/erigon-lib/chain/chain_config.go @@ -22,8 +22,8 @@ import ( "math/big" "strconv" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" ) // Config is the core config which determines the blockchain settings. diff --git a/erigon-lib/chain/chain_config_test.go b/erigon-lib/chain/chain_config_test.go index 2bf384a6a84..3896fc2fef9 100644 --- a/erigon-lib/chain/chain_config_test.go +++ b/erigon-lib/chain/chain_config_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) func TestBorKeyValueConfigHelper(t *testing.T) { diff --git a/erigon-lib/chain/chain_db.go b/erigon-lib/chain/chain_db.go index be332d90fe5..7f09b9c6cd2 100644 --- a/erigon-lib/chain/chain_db.go +++ b/erigon-lib/chain/chain_db.go @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) // GetConfig retrieves the consensus settings based on the given genesis hash. diff --git a/erigon-lib/chain/snapcfg/util.go b/erigon-lib/chain/snapcfg/util.go index 9a22f34dbb8..d288caca378 100644 --- a/erigon-lib/chain/snapcfg/util.go +++ b/erigon-lib/chain/snapcfg/util.go @@ -31,8 +31,8 @@ import ( snapshothashes "github.com/erigontech/erigon-snapshot" "github.com/erigontech/erigon-snapshot/webseed" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/downloader/snaptype" ) var ( diff --git a/erigon-lib/commitment/bin_patricia_hashed.go b/erigon-lib/commitment/bin_patricia_hashed.go index 33111ce6df2..e82d78a929e 100644 --- a/erigon-lib/commitment/bin_patricia_hashed.go +++ b/erigon-lib/commitment/bin_patricia_hashed.go @@ -30,11 +30,11 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/rlp" ) const ( diff --git a/erigon-lib/commitment/bin_patricia_hashed_test.go b/erigon-lib/commitment/bin_patricia_hashed_test.go index 23ffd00012a..5c7eac2715d 100644 --- a/erigon-lib/commitment/bin_patricia_hashed_test.go +++ b/erigon-lib/commitment/bin_patricia_hashed_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) func Test_BinPatriciaTrie_UniqueRepresentation(t *testing.T) { diff --git a/erigon-lib/commitment/commitment.go b/erigon-lib/commitment/commitment.go index 389c3c5aa5b..10766380b15 100644 --- a/erigon-lib/commitment/commitment.go +++ b/erigon-lib/commitment/commitment.go @@ -27,14 +27,14 @@ import ( "github.com/google/btree" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cryptozerocopy" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cryptozerocopy" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" ) var ( diff --git a/erigon-lib/commitment/commitment_bench_test.go b/erigon-lib/commitment/commitment_bench_test.go index 732ea206273..b87f5753c32 100644 --- a/erigon-lib/commitment/commitment_bench_test.go +++ b/erigon-lib/commitment/commitment_bench_test.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/commitment/commitment_test.go b/erigon-lib/commitment/commitment_test.go index 6a6c3cd629f..14af4dbb024 100644 --- a/erigon-lib/commitment/commitment_test.go +++ b/erigon-lib/commitment/commitment_test.go @@ -25,7 +25,7 @@ import ( "sort" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/commitment/hex_patricia_hashed.go b/erigon-lib/commitment/hex_patricia_hashed.go index 4b5cab10126..ea61253caca 100644 --- a/erigon-lib/commitment/hex_patricia_hashed.go +++ b/erigon-lib/commitment/hex_patricia_hashed.go @@ -31,19 +31,19 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dbg" "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/rlp" ) // keccakState wraps sha3.state. In addition to the usual hash methods, it also supports diff --git a/erigon-lib/commitment/hex_patricia_hashed_bench_test.go b/erigon-lib/commitment/hex_patricia_hashed_bench_test.go index 1af1a4358e9..b639ce96a32 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_bench_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_bench_test.go @@ -22,7 +22,7 @@ import ( "math/rand" "testing" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) func Benchmark_HexPatriciaHashed_ReviewKeys(b *testing.B) { diff --git a/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go b/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go index 944911cdf96..6657b13db7d 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go @@ -29,7 +29,7 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) // go test -trimpath -v -fuzz=Fuzz_ProcessUpdate$ -fuzztime=300s ./commitment diff --git a/erigon-lib/commitment/hex_patricia_hashed_test.go b/erigon-lib/commitment/hex_patricia_hashed_test.go index 48ac903e065..4d24b7dff2f 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_test.go @@ -29,8 +29,8 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" ) func Test_HexPatriciaHashed_ResetThenSingularUpdates(t *testing.T) { diff --git a/erigon-lib/commitment/patricia_state_mock_test.go b/erigon-lib/commitment/patricia_state_mock_test.go index efbc78783fe..7004a6ffcb4 100644 --- a/erigon-lib/commitment/patricia_state_mock_test.go +++ b/erigon-lib/commitment/patricia_state_mock_test.go @@ -26,8 +26,8 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" ) // In memory commitment and state to use with the tests diff --git a/erigon-lib/common/address.go b/erigon-lib/common/address.go index 6afa16f39c1..11eacf3b767 100644 --- a/erigon-lib/common/address.go +++ b/erigon-lib/common/address.go @@ -24,9 +24,9 @@ import ( "math/big" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/crypto/cryptopool" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/crypto/cryptopool" ) var ( diff --git a/erigon-lib/common/bytes4.go b/erigon-lib/common/bytes4.go index efff89b8f14..eebafeed9aa 100644 --- a/erigon-lib/common/bytes4.go +++ b/erigon-lib/common/bytes4.go @@ -24,8 +24,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/bytes48.go b/erigon-lib/common/bytes48.go index c5d85cb3832..bfd66cff056 100644 --- a/erigon-lib/common/bytes48.go +++ b/erigon-lib/common/bytes48.go @@ -24,8 +24,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/bytes64.go b/erigon-lib/common/bytes64.go index df305a6b400..300a9ea3c87 100644 --- a/erigon-lib/common/bytes64.go +++ b/erigon-lib/common/bytes64.go @@ -23,8 +23,8 @@ import ( "fmt" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/bytes96.go b/erigon-lib/common/bytes96.go index 88b17e67797..f23aa1fe523 100644 --- a/erigon-lib/common/bytes96.go +++ b/erigon-lib/common/bytes96.go @@ -24,8 +24,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/cli.go b/erigon-lib/common/cli.go index 40c6bdf6bd3..21411d53b77 100644 --- a/erigon-lib/common/cli.go +++ b/erigon-lib/common/cli.go @@ -23,7 +23,7 @@ import ( "strings" "syscall" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func RootContext() (context.Context, context.CancelFunc) { diff --git a/erigon-lib/common/datadir/dirs.go b/erigon-lib/common/datadir/dirs.go index eb4ac7fb391..037d8041100 100644 --- a/erigon-lib/common/datadir/dirs.go +++ b/erigon-lib/common/datadir/dirs.go @@ -24,7 +24,8 @@ import ( "syscall" "github.com/gofrs/flock" - "github.com/ledgerwatch/erigon-lib/common/dir" + + "github.com/erigontech/erigon-lib/common/dir" ) // Dirs is the file system folder the node should use for any data storage diff --git a/erigon-lib/common/dbg/dbg_env.go b/erigon-lib/common/dbg/dbg_env.go index c5644a5b932..7f1052b89a1 100644 --- a/erigon-lib/common/dbg/dbg_env.go +++ b/erigon-lib/common/dbg/dbg_env.go @@ -23,7 +23,7 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func EnvString(envVarName string, defaultVal string) string { diff --git a/erigon-lib/common/dbg/experiments.go b/erigon-lib/common/dbg/experiments.go index 3345d7fd84c..e2a16809376 100644 --- a/erigon-lib/common/dbg/experiments.go +++ b/erigon-lib/common/dbg/experiments.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/erigon-lib/common/dbg/leak_detector.go b/erigon-lib/common/dbg/leak_detector.go index 2a4fe303268..575fb7f9b99 100644 --- a/erigon-lib/common/dbg/leak_detector.go +++ b/erigon-lib/common/dbg/leak_detector.go @@ -23,7 +23,7 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) const FileCloseLogLevel = log.LvlTrace diff --git a/erigon-lib/common/disk/common.go b/erigon-lib/common/disk/common.go index d60da5b9fd1..5effdcf98bb 100644 --- a/erigon-lib/common/disk/common.go +++ b/erigon-lib/common/disk/common.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func UpdateDiskStats(ctx context.Context, logger log.Logger) { diff --git a/erigon-lib/common/disk/disk.go b/erigon-lib/common/disk/disk.go index 5227927543d..a4ef5cce115 100644 --- a/erigon-lib/common/disk/disk.go +++ b/erigon-lib/common/disk/disk.go @@ -24,7 +24,7 @@ import ( "github.com/shirou/gopsutil/v3/process" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) var ( diff --git a/erigon-lib/common/disk/disk_darwin.go b/erigon-lib/common/disk/disk_darwin.go index d392daf9c45..25040afcf68 100644 --- a/erigon-lib/common/disk/disk_darwin.go +++ b/erigon-lib/common/disk/disk_darwin.go @@ -21,7 +21,7 @@ package disk import ( "runtime" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) var cgoCount = metrics.NewGauge(`go_cgo_calls_count`) diff --git a/erigon-lib/common/disk/disk_linux.go b/erigon-lib/common/disk/disk_linux.go index ceae52a642c..a622a41d1f3 100644 --- a/erigon-lib/common/disk/disk_linux.go +++ b/erigon-lib/common/disk/disk_linux.go @@ -24,7 +24,7 @@ import ( "github.com/shirou/gopsutil/v3/process" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) var ( diff --git a/erigon-lib/common/eth2shuffle/shuffle_bench_test.go b/erigon-lib/common/eth2shuffle/shuffle_bench_test.go index 9b7db41d707..3bb6a12376e 100644 --- a/erigon-lib/common/eth2shuffle/shuffle_bench_test.go +++ b/erigon-lib/common/eth2shuffle/shuffle_bench_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/common/eth2shuffle" + "github.com/erigontech/erigon-lib/common/eth2shuffle" ) func BenchmarkPermuteIndex(b *testing.B) { diff --git a/erigon-lib/common/eth2shuffle/shuffle_test.go b/erigon-lib/common/eth2shuffle/shuffle_test.go index b35c5f0719b..d56f304a39c 100644 --- a/erigon-lib/common/eth2shuffle/shuffle_test.go +++ b/erigon-lib/common/eth2shuffle/shuffle_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/eth2shuffle" + "github.com/erigontech/erigon-lib/common/eth2shuffle" "github.com/stretchr/testify/assert" ) diff --git a/erigon-lib/common/hash.go b/erigon-lib/common/hash.go index 842a681d104..a098eaaea06 100644 --- a/erigon-lib/common/hash.go +++ b/erigon-lib/common/hash.go @@ -25,8 +25,8 @@ import ( "math/rand" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" ) var ( diff --git a/erigon-lib/common/mem/common.go b/erigon-lib/common/mem/common.go index 546443a0ff7..ca5252c62c1 100644 --- a/erigon-lib/common/mem/common.go +++ b/erigon-lib/common/mem/common.go @@ -25,10 +25,10 @@ import ( "github.com/shirou/gopsutil/v3/process" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/log/v3" ) var ErrorUnsupportedPlatform = errors.New("unsupported platform") diff --git a/erigon-lib/common/mem/mem_linux.go b/erigon-lib/common/mem/mem_linux.go index cf0d9d968f4..09b75a559df 100644 --- a/erigon-lib/common/mem/mem_linux.go +++ b/erigon-lib/common/mem/mem_linux.go @@ -24,7 +24,7 @@ import ( "github.com/shirou/gopsutil/v3/process" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) var ( diff --git a/erigon-lib/common/metrics/block_metrics.go b/erigon-lib/common/metrics/block_metrics.go index 496cdbcc37e..ebabec172bc 100644 --- a/erigon-lib/common/metrics/block_metrics.go +++ b/erigon-lib/common/metrics/block_metrics.go @@ -19,8 +19,8 @@ package metrics import ( "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/metrics" ) var ( diff --git a/erigon-lib/crypto/blake2b/blake2b_test.go b/erigon-lib/crypto/blake2b/blake2b_test.go index a9070cea796..7ef3ad8fb39 100644 --- a/erigon-lib/crypto/blake2b/blake2b_test.go +++ b/erigon-lib/crypto/blake2b/blake2b_test.go @@ -14,7 +14,7 @@ import ( "io" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestHashes(t *testing.T) { diff --git a/erigon-lib/crypto/secp256k1.go b/erigon-lib/crypto/secp256k1.go index 6710463671d..c80953b004c 100644 --- a/erigon-lib/crypto/secp256k1.go +++ b/erigon-lib/crypto/secp256k1.go @@ -19,7 +19,7 @@ package crypto import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" ) var ( diff --git a/erigon-lib/diagnostics/block_execution.go b/erigon-lib/diagnostics/block_execution.go index 54cf9de70d8..02afed85cc9 100644 --- a/erigon-lib/diagnostics/block_execution.go +++ b/erigon-lib/diagnostics/block_execution.go @@ -22,7 +22,7 @@ import ( "io" "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type BlockEexcStatsData struct { diff --git a/erigon-lib/diagnostics/bodies.go b/erigon-lib/diagnostics/bodies.go index d52ebcac4d7..3565bdde094 100644 --- a/erigon-lib/diagnostics/bodies.go +++ b/erigon-lib/diagnostics/bodies.go @@ -21,7 +21,7 @@ import ( "encoding/json" "io" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func (d *DiagnosticClient) setupBodiesDiagnostics(rootCtx context.Context) { diff --git a/erigon-lib/diagnostics/client.go b/erigon-lib/diagnostics/client.go index 00bcab8204c..eac8cf3d907 100644 --- a/erigon-lib/diagnostics/client.go +++ b/erigon-lib/diagnostics/client.go @@ -26,10 +26,10 @@ import ( "github.com/c2h5oh/datasize" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" ) type DiagnosticClient struct { diff --git a/erigon-lib/diagnostics/headers.go b/erigon-lib/diagnostics/headers.go index c03b3bee735..9a7f5c486bb 100644 --- a/erigon-lib/diagnostics/headers.go +++ b/erigon-lib/diagnostics/headers.go @@ -21,7 +21,7 @@ import ( "encoding/json" "io" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func (d *DiagnosticClient) setupHeadersDiagnostics(rootCtx context.Context) { diff --git a/erigon-lib/diagnostics/network.go b/erigon-lib/diagnostics/network.go index be998de435f..004d2025de7 100644 --- a/erigon-lib/diagnostics/network.go +++ b/erigon-lib/diagnostics/network.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type PeerStats struct { diff --git a/erigon-lib/diagnostics/network_test.go b/erigon-lib/diagnostics/network_test.go index a2c121e339c..3ea6f916391 100644 --- a/erigon-lib/diagnostics/network_test.go +++ b/erigon-lib/diagnostics/network_test.go @@ -20,7 +20,7 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/diagnostics" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/diagnostics/provider.go b/erigon-lib/diagnostics/provider.go index 69653c6fb55..ed358956156 100644 --- a/erigon-lib/diagnostics/provider.go +++ b/erigon-lib/diagnostics/provider.go @@ -24,8 +24,8 @@ import ( "sync" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" ) type ctxKey int diff --git a/erigon-lib/diagnostics/provider_test.go b/erigon-lib/diagnostics/provider_test.go index 3167458c99f..807e2b761b0 100644 --- a/erigon-lib/diagnostics/provider_test.go +++ b/erigon-lib/diagnostics/provider_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/log/v3" ) type testInfo struct { diff --git a/erigon-lib/diagnostics/resources_usage.go b/erigon-lib/diagnostics/resources_usage.go index 6f02d102aa6..e553a9b83a5 100644 --- a/erigon-lib/diagnostics/resources_usage.go +++ b/erigon-lib/diagnostics/resources_usage.go @@ -21,7 +21,7 @@ import ( "encoding/json" "io" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func (d *DiagnosticClient) setupResourcesUsageDiagnostics(rootCtx context.Context) { diff --git a/erigon-lib/diagnostics/snapshots.go b/erigon-lib/diagnostics/snapshots.go index 0f1d56b97f0..66a9d48502f 100644 --- a/erigon-lib/diagnostics/snapshots.go +++ b/erigon-lib/diagnostics/snapshots.go @@ -23,9 +23,9 @@ import ( "io" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/erigon-lib/diagnostics/snapshots_test.go b/erigon-lib/diagnostics/snapshots_test.go index e82cb2b4474..c92126966ea 100644 --- a/erigon-lib/diagnostics/snapshots_test.go +++ b/erigon-lib/diagnostics/snapshots_test.go @@ -19,7 +19,7 @@ package diagnostics_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/diagnostics" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/diagnostics/speedtest.go b/erigon-lib/diagnostics/speedtest.go index f8fb9f81266..58368259ddb 100644 --- a/erigon-lib/diagnostics/speedtest.go +++ b/erigon-lib/diagnostics/speedtest.go @@ -23,8 +23,8 @@ import ( "net/http" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/speedtest/speedtest" - "github.com/ledgerwatch/erigon-lib/log/v3" ) var cloudflareHeaders = http.Header{ diff --git a/erigon-lib/diagnostics/stages.go b/erigon-lib/diagnostics/stages.go index 9d80f18e283..b8bb3a1c55a 100644 --- a/erigon-lib/diagnostics/stages.go +++ b/erigon-lib/diagnostics/stages.go @@ -22,9 +22,9 @@ import ( "fmt" "io" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/erigon-lib/diagnostics/stages_test.go b/erigon-lib/diagnostics/stages_test.go index 9be4be75c17..8d85a923d67 100644 --- a/erigon-lib/diagnostics/stages_test.go +++ b/erigon-lib/diagnostics/stages_test.go @@ -19,7 +19,7 @@ package diagnostics_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/diagnostics" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/diagnostics/sys_info.go b/erigon-lib/diagnostics/sys_info.go index 08cf6145395..f5831e79c2c 100644 --- a/erigon-lib/diagnostics/sys_info.go +++ b/erigon-lib/diagnostics/sys_info.go @@ -24,10 +24,10 @@ import ( "github.com/shirou/gopsutil/v3/disk" "github.com/shirou/gopsutil/v3/mem" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/diskutils" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/diskutils" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/erigon-lib/diagnostics/utils.go b/erigon-lib/diagnostics/utils.go index ac2b1d6d7c7..8f9db4a16c1 100644 --- a/erigon-lib/diagnostics/utils.go +++ b/erigon-lib/diagnostics/utils.go @@ -21,8 +21,8 @@ import ( "fmt" "reflect" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) func ReadDataFromTable(tx kv.Tx, table string, key []byte) ([]byte, error) { diff --git a/erigon-lib/diagnostics/utils_test.go b/erigon-lib/diagnostics/utils_test.go index 1ca8f11bc9d..238ad2a7f6f 100644 --- a/erigon-lib/diagnostics/utils_test.go +++ b/erigon-lib/diagnostics/utils_test.go @@ -4,7 +4,7 @@ import ( "encoding/json" "testing" - "github.com/ledgerwatch/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/diagnostics" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/direct/downloader_client.go b/erigon-lib/direct/downloader_client.go index 30115793e01..bd02c52c292 100644 --- a/erigon-lib/direct/downloader_client.go +++ b/erigon-lib/direct/downloader_client.go @@ -19,7 +19,7 @@ package direct import ( "context" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/eth_backend_client.go b/erigon-lib/direct/eth_backend_client.go index 59e6deef3f1..88a481dd45c 100644 --- a/erigon-lib/direct/eth_backend_client.go +++ b/erigon-lib/direct/eth_backend_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/execution_client.go b/erigon-lib/direct/execution_client.go index c5e0552358b..b997bda6ff2 100644 --- a/erigon-lib/direct/execution_client.go +++ b/erigon-lib/direct/execution_client.go @@ -19,8 +19,8 @@ package direct import ( "context" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/mining_client.go b/erigon-lib/direct/mining_client.go index 2dae33b98c2..be10d1bcfb7 100644 --- a/erigon-lib/direct/mining_client.go +++ b/erigon-lib/direct/mining_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/direct/sentinel_client.go b/erigon-lib/direct/sentinel_client.go index 0adbd94c85a..686683be7d0 100644 --- a/erigon-lib/direct/sentinel_client.go +++ b/erigon-lib/direct/sentinel_client.go @@ -20,7 +20,7 @@ import ( "context" "io" - sentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" + sentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" "google.golang.org/grpc" ) diff --git a/erigon-lib/direct/sentry_client.go b/erigon-lib/direct/sentry_client.go index 35f5027a4d4..5b8a1cf9708 100644 --- a/erigon-lib/direct/sentry_client.go +++ b/erigon-lib/direct/sentry_client.go @@ -26,8 +26,8 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" ) const ( diff --git a/erigon-lib/direct/sentry_client_mock.go b/erigon-lib/direct/sentry_client_mock.go index ab7ff08312f..d644a20b4e1 100644 --- a/erigon-lib/direct/sentry_client_mock.go +++ b/erigon-lib/direct/sentry_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/direct (interfaces: SentryClient) +// Source: github.com/erigontech/erigon-lib/direct (interfaces: SentryClient) // // Generated by this command: // @@ -13,8 +13,8 @@ import ( context "context" reflect "reflect" - sentryproto "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + sentryproto "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/direct/state_diff_client.go b/erigon-lib/direct/state_diff_client.go index 812da37d7e4..7e4cc87f639 100644 --- a/erigon-lib/direct/state_diff_client.go +++ b/erigon-lib/direct/state_diff_client.go @@ -20,7 +20,7 @@ import ( "context" "io" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" "google.golang.org/grpc" ) diff --git a/erigon-lib/direct/txpool_client.go b/erigon-lib/direct/txpool_client.go index c9620d7351c..6d49ba54a0b 100644 --- a/erigon-lib/direct/txpool_client.go +++ b/erigon-lib/direct/txpool_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/diskutils/diskutils.go b/erigon-lib/diskutils/diskutils.go index cf2d480ee70..a1195d570c2 100644 --- a/erigon-lib/diskutils/diskutils.go +++ b/erigon-lib/diskutils/diskutils.go @@ -18,7 +18,7 @@ package diskutils -import "github.com/ledgerwatch/erigon-lib/log/v3" +import "github.com/erigontech/erigon-lib/log/v3" func MountPointForDirPath(dirPath string) string { log.Debug("[diskutils] Implemented only for darwin") diff --git a/erigon-lib/diskutils/diskutils_darwin.go b/erigon-lib/diskutils/diskutils_darwin.go index 972e604fad4..fcf92393776 100644 --- a/erigon-lib/diskutils/diskutils_darwin.go +++ b/erigon-lib/diskutils/diskutils_darwin.go @@ -22,7 +22,7 @@ import ( "os" "syscall" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func MountPointForDirPath(dirPath string) string { diff --git a/erigon-lib/downloader/downloader.go b/erigon-lib/downloader/downloader.go index 8a1c5334b18..8b9c7468bb3 100644 --- a/erigon-lib/downloader/downloader.go +++ b/erigon-lib/downloader/downloader.go @@ -51,17 +51,17 @@ import ( "golang.org/x/sync/semaphore" "golang.org/x/time/rate" - "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/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" ) // Downloader - component which downloading historical files. Can use BitTorrent, or other protocols @@ -2748,7 +2748,7 @@ func openClient(ctx context.Context, dbDir, snapDir string, cfg *torrent.ClientC // - "sig-bus" at disk-full - may happen anyway, because DB is mmap // - MMAP - means less GC pressure, more zero-copy // - MMAP files are pre-allocated - which is not cool, but: 1. we can live with it 2. maybe can just resize MMAP in future - // See also: https://github.com/ledgerwatch/erigon/pull/10074 + // See also: https://github.com/erigontech/erigon/pull/10074 m = storage.NewMMapWithCompletion(snapDir, c) //m = storage.NewFileOpts(storage.NewFileClientOpts{ // ClientBaseDir: snapDir, diff --git a/erigon-lib/downloader/downloader_grpc_server.go b/erigon-lib/downloader/downloader_grpc_server.go index d108ccc099d..4b2ef0dc2eb 100644 --- a/erigon-lib/downloader/downloader_grpc_server.go +++ b/erigon-lib/downloader/downloader_grpc_server.go @@ -26,10 +26,10 @@ import ( "github.com/anacrolix/torrent/metainfo" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + prototypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/erigon-lib/downloader/downloader_test.go b/erigon-lib/downloader/downloader_test.go index 6d1608e71fa..952acf9d180 100644 --- a/erigon-lib/downloader/downloader_test.go +++ b/erigon-lib/downloader/downloader_test.go @@ -25,10 +25,10 @@ import ( lg "github.com/anacrolix/log" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - downloadercfg2 "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/datadir" + downloadercfg2 "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/log/v3" ) func TestChangeInfoHashOfSameFile(t *testing.T) { diff --git a/erigon-lib/downloader/downloadercfg/downloadercfg.go b/erigon-lib/downloader/downloadercfg/downloadercfg.go index cc5400bd926..865894951fd 100644 --- a/erigon-lib/downloader/downloadercfg/downloadercfg.go +++ b/erigon-lib/downloader/downloadercfg/downloadercfg.go @@ -31,11 +31,11 @@ import ( "github.com/c2h5oh/datasize" "golang.org/x/time/rate" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/log/v3" ) // DefaultPieceSize - Erigon serves many big files, bigger pieces will reduce diff --git a/erigon-lib/downloader/downloadercfg/logger.go b/erigon-lib/downloader/downloadercfg/logger.go index c32a8c16cbf..74f29bc7880 100644 --- a/erigon-lib/downloader/downloadercfg/logger.go +++ b/erigon-lib/downloader/downloadercfg/logger.go @@ -22,7 +22,7 @@ import ( lg "github.com/anacrolix/log" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func init() { diff --git a/erigon-lib/downloader/downloadergrpc/client.go b/erigon-lib/downloader/downloadergrpc/client.go index 9c1950de2c2..823aee78920 100644 --- a/erigon-lib/downloader/downloadergrpc/client.go +++ b/erigon-lib/downloader/downloadergrpc/client.go @@ -24,9 +24,9 @@ import ( "github.com/anacrolix/torrent/metainfo" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + prototypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "google.golang.org/grpc" "google.golang.org/grpc/backoff" "google.golang.org/grpc/credentials/insecure" diff --git a/erigon-lib/downloader/mdbx_piece_completion.go b/erigon-lib/downloader/mdbx_piece_completion.go index c7cde184337..e1ab95cba6b 100644 --- a/erigon-lib/downloader/mdbx_piece_completion.go +++ b/erigon-lib/downloader/mdbx_piece_completion.go @@ -25,9 +25,9 @@ import ( "github.com/anacrolix/torrent/metainfo" "github.com/anacrolix/torrent/storage" "github.com/anacrolix/torrent/types/infohash" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" ) const ( diff --git a/erigon-lib/downloader/mdbx_piece_completion_test.go b/erigon-lib/downloader/mdbx_piece_completion_test.go index e8544e13d32..130ffd63198 100644 --- a/erigon-lib/downloader/mdbx_piece_completion_test.go +++ b/erigon-lib/downloader/mdbx_piece_completion_test.go @@ -19,8 +19,8 @@ package downloader import ( "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/erigon-lib/downloader/rclone.go b/erigon-lib/downloader/rclone.go index 24265ecc2ae..2957ba4f85b 100644 --- a/erigon-lib/downloader/rclone.go +++ b/erigon-lib/downloader/rclone.go @@ -44,10 +44,10 @@ import ( "github.com/spaolacci/murmur3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/log/v3" ) type rcloneInfo struct { diff --git a/erigon-lib/downloader/rclone_test.go b/erigon-lib/downloader/rclone_test.go index 894b94f96f6..afac9c6a4c6 100644 --- a/erigon-lib/downloader/rclone_test.go +++ b/erigon-lib/downloader/rclone_test.go @@ -24,8 +24,8 @@ import ( "os/exec" "testing" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/log/v3" ) func hasRClone() bool { diff --git a/erigon-lib/downloader/snaptype/caplin_types_test.go b/erigon-lib/downloader/snaptype/caplin_types_test.go index 9afde13c000..d2a02dda8f4 100644 --- a/erigon-lib/downloader/snaptype/caplin_types_test.go +++ b/erigon-lib/downloader/snaptype/caplin_types_test.go @@ -19,7 +19,7 @@ package snaptype_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/downloader/snaptype" ) func TestEnumeration(t *testing.T) { diff --git a/erigon-lib/downloader/snaptype/files.go b/erigon-lib/downloader/snaptype/files.go index aab998b50d8..6b500a1af8e 100644 --- a/erigon-lib/downloader/snaptype/files.go +++ b/erigon-lib/downloader/snaptype/files.go @@ -29,8 +29,8 @@ import ( "github.com/anacrolix/torrent/metainfo" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/common/dir" ) var ( diff --git a/erigon-lib/downloader/snaptype/type.go b/erigon-lib/downloader/snaptype/type.go index d04ff6760ab..f163674e4eb 100644 --- a/erigon-lib/downloader/snaptype/type.go +++ b/erigon-lib/downloader/snaptype/type.go @@ -28,14 +28,14 @@ import ( "strings" "sync" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" ) type Version uint8 diff --git a/erigon-lib/downloader/torrent_files.go b/erigon-lib/downloader/torrent_files.go index 92d7bb867c6..0fef5a878bc 100644 --- a/erigon-lib/downloader/torrent_files.go +++ b/erigon-lib/downloader/torrent_files.go @@ -28,7 +28,7 @@ import ( "github.com/anacrolix/torrent" "github.com/anacrolix/torrent/metainfo" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/dir" ) // AtomicTorrentFS - does provide thread-safe CRUD operations on .torrent files diff --git a/erigon-lib/downloader/util.go b/erigon-lib/downloader/util.go index 677b6c64058..80725a7548a 100644 --- a/erigon-lib/downloader/util.go +++ b/erigon-lib/downloader/util.go @@ -35,15 +35,15 @@ import ( "github.com/anacrolix/torrent/metainfo" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/snapcfg" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + dir2 "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) // udpOrHttpTrackers - torrent library spawning several goroutines and producing many requests for each tracker. So we limit amout of trackers by 8 diff --git a/erigon-lib/downloader/webseed.go b/erigon-lib/downloader/webseed.go index ca948ad8e15..0eadbe5105e 100644 --- a/erigon-lib/downloader/webseed.go +++ b/erigon-lib/downloader/webseed.go @@ -30,7 +30,7 @@ import ( "strings" "sync" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" "github.com/hashicorp/go-retryablehttp" @@ -38,14 +38,14 @@ import ( "github.com/c2h5oh/datasize" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/log/v3" "github.com/anacrolix/torrent/bencode" "github.com/anacrolix/torrent/metainfo" "github.com/pelletier/go-toml/v2" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/downloader/snaptype" ) // WebSeeds - allow use HTTP-based infrastrucutre to support Bittorrent network diff --git a/erigon-lib/etl/README.md b/erigon-lib/etl/README.md index e1f0d24afa5..8813501a42f 100644 --- a/erigon-lib/etl/README.md +++ b/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/main/eth/stagedsync/README.md). +ETL framework is most commonly used in [staged sync](https://github.com/erigontech/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. diff --git a/erigon-lib/etl/buffers.go b/erigon-lib/etl/buffers.go index 4411c42e32a..9da1038cb5d 100644 --- a/erigon-lib/etl/buffers.go +++ b/erigon-lib/etl/buffers.go @@ -26,7 +26,7 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) const ( diff --git a/erigon-lib/etl/collector.go b/erigon-lib/etl/collector.go index cb522c38f4d..a0890b0f334 100644 --- a/erigon-lib/etl/collector.go +++ b/erigon-lib/etl/collector.go @@ -28,10 +28,10 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) type LoadNextFunc func(originalK, k, v []byte) error diff --git a/erigon-lib/etl/dataprovider.go b/erigon-lib/etl/dataprovider.go index 50c89f30bac..1955cc83d5e 100644 --- a/erigon-lib/etl/dataprovider.go +++ b/erigon-lib/etl/dataprovider.go @@ -26,7 +26,7 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type dataProvider interface { diff --git a/erigon-lib/etl/etl.go b/erigon-lib/etl/etl.go index 9aecf794eb2..2ecd0fc20ac 100644 --- a/erigon-lib/etl/etl.go +++ b/erigon-lib/etl/etl.go @@ -24,9 +24,9 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) type CurrentTableReader interface { diff --git a/erigon-lib/etl/etl_test.go b/erigon-lib/etl/etl_test.go index 79e81eb4dda..8a20ce0cdac 100644 --- a/erigon-lib/etl/etl_test.go +++ b/erigon-lib/etl/etl_test.go @@ -28,14 +28,14 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" ) func decodeHex(in string) []byte { diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index c0ff6376f57..1812feb32f3 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -1,4 +1,4 @@ -module github.com/ledgerwatch/erigon-lib +module github.com/erigontech/erigon-lib go 1.21.5 diff --git a/erigon-lib/gointerfaces/downloaderproto/downloader.pb.go b/erigon-lib/gointerfaces/downloaderproto/downloader.pb.go index 3e8be2ed526..0e809121ef2 100644 --- a/erigon-lib/gointerfaces/downloaderproto/downloader.pb.go +++ b/erigon-lib/gointerfaces/downloaderproto/downloader.pb.go @@ -7,7 +7,7 @@ package downloaderproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go b/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go index 63b9ae5f6da..259d64bea5c 100644 --- a/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go +++ b/erigon-lib/gointerfaces/downloaderproto/downloader_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto (interfaces: DownloaderClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/downloaderproto (interfaces: DownloaderClient) // // Generated by this command: // diff --git a/erigon-lib/gointerfaces/executionproto/execution.pb.go b/erigon-lib/gointerfaces/executionproto/execution.pb.go index b2a321d9632..26d30fa3857 100644 --- a/erigon-lib/gointerfaces/executionproto/execution.pb.go +++ b/erigon-lib/gointerfaces/executionproto/execution.pb.go @@ -7,7 +7,7 @@ package executionproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/executionproto/execution_grpc.pb.go b/erigon-lib/gointerfaces/executionproto/execution_grpc.pb.go index 7d57d8d3673..ad4a2316bc6 100644 --- a/erigon-lib/gointerfaces/executionproto/execution_grpc.pb.go +++ b/erigon-lib/gointerfaces/executionproto/execution_grpc.pb.go @@ -8,7 +8,7 @@ package executionproto import ( context "context" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go b/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go index 83f22da19d7..a584bff2057 100644 --- a/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go +++ b/erigon-lib/gointerfaces/remoteproto/ethbackend.pb.go @@ -7,7 +7,7 @@ package remoteproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/remoteproto/ethbackend_grpc.pb.go b/erigon-lib/gointerfaces/remoteproto/ethbackend_grpc.pb.go index 804d7170d29..804d62e8b34 100644 --- a/erigon-lib/gointerfaces/remoteproto/ethbackend_grpc.pb.go +++ b/erigon-lib/gointerfaces/remoteproto/ethbackend_grpc.pb.go @@ -8,7 +8,7 @@ package remoteproto import ( context "context" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remoteproto/kv.pb.go b/erigon-lib/gointerfaces/remoteproto/kv.pb.go index f048afdf6c8..88615d1eaa3 100644 --- a/erigon-lib/gointerfaces/remoteproto/kv.pb.go +++ b/erigon-lib/gointerfaces/remoteproto/kv.pb.go @@ -7,7 +7,7 @@ package remoteproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/remoteproto/kv_client_mock.go b/erigon-lib/gointerfaces/remoteproto/kv_client_mock.go index 75176766b2f..eb1ab8e6944 100644 --- a/erigon-lib/gointerfaces/remoteproto/kv_client_mock.go +++ b/erigon-lib/gointerfaces/remoteproto/kv_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto (interfaces: KVClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/remoteproto (interfaces: KVClient) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/remoteproto/kv_grpc.pb.go b/erigon-lib/gointerfaces/remoteproto/kv_grpc.pb.go index 35d11867dbf..301df8820ff 100644 --- a/erigon-lib/gointerfaces/remoteproto/kv_grpc.pb.go +++ b/erigon-lib/gointerfaces/remoteproto/kv_grpc.pb.go @@ -8,7 +8,7 @@ package remoteproto import ( context "context" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remoteproto/kv_state_changes_client_mock.go b/erigon-lib/gointerfaces/remoteproto/kv_state_changes_client_mock.go index aa113dd6c5e..59ffa08ad1e 100644 --- a/erigon-lib/gointerfaces/remoteproto/kv_state_changes_client_mock.go +++ b/erigon-lib/gointerfaces/remoteproto/kv_state_changes_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto (interfaces: KV_StateChangesClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/remoteproto (interfaces: KV_StateChangesClient) // // Generated by this command: // diff --git a/erigon-lib/gointerfaces/remoteproto/sort.go b/erigon-lib/gointerfaces/remoteproto/sort.go index 97b1085c49b..16312772602 100644 --- a/erigon-lib/gointerfaces/remoteproto/sort.go +++ b/erigon-lib/gointerfaces/remoteproto/sort.go @@ -19,7 +19,7 @@ package remoteproto import ( "strings" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" ) func NodeInfoReplyCmp(i, j *types.NodeInfoReply) int { diff --git a/erigon-lib/gointerfaces/remoteproto/sort_test.go b/erigon-lib/gointerfaces/remoteproto/sort_test.go index 0967bebfe5a..831522ce676 100644 --- a/erigon-lib/gointerfaces/remoteproto/sort_test.go +++ b/erigon-lib/gointerfaces/remoteproto/sort_test.go @@ -20,8 +20,8 @@ import ( "slices" "testing" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "github.com/stretchr/testify/assert" ) diff --git a/erigon-lib/gointerfaces/sentinelproto/sentinel.pb.go b/erigon-lib/gointerfaces/sentinelproto/sentinel.pb.go index 6f5ab01c2b1..5091a59a93b 100644 --- a/erigon-lib/gointerfaces/sentinelproto/sentinel.pb.go +++ b/erigon-lib/gointerfaces/sentinelproto/sentinel.pb.go @@ -7,7 +7,7 @@ package sentinelproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/erigon-lib/gointerfaces/sentryproto/sentry.pb.go b/erigon-lib/gointerfaces/sentryproto/sentry.pb.go index bf034525332..583cbde354f 100644 --- a/erigon-lib/gointerfaces/sentryproto/sentry.pb.go +++ b/erigon-lib/gointerfaces/sentryproto/sentry.pb.go @@ -7,7 +7,7 @@ package sentryproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/sentryproto/sentry_client_mock.go b/erigon-lib/gointerfaces/sentryproto/sentry_client_mock.go index 0100fd7c26e..3ee448deb4e 100644 --- a/erigon-lib/gointerfaces/sentryproto/sentry_client_mock.go +++ b/erigon-lib/gointerfaces/sentryproto/sentry_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto (interfaces: SentryClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/sentryproto (interfaces: SentryClient) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" gomock "go.uber.org/mock/gomock" grpc "google.golang.org/grpc" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/sentryproto/sentry_grpc.pb.go b/erigon-lib/gointerfaces/sentryproto/sentry_grpc.pb.go index 757bf08877d..63fc1eee51d 100644 --- a/erigon-lib/gointerfaces/sentryproto/sentry_grpc.pb.go +++ b/erigon-lib/gointerfaces/sentryproto/sentry_grpc.pb.go @@ -8,7 +8,7 @@ package sentryproto import ( context "context" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/sentryproto/sentry_server_mock.go b/erigon-lib/gointerfaces/sentryproto/sentry_server_mock.go index 73e255bb800..7bddcc00aa7 100644 --- a/erigon-lib/gointerfaces/sentryproto/sentry_server_mock.go +++ b/erigon-lib/gointerfaces/sentryproto/sentry_server_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto (interfaces: SentryServer) +// Source: github.com/erigontech/erigon-lib/gointerfaces/sentryproto (interfaces: SentryServer) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" gomock "go.uber.org/mock/gomock" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/gointerfaces/txpoolproto/mining.pb.go b/erigon-lib/gointerfaces/txpoolproto/mining.pb.go index 7a930ef8972..1d7094bf2b4 100644 --- a/erigon-lib/gointerfaces/txpoolproto/mining.pb.go +++ b/erigon-lib/gointerfaces/txpoolproto/mining.pb.go @@ -7,7 +7,7 @@ package txpoolproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/txpoolproto/mining_grpc.pb.go b/erigon-lib/gointerfaces/txpoolproto/mining_grpc.pb.go index 7493ce47c37..78ca36551e9 100644 --- a/erigon-lib/gointerfaces/txpoolproto/mining_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpoolproto/mining_grpc.pb.go @@ -8,7 +8,7 @@ package txpoolproto import ( context "context" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/txpoolproto/txpool.pb.go b/erigon-lib/gointerfaces/txpoolproto/txpool.pb.go index a982dd11c4c..c946971452d 100644 --- a/erigon-lib/gointerfaces/txpoolproto/txpool.pb.go +++ b/erigon-lib/gointerfaces/txpoolproto/txpool.pb.go @@ -7,7 +7,7 @@ package txpoolproto import ( - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" emptypb "google.golang.org/protobuf/types/known/emptypb" diff --git a/erigon-lib/gointerfaces/txpoolproto/txpool_grpc.pb.go b/erigon-lib/gointerfaces/txpoolproto/txpool_grpc.pb.go index 7917595faf9..d9ddb2d4cad 100644 --- a/erigon-lib/gointerfaces/txpoolproto/txpool_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpoolproto/txpool_grpc.pb.go @@ -8,7 +8,7 @@ package txpoolproto import ( context "context" - typesproto "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + typesproto "github.com/erigontech/erigon-lib/gointerfaces/typesproto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/type_utils.go b/erigon-lib/gointerfaces/type_utils.go index d3cb66bd568..85016532282 100644 --- a/erigon-lib/gointerfaces/type_utils.go +++ b/erigon-lib/gointerfaces/type_utils.go @@ -20,7 +20,8 @@ import ( "encoding/binary" "github.com/holiman/uint256" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" ) func ConvertH2048ToBloom(h2048 *types.H2048) [256]byte { diff --git a/erigon-lib/gointerfaces/version.go b/erigon-lib/gointerfaces/version.go index a4305f65041..8b98114daae 100644 --- a/erigon-lib/gointerfaces/version.go +++ b/erigon-lib/gointerfaces/version.go @@ -19,7 +19,7 @@ package gointerfaces import ( "fmt" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" ) type Version struct { diff --git a/erigon-lib/kv/Readme.md b/erigon-lib/kv/Readme.md index 443eb5c9b7c..e1ce1c37a7b 100644 --- a/erigon-lib/kv/Readme.md +++ b/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/main/docs/programmers_guide/dupsort.md) + If your are not familiar with "DupSort" concept, please read [dupsort.md](https://github.com/erigontech/erigon/blob/main/docs/programmers_guide/dupsort.md) diff --git a/erigon-lib/kv/backup/backup.go b/erigon-lib/kv/backup/backup.go index fb625f8299a..8d8349d6054 100644 --- a/erigon-lib/kv/backup/backup.go +++ b/erigon-lib/kv/backup/backup.go @@ -32,11 +32,11 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - mdbx2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + mdbx2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" ) func OpenPair(from, to string, label kv.Label, targetPageSize datasize.ByteSize, logger log.Logger) (kv.RoDB, kv.RwDB) { diff --git a/erigon-lib/kv/bitmapdb/bitmapdb.go b/erigon-lib/kv/bitmapdb/bitmapdb.go index 847c3132fd1..674f936da59 100644 --- a/erigon-lib/kv/bitmapdb/bitmapdb.go +++ b/erigon-lib/kv/bitmapdb/bitmapdb.go @@ -27,8 +27,8 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) const MaxUint32 = 1<<32 - 1 diff --git a/erigon-lib/kv/bitmapdb/bitmapdb_test.go b/erigon-lib/kv/bitmapdb/bitmapdb_test.go index 56bc5a629a4..cb66ad05d18 100644 --- a/erigon-lib/kv/bitmapdb/bitmapdb_test.go +++ b/erigon-lib/kv/bitmapdb/bitmapdb_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/RoaringBitmap/roaring" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/bitmapdb" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/bitmapdb/fixed_size.go b/erigon-lib/kv/bitmapdb/fixed_size.go index 5e722957b1b..b5b33e2fdda 100644 --- a/erigon-lib/kv/bitmapdb/fixed_size.go +++ b/erigon-lib/kv/bitmapdb/fixed_size.go @@ -29,7 +29,7 @@ import ( "github.com/c2h5oh/datasize" mmap2 "github.com/edsrzf/mmap-go" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type FixedSizeBitmaps struct { diff --git a/erigon-lib/kv/bitmapdb/fixed_size_test.go b/erigon-lib/kv/bitmapdb/fixed_size_test.go index f3207e8e6c9..1c8b8760bc5 100644 --- a/erigon-lib/kv/bitmapdb/fixed_size_test.go +++ b/erigon-lib/kv/bitmapdb/fixed_size_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestFixedSizeBitmaps(t *testing.T) { diff --git a/erigon-lib/kv/dbutils/composite_keys.go b/erigon-lib/kv/dbutils/composite_keys.go index 49fe9f83e70..9e908ccd2be 100644 --- a/erigon-lib/kv/dbutils/composite_keys.go +++ b/erigon-lib/kv/dbutils/composite_keys.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" ) const NumberLength = 8 diff --git a/erigon-lib/kv/dbutils/composite_keys_test.go b/erigon-lib/kv/dbutils/composite_keys_test.go index 900d2ac7378..9c4bebe2eef 100644 --- a/erigon-lib/kv/dbutils/composite_keys_test.go +++ b/erigon-lib/kv/dbutils/composite_keys_test.go @@ -19,8 +19,8 @@ package dbutils import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" ) diff --git a/erigon-lib/kv/dbutils/history_index.go b/erigon-lib/kv/dbutils/history_index.go index 832a56516b2..1cfee7c9219 100644 --- a/erigon-lib/kv/dbutils/history_index.go +++ b/erigon-lib/kv/dbutils/history_index.go @@ -17,7 +17,7 @@ package dbutils import ( - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) func CompositeKeyWithoutIncarnation(key []byte) []byte { diff --git a/erigon-lib/kv/helpers.go b/erigon-lib/kv/helpers.go index ba9b23b2806..2a562ee25cc 100644 --- a/erigon-lib/kv/helpers.go +++ b/erigon-lib/kv/helpers.go @@ -26,7 +26,7 @@ import ( "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) func DefaultPageSize() uint64 { diff --git a/erigon-lib/kv/kv_interface.go b/erigon-lib/kv/kv_interface.go index ae4f37cfcf7..d157e8c6d11 100644 --- a/erigon-lib/kv/kv_interface.go +++ b/erigon-lib/kv/kv_interface.go @@ -22,9 +22,9 @@ import ( "fmt" "unsafe" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/metrics" ) //Variables Naming: diff --git a/erigon-lib/kv/kvcache/cache.go b/erigon-lib/kv/kvcache/cache.go index 9b1c581f305..43826b7ca58 100644 --- a/erigon-lib/kv/kvcache/cache.go +++ b/erigon-lib/kv/kvcache/cache.go @@ -31,11 +31,11 @@ import ( btree2 "github.com/tidwall/btree" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/metrics" ) type CacheValidationResult struct { diff --git a/erigon-lib/kv/kvcache/cache_test.go b/erigon-lib/kv/kvcache/cache_test.go index e24309087ff..5915d95ca81 100644 --- a/erigon-lib/kv/kvcache/cache_test.go +++ b/erigon-lib/kv/kvcache/cache_test.go @@ -29,15 +29,15 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/types" ) func TestEvictionInUnexpectedOrder(t *testing.T) { diff --git a/erigon-lib/kv/kvcache/dummy.go b/erigon-lib/kv/kvcache/dummy.go index 8091b7e6451..51cc1241c0a 100644 --- a/erigon-lib/kv/kvcache/dummy.go +++ b/erigon-lib/kv/kvcache/dummy.go @@ -19,8 +19,8 @@ package kvcache import ( "context" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" ) // DummyCache - doesn't remember anything - can be used when service is not remote diff --git a/erigon-lib/kv/kvcfg/accessors_config.go b/erigon-lib/kv/kvcfg/accessors_config.go index ddfc45ae81c..dadb56e3000 100644 --- a/erigon-lib/kv/kvcfg/accessors_config.go +++ b/erigon-lib/kv/kvcfg/accessors_config.go @@ -19,7 +19,7 @@ package kvcfg import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) type ConfigKey []byte diff --git a/erigon-lib/kv/mdbx/kv_abstract_test.go b/erigon-lib/kv/mdbx/kv_abstract_test.go index aa0069f5dbe..a76eb6e29a1 100644 --- a/erigon-lib/kv/mdbx/kv_abstract_test.go +++ b/erigon-lib/kv/mdbx/kv_abstract_test.go @@ -28,14 +28,14 @@ import ( "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/remotedb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/remotedb" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/log/v3" ) func TestSequence(t *testing.T) { diff --git a/erigon-lib/kv/mdbx/kv_mdbx.go b/erigon-lib/kv/mdbx/kv_mdbx.go index 2bdcab3310e..d0bf3a801db 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx.go +++ b/erigon-lib/kv/mdbx/kv_mdbx.go @@ -38,13 +38,13 @@ import ( "golang.org/x/exp/maps" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/mmap" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/mmap" ) const NonExistingDBI kv.DBI = 999_999_999 diff --git a/erigon-lib/kv/mdbx/kv_mdbx_temporary.go b/erigon-lib/kv/mdbx/kv_mdbx_temporary.go index 15d1af10c8c..df8e7082bd8 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx_temporary.go +++ b/erigon-lib/kv/mdbx/kv_mdbx_temporary.go @@ -21,8 +21,8 @@ import ( "os" "unsafe" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) type TemporaryMdbx struct { diff --git a/erigon-lib/kv/mdbx/kv_mdbx_test.go b/erigon-lib/kv/mdbx/kv_mdbx_test.go index 80c05ac167d..c6c00031268 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx_test.go +++ b/erigon-lib/kv/mdbx/kv_mdbx_test.go @@ -29,10 +29,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" ) func BaseCaseDB(t *testing.T) kv.RwDB { diff --git a/erigon-lib/kv/mdbx/kv_migrator_test.go b/erigon-lib/kv/mdbx/kv_migrator_test.go index 9c5a2cfd714..473ec35c070 100644 --- a/erigon-lib/kv/mdbx/kv_migrator_test.go +++ b/erigon-lib/kv/mdbx/kv_migrator_test.go @@ -27,10 +27,10 @@ import ( "github.com/c2h5oh/datasize" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" ) func TestBucketCRUD(t *testing.T) { diff --git a/erigon-lib/kv/mdbx/util.go b/erigon-lib/kv/mdbx/util.go index 6cf0c9705e2..915b063543d 100644 --- a/erigon-lib/kv/mdbx/util.go +++ b/erigon-lib/kv/mdbx/util.go @@ -17,8 +17,8 @@ package mdbx import ( - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) func MustOpen(path string) kv.RwDB { diff --git a/erigon-lib/kv/membatch/database_test.go b/erigon-lib/kv/membatch/database_test.go index 135fdf55507..9b02711f4c5 100644 --- a/erigon-lib/kv/membatch/database_test.go +++ b/erigon-lib/kv/membatch/database_test.go @@ -30,8 +30,8 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/membatch/mapmutation.go b/erigon-lib/kv/membatch/mapmutation.go index f5b0e2c62a9..e2a24d7888f 100644 --- a/erigon-lib/kv/membatch/mapmutation.go +++ b/erigon-lib/kv/membatch/mapmutation.go @@ -25,11 +25,11 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" ) type Mapmutation struct { diff --git a/erigon-lib/kv/membatch/mapmutation_test.go b/erigon-lib/kv/membatch/mapmutation_test.go index 33940d0d874..c997ab63958 100644 --- a/erigon-lib/kv/membatch/mapmutation_test.go +++ b/erigon-lib/kv/membatch/mapmutation_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" ) func TestMapmutation_Flush_Close(t *testing.T) { diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation.go b/erigon-lib/kv/membatchwithdb/memory_mutation.go index 8d2ae6ede07..53112ff601f 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation.go @@ -23,12 +23,12 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" ) type MemoryMutation struct { diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go b/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go index e1f30326507..d75e165ffb2 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go @@ -20,8 +20,8 @@ import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) type NextType int diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation_diff.go b/erigon-lib/kv/membatchwithdb/memory_mutation_diff.go index 0032c71f80a..2caf047b39d 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation_diff.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation_diff.go @@ -16,7 +16,7 @@ package membatchwithdb -import "github.com/ledgerwatch/erigon-lib/kv" +import "github.com/erigontech/erigon-lib/kv" type entry struct { k []byte diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation_test.go b/erigon-lib/kv/membatchwithdb/memory_mutation_test.go index 75a225ad3e9..1a923ad61fa 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation_test.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - stateLib "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + stateLib "github.com/erigontech/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) func initializeDbNonDupSort(rwTx kv.RwTx) { diff --git a/erigon-lib/kv/memdb/memory_database.go b/erigon-lib/kv/memdb/memory_database.go index 21774cdb41a..d33c870748b 100644 --- a/erigon-lib/kv/memdb/memory_database.go +++ b/erigon-lib/kv/memdb/memory_database.go @@ -22,9 +22,9 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" ) func New(tmpDir string) kv.RwDB { diff --git a/erigon-lib/kv/rawdbv3/txnum.go b/erigon-lib/kv/rawdbv3/txnum.go index a4397ebcefe..bee2aa63232 100644 --- a/erigon-lib/kv/rawdbv3/txnum.go +++ b/erigon-lib/kv/rawdbv3/txnum.go @@ -22,10 +22,10 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" ) type ErrTxNumsAppendWithGap struct { diff --git a/erigon-lib/kv/rawdbv3/txnum_test.go b/erigon-lib/kv/rawdbv3/txnum_test.go index 25e5a4600c6..70666f3354e 100644 --- a/erigon-lib/kv/rawdbv3/txnum_test.go +++ b/erigon-lib/kv/rawdbv3/txnum_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" ) func TestName(t *testing.T) { diff --git a/erigon-lib/kv/remotedb/kv_remote.go b/erigon-lib/kv/remotedb/kv_remote.go index 0bf370994a9..86490b25b93 100644 --- a/erigon-lib/kv/remotedb/kv_remote.go +++ b/erigon-lib/kv/remotedb/kv_remote.go @@ -27,14 +27,14 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" ) // generate the messages and services diff --git a/erigon-lib/kv/remotedbserver/remotedbserver.go b/erigon-lib/kv/remotedbserver/remotedbserver.go index 5918fb56dfd..be73a5112c4 100644 --- a/erigon-lib/kv/remotedbserver/remotedbserver.go +++ b/erigon-lib/kv/remotedbserver/remotedbserver.go @@ -30,14 +30,14 @@ import ( "google.golang.org/protobuf/proto" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" ) // MaxTxTTL - kv interface provide high-consistancy guaranties: Serializable Isolations Level https://en.wikipedia.org/wiki/Isolation_(database_systems) diff --git a/erigon-lib/kv/remotedbserver/remotedbserver_test.go b/erigon-lib/kv/remotedbserver/remotedbserver_test.go index f5c4bbe0e3c..e448363d37d 100644 --- a/erigon-lib/kv/remotedbserver/remotedbserver_test.go +++ b/erigon-lib/kv/remotedbserver/remotedbserver_test.go @@ -25,9 +25,9 @@ import ( "go.uber.org/mock/gomock" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" ) func TestKvServer_renew(t *testing.T) { diff --git a/erigon-lib/kv/remotedbserver/snapshots_mock.go b/erigon-lib/kv/remotedbserver/snapshots_mock.go index cdd66394fec..8dde9e6a628 100644 --- a/erigon-lib/kv/remotedbserver/snapshots_mock.go +++ b/erigon-lib/kv/remotedbserver/snapshots_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/kv/remotedbserver (interfaces: Snapshots) +// Source: github.com/erigontech/erigon-lib/kv/remotedbserver (interfaces: Snapshots) // // Generated by this command: // diff --git a/erigon-lib/kv/stream/stream.go b/erigon-lib/kv/stream/stream.go index bf23dffc0ed..ca523451e20 100644 --- a/erigon-lib/kv/stream/stream.go +++ b/erigon-lib/kv/stream/stream.go @@ -19,7 +19,7 @@ package stream import ( "slices" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/order" "golang.org/x/exp/constraints" ) diff --git a/erigon-lib/kv/stream/stream_test.go b/erigon-lib/kv/stream/stream_test.go index 1204300e580..a812e7ae6ba 100644 --- a/erigon-lib/kv/stream/stream_test.go +++ b/erigon-lib/kv/stream/stream_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/tables.go b/erigon-lib/kv/tables.go index 7c5507164dc..72452655c2b 100644 --- a/erigon-lib/kv/tables.go +++ b/erigon-lib/kv/tables.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" ) // DBSchemaVersion versions list diff --git a/erigon-lib/kv/temporal/historyv2/account_changeset.go b/erigon-lib/kv/temporal/historyv2/account_changeset.go index be494937953..89192f5ee81 100644 --- a/erigon-lib/kv/temporal/historyv2/account_changeset.go +++ b/erigon-lib/kv/temporal/historyv2/account_changeset.go @@ -22,9 +22,9 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" ) type Encoder func(blockN uint64, s *ChangeSet, f func(k, v []byte) error) error diff --git a/erigon-lib/kv/temporal/historyv2/account_changeset_test.go b/erigon-lib/kv/temporal/historyv2/account_changeset_test.go index d51cb2c71e5..c37a800c865 100644 --- a/erigon-lib/kv/temporal/historyv2/account_changeset_test.go +++ b/erigon-lib/kv/temporal/historyv2/account_changeset_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" ) func TestEncodingAccount(t *testing.T) { diff --git a/erigon-lib/kv/temporal/historyv2/changeset.go b/erigon-lib/kv/temporal/historyv2/changeset.go index 43aca5b3f53..9027b0cb830 100644 --- a/erigon-lib/kv/temporal/historyv2/changeset.go +++ b/erigon-lib/kv/temporal/historyv2/changeset.go @@ -23,9 +23,9 @@ import ( math2 "math" "reflect" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" ) func NewChangeSet() *ChangeSet { diff --git a/erigon-lib/kv/temporal/historyv2/find_by_history.go b/erigon-lib/kv/temporal/historyv2/find_by_history.go index 7b40242d6d9..f21a47d4bce 100644 --- a/erigon-lib/kv/temporal/historyv2/find_by_history.go +++ b/erigon-lib/kv/temporal/historyv2/find_by_history.go @@ -22,9 +22,9 @@ import ( "fmt" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" ) func FindByHistory(indexC kv.Cursor, changesC kv.CursorDupSort, storage bool, key []byte, timestamp uint64) ([]byte, bool, error) { diff --git a/erigon-lib/kv/temporal/historyv2/storage_changeset.go b/erigon-lib/kv/temporal/historyv2/storage_changeset.go index b76084ca27f..cd769b0c4c7 100644 --- a/erigon-lib/kv/temporal/historyv2/storage_changeset.go +++ b/erigon-lib/kv/temporal/historyv2/storage_changeset.go @@ -23,8 +23,8 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" ) var ( diff --git a/erigon-lib/kv/temporal/kv_temporal.go b/erigon-lib/kv/temporal/kv_temporal.go index 88897640719..7ada8f7a313 100644 --- a/erigon-lib/kv/temporal/kv_temporal.go +++ b/erigon-lib/kv/temporal/kv_temporal.go @@ -19,12 +19,12 @@ package temporal import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/state" ) //Variables Naming: diff --git a/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go b/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go index 390de14da1b..6065614849e 100644 --- a/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go +++ b/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go @@ -20,13 +20,13 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" ) // nolint:thelper diff --git a/erigon-lib/log/v3/ext/ext_test.go b/erigon-lib/log/v3/ext/ext_test.go index 5173e96bee6..e082b0cb3c2 100644 --- a/erigon-lib/log/v3/ext/ext_test.go +++ b/erigon-lib/log/v3/ext/ext_test.go @@ -5,7 +5,7 @@ import ( "math" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func testHandler() (log.Handler, *log.Record) { diff --git a/erigon-lib/log/v3/ext/handler.go b/erigon-lib/log/v3/ext/handler.go index bcd21a2c6d7..7e8eb3fa870 100644 --- a/erigon-lib/log/v3/ext/handler.go +++ b/erigon-lib/log/v3/ext/handler.go @@ -6,7 +6,7 @@ import ( "sync/atomic" "unsafe" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // EscalateErrHandler wraps another handler and passes all records through diff --git a/erigon-lib/metrics/setup.go b/erigon-lib/metrics/setup.go index cf2c54c1e72..d13f94ca03b 100644 --- a/erigon-lib/metrics/setup.go +++ b/erigon-lib/metrics/setup.go @@ -23,7 +23,7 @@ import ( "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var EnabledExpensive = false diff --git a/erigon-lib/recsplit/eliasfano16/elias_fano.go b/erigon-lib/recsplit/eliasfano16/elias_fano.go index 845cf53e6b2..a9baea2a1b2 100644 --- a/erigon-lib/recsplit/eliasfano16/elias_fano.go +++ b/erigon-lib/recsplit/eliasfano16/elias_fano.go @@ -24,7 +24,7 @@ import ( "math/bits" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" + "github.com/erigontech/erigon-lib/common/bitutil" ) // EliasFano algo overview https://www.antoniomallia.it/sorted-integers-compression-with-elias-fano-encoding.html diff --git a/erigon-lib/recsplit/eliasfano32/elias_fano.go b/erigon-lib/recsplit/eliasfano32/elias_fano.go index e59320a8169..6a503b75eae 100644 --- a/erigon-lib/recsplit/eliasfano32/elias_fano.go +++ b/erigon-lib/recsplit/eliasfano32/elias_fano.go @@ -26,7 +26,7 @@ import ( "sort" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" + "github.com/erigontech/erigon-lib/common/bitutil" ) // EliasFano algo overview https://www.antoniomallia.it/sorted-integers-compression-with-elias-fano-encoding.html diff --git a/erigon-lib/recsplit/eliasfano32/elias_fano_test.go b/erigon-lib/recsplit/eliasfano32/elias_fano_test.go index 2f3ae3a122d..88c33fb416c 100644 --- a/erigon-lib/recsplit/eliasfano32/elias_fano_test.go +++ b/erigon-lib/recsplit/eliasfano32/elias_fano_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/kv/stream" ) func TestEliasFanoSeek(t *testing.T) { diff --git a/erigon-lib/recsplit/golomb_rice.go b/erigon-lib/recsplit/golomb_rice.go index 560d0dda239..1e0d5799e8a 100644 --- a/erigon-lib/recsplit/golomb_rice.go +++ b/erigon-lib/recsplit/golomb_rice.go @@ -22,7 +22,7 @@ import ( "math/bits" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" + "github.com/erigontech/erigon-lib/common/bitutil" ) // Optimal Golomb-Rice parameters for leaves diff --git a/erigon-lib/recsplit/index.go b/erigon-lib/recsplit/index.go index becc2aeb07e..cf87f80bdd5 100644 --- a/erigon-lib/recsplit/index.go +++ b/erigon-lib/recsplit/index.go @@ -30,12 +30,12 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/mmap" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano16" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/mmap" + "github.com/erigontech/erigon-lib/recsplit/eliasfano16" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) type Features byte @@ -60,7 +60,7 @@ const ( // general-purpose-filter: 9bits/key, 0.3% false-positives, 3 mem access // first-bytes-array: 8bits/key, 1/256=0.4% false-positives, 1 mem access // - // See also: https://github.com/ledgerwatch/erigon/issues/9486 + // See also: https://github.com/erigontech/erigon/issues/9486 LessFalsePositives Features = 0b10 // ) diff --git a/erigon-lib/recsplit/index_test.go b/erigon-lib/recsplit/index_test.go index e41d62d32f7..09d26fa32a4 100644 --- a/erigon-lib/recsplit/index_test.go +++ b/erigon-lib/recsplit/index_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestReWriteIndex(t *testing.T) { diff --git a/erigon-lib/recsplit/recsplit.go b/erigon-lib/recsplit/recsplit.go index f70e5eac11c..27c20ece508 100644 --- a/erigon-lib/recsplit/recsplit.go +++ b/erigon-lib/recsplit/recsplit.go @@ -31,12 +31,12 @@ import ( "github.com/c2h5oh/datasize" "github.com/spaolacci/murmur3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano16" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit/eliasfano16" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) var ErrCollision = fmt.Errorf("duplicate key") diff --git a/erigon-lib/recsplit/recsplit_fuzz_test.go b/erigon-lib/recsplit/recsplit_fuzz_test.go index 397420ade45..a18934bd300 100644 --- a/erigon-lib/recsplit/recsplit_fuzz_test.go +++ b/erigon-lib/recsplit/recsplit_fuzz_test.go @@ -23,7 +23,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // go test -trimpath -v -fuzz=FuzzRecSplit -fuzztime=10s ./recsplit diff --git a/erigon-lib/recsplit/recsplit_test.go b/erigon-lib/recsplit/recsplit_test.go index 90d3bad90b6..5d7062d18ae 100644 --- a/erigon-lib/recsplit/recsplit_test.go +++ b/erigon-lib/recsplit/recsplit_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestRecSplit2(t *testing.T) { diff --git a/erigon-lib/rlp/encode.go b/erigon-lib/rlp/encode.go index 4754419920a..0a37766473b 100644 --- a/erigon-lib/rlp/encode.go +++ b/erigon-lib/rlp/encode.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "math/bits" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // General design: diff --git a/erigon-lib/rlp/encode_test.go b/erigon-lib/rlp/encode_test.go index a79a206f521..cdca78e2505 100644 --- a/erigon-lib/rlp/encode_test.go +++ b/erigon-lib/rlp/encode_test.go @@ -22,7 +22,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" ) // Strings of length 56 are a boundary case. diff --git a/erigon-lib/rlp/parse.go b/erigon-lib/rlp/parse.go index f1f6c655a27..5d53bc1b4f6 100644 --- a/erigon-lib/rlp/parse.go +++ b/erigon-lib/rlp/parse.go @@ -22,7 +22,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/erigon-lib/rlp/parse_test.go b/erigon-lib/rlp/parse_test.go index 823cd72060b..a100d77afb5 100644 --- a/erigon-lib/rlp/parse_test.go +++ b/erigon-lib/rlp/parse_test.go @@ -23,7 +23,7 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" ) var parseU64Tests = []struct { diff --git a/erigon-lib/rlp2/encodel.go b/erigon-lib/rlp2/encodel.go index 55a3ddb8715..2a706ff76b7 100644 --- a/erigon-lib/rlp2/encodel.go +++ b/erigon-lib/rlp2/encodel.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "math/bits" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // General design: diff --git a/erigon-lib/rlp2/parse.go b/erigon-lib/rlp2/parse.go index 65d03f01851..b69e7de5a12 100644 --- a/erigon-lib/rlp2/parse.go +++ b/erigon-lib/rlp2/parse.go @@ -22,7 +22,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/erigon-lib/rlp2/parse_test.go b/erigon-lib/rlp2/parse_test.go index 823cd72060b..a100d77afb5 100644 --- a/erigon-lib/rlp2/parse_test.go +++ b/erigon-lib/rlp2/parse_test.go @@ -23,7 +23,7 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" ) var parseU64Tests = []struct { diff --git a/erigon-lib/rlp2/unmarshaler_test.go b/erigon-lib/rlp2/unmarshaler_test.go index 9f37de978b4..3887f93d011 100644 --- a/erigon-lib/rlp2/unmarshaler_test.go +++ b/erigon-lib/rlp2/unmarshaler_test.go @@ -19,7 +19,7 @@ package rlp_test import ( "testing" - rlp "github.com/ledgerwatch/erigon-lib/rlp2" + rlp "github.com/erigontech/erigon-lib/rlp2" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/seg/compress.go b/erigon-lib/seg/compress.go index 40fce889d9e..6fd93055100 100644 --- a/erigon-lib/seg/compress.go +++ b/erigon-lib/seg/compress.go @@ -34,11 +34,11 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + dir2 "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" ) // Compressor is the main operating type for performing per-word compression diff --git a/erigon-lib/seg/compress_fuzz_test.go b/erigon-lib/seg/compress_fuzz_test.go index 91e2e8051ae..4081ab3f1aa 100644 --- a/erigon-lib/seg/compress_fuzz_test.go +++ b/erigon-lib/seg/compress_fuzz_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func FuzzCompress(f *testing.F) { diff --git a/erigon-lib/seg/compress_test.go b/erigon-lib/seg/compress_test.go index 41b519f0487..2d86902b361 100644 --- a/erigon-lib/seg/compress_test.go +++ b/erigon-lib/seg/compress_test.go @@ -27,7 +27,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestCompressEmptyDict(t *testing.T) { diff --git a/erigon-lib/seg/decompress.go b/erigon-lib/seg/decompress.go index d7fcf661316..71e79df909e 100644 --- a/erigon-lib/seg/decompress.go +++ b/erigon-lib/seg/decompress.go @@ -29,13 +29,13 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/log/v3" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/mmap" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/mmap" ) type word []byte // plain text word associated with code from dictionary diff --git a/erigon-lib/seg/decompress_fuzz_test.go b/erigon-lib/seg/decompress_fuzz_test.go index e6c28c19f03..a6f375a281e 100644 --- a/erigon-lib/seg/decompress_fuzz_test.go +++ b/erigon-lib/seg/decompress_fuzz_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func FuzzDecompressMatch(f *testing.F) { diff --git a/erigon-lib/seg/decompress_test.go b/erigon-lib/seg/decompress_test.go index 7901b5c4dd2..1b315df0390 100644 --- a/erigon-lib/seg/decompress_test.go +++ b/erigon-lib/seg/decompress_test.go @@ -30,7 +30,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func prepareLoremDict(t *testing.T) *Decompressor { diff --git a/erigon-lib/seg/parallel_compress.go b/erigon-lib/seg/parallel_compress.go index 3a04b6429ba..6e739645da6 100644 --- a/erigon-lib/seg/parallel_compress.go +++ b/erigon-lib/seg/parallel_compress.go @@ -31,12 +31,12 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/seg/patricia" - "github.com/ledgerwatch/erigon-lib/seg/sais" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/seg/patricia" + "github.com/erigontech/erigon-lib/seg/sais" ) // MinPatternScore is minimum score (per superstring) required to consider including pattern into the dictionary diff --git a/erigon-lib/seg/patricia/patricia.go b/erigon-lib/seg/patricia/patricia.go index fadee8980e2..389707cf596 100644 --- a/erigon-lib/seg/patricia/patricia.go +++ b/erigon-lib/seg/patricia/patricia.go @@ -22,8 +22,8 @@ import ( "slices" "strings" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/seg/sais" + "github.com/erigontech/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/seg/sais" ) // Implementation of paticia tree for efficient search of substrings from a dictionary in a given string diff --git a/erigon-lib/seg/silkworm_seg_fuzz_test.go b/erigon-lib/seg/silkworm_seg_fuzz_test.go index 6ec4ea03fb8..493366d9a3d 100644 --- a/erigon-lib/seg/silkworm_seg_fuzz_test.go +++ b/erigon-lib/seg/silkworm_seg_fuzz_test.go @@ -28,7 +28,7 @@ import ( "testing" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/state/aggregator.go b/erigon-lib/state/aggregator.go index eac3dbbfc90..9690613758b 100644 --- a/erigon-lib/state/aggregator.go +++ b/erigon-lib/state/aggregator.go @@ -39,18 +39,18 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/seg" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/seg" ) type Aggregator struct { diff --git a/erigon-lib/state/aggregator_bench_test.go b/erigon-lib/state/aggregator_bench_test.go index 6f8547cf208..2d0f69465b1 100644 --- a/erigon-lib/state/aggregator_bench_test.go +++ b/erigon-lib/state/aggregator_bench_test.go @@ -27,17 +27,17 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" ) func testDbAndAggregatorBench(b *testing.B, aggStep uint64) (kv.RwDB, *Aggregator) { diff --git a/erigon-lib/state/aggregator_files.go b/erigon-lib/state/aggregator_files.go index 0f332a5719c..9b5ade8b7fb 100644 --- a/erigon-lib/state/aggregator_files.go +++ b/erigon-lib/state/aggregator_files.go @@ -20,9 +20,10 @@ import ( "math/bits" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" ) type SelectedStaticFilesV3 struct { diff --git a/erigon-lib/state/aggregator_test.go b/erigon-lib/state/aggregator_test.go index 85d937277e3..54a4756920b 100644 --- a/erigon-lib/state/aggregator_test.go +++ b/erigon-lib/state/aggregator_test.go @@ -35,18 +35,18 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/seg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/seg" + "github.com/erigontech/erigon-lib/types" ) func TestAggregatorV3_Merge(t *testing.T) { diff --git a/erigon-lib/state/appendable.go b/erigon-lib/state/appendable.go index 0a7d43b2e15..ff2f34369be 100644 --- a/erigon-lib/state/appendable.go +++ b/erigon-lib/state/appendable.go @@ -33,18 +33,18 @@ import ( btree2 "github.com/tidwall/btree" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/seg" - - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/seg" + + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/recsplit" ) // Appendable - data type allows store data for different blockchain forks. diff --git a/erigon-lib/state/appendable_test.go b/erigon-lib/state/appendable_test.go index 347c7af6419..3a8f24ddff3 100644 --- a/erigon-lib/state/appendable_test.go +++ b/erigon-lib/state/appendable_test.go @@ -26,19 +26,19 @@ import ( "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/seg" ) func testDbAndAppendable(tb testing.TB, aggStep uint64, logger log.Logger) (kv.RwDB, *Appendable) { diff --git a/erigon-lib/state/archive.go b/erigon-lib/state/archive.go index 9a770b363af..dc39708cd06 100644 --- a/erigon-lib/state/archive.go +++ b/erigon-lib/state/archive.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/seg" ) type FileCompression uint8 diff --git a/erigon-lib/state/archive_test.go b/erigon-lib/state/archive_test.go index 9a43eddf9ab..652f8479457 100644 --- a/erigon-lib/state/archive_test.go +++ b/erigon-lib/state/archive_test.go @@ -27,9 +27,9 @@ import ( "github.com/c2h5oh/datasize" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/seg" ) func TestArchiveWriter(t *testing.T) { diff --git a/erigon-lib/state/bps_tree.go b/erigon-lib/state/bps_tree.go index 5c0e0d464e7..3dc13db80cc 100644 --- a/erigon-lib/state/bps_tree.go +++ b/erigon-lib/state/bps_tree.go @@ -21,8 +21,8 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) // nolint diff --git a/erigon-lib/state/btree_index.go b/erigon-lib/state/btree_index.go index dea5cffc5b4..a563c85098a 100644 --- a/erigon-lib/state/btree_index.go +++ b/erigon-lib/state/btree_index.go @@ -35,13 +35,13 @@ import ( "github.com/edsrzf/mmap-go" "github.com/spaolacci/murmur3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) var UseBpsTree = true @@ -896,7 +896,7 @@ func (b *BtIndex) keyCmp(k []byte, di uint64, g ArchiveGetter) (int, []byte, err var res []byte res, _ = g.Next(res[:0]) - //TODO: use `b.getter.Match` after https://github.com/ledgerwatch/erigon/issues/7855 + //TODO: use `b.getter.Match` after https://github.com/erigontech/erigon/issues/7855 return bytes.Compare(res, k), res, nil //return b.getter.Match(k), result, nil } diff --git a/erigon-lib/state/btree_index_test.go b/erigon-lib/state/btree_index_test.go index 9e7a5611eb9..36f11d481df 100644 --- a/erigon-lib/state/btree_index_test.go +++ b/erigon-lib/state/btree_index_test.go @@ -26,11 +26,11 @@ import ( bloomfilter "github.com/holiman/bloomfilter/v2" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) func Test_BtreeIndex_Init2(t *testing.T) { @@ -370,7 +370,7 @@ func (b *mockIndexReader) keyCmp(k []byte, di uint64, g ArchiveGetter) (int, []b var res []byte res, _ = g.Next(res[:0]) - //TODO: use `b.getter.Match` after https://github.com/ledgerwatch/erigon/issues/7855 + //TODO: use `b.getter.Match` after https://github.com/erigontech/erigon/issues/7855 return bytes.Compare(res, k), res, nil //return b.getter.Match(k), result, nil } diff --git a/erigon-lib/state/domain.go b/erigon-lib/state/domain.go index b921dea8077..e7fed829849 100644 --- a/erigon-lib/state/domain.go +++ b/erigon-lib/state/domain.go @@ -35,19 +35,19 @@ import ( btree2 "github.com/tidwall/btree" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" ) // StepsInColdFile - files of this size are completely frozen/immutable. diff --git a/erigon-lib/state/domain_committed.go b/erigon-lib/state/domain_committed.go index 3e97e40f994..9d78bb6f577 100644 --- a/erigon-lib/state/domain_committed.go +++ b/erigon-lib/state/domain_committed.go @@ -22,9 +22,9 @@ import ( "fmt" "strings" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/commitment" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/recsplit" ) type ValueMerger func(prev, current []byte) (merged []byte, err error) diff --git a/erigon-lib/state/domain_shared.go b/erigon-lib/state/domain_shared.go index 52a6b9f6d8d..1e71188e427 100644 --- a/erigon-lib/state/domain_shared.go +++ b/erigon-lib/state/domain_shared.go @@ -32,20 +32,20 @@ import ( "github.com/pkg/errors" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/cryptozerocopy" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/cryptozerocopy" + "github.com/erigontech/erigon-lib/log/v3" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/commitment" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/types" ) var ErrBehindCommitment = fmt.Errorf("behind commitment") diff --git a/erigon-lib/state/domain_shared_bench_test.go b/erigon-lib/state/domain_shared_bench_test.go index 3a390053e28..927255bbaba 100644 --- a/erigon-lib/state/domain_shared_bench_test.go +++ b/erigon-lib/state/domain_shared_bench_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) func Benchmark_SharedDomains_GetLatest(t *testing.B) { diff --git a/erigon-lib/state/domain_shared_test.go b/erigon-lib/state/domain_shared_test.go index e846851406e..0c33a6af17d 100644 --- a/erigon-lib/state/domain_shared_test.go +++ b/erigon-lib/state/domain_shared_test.go @@ -27,12 +27,12 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types" ) func TestSharedDomain_CommitmentKeyReplacement(t *testing.T) { diff --git a/erigon-lib/state/domain_test.go b/erigon-lib/state/domain_test.go index 196b3c0d9e6..f3f7fce79d0 100644 --- a/erigon-lib/state/domain_test.go +++ b/erigon-lib/state/domain_test.go @@ -33,21 +33,21 @@ import ( "testing" "time" - datadir2 "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/types" + datadir2 "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/types" "github.com/holiman/uint256" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" ) func testDbAndDomain(t *testing.T, logger log.Logger) (kv.RwDB, *Domain) { diff --git a/erigon-lib/state/existence_filter.go b/erigon-lib/state/existence_filter.go index 76c51ae914e..3f8bc316a3f 100644 --- a/erigon-lib/state/existence_filter.go +++ b/erigon-lib/state/existence_filter.go @@ -24,8 +24,8 @@ import ( bloomfilter "github.com/holiman/bloomfilter/v2" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/log/v3" ) type ExistenceFilter struct { diff --git a/erigon-lib/state/files_item.go b/erigon-lib/state/files_item.go index 6d6f67037e7..1cccaec1c1f 100644 --- a/erigon-lib/state/files_item.go +++ b/erigon-lib/state/files_item.go @@ -22,11 +22,11 @@ import ( btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" ) // filesItem is "dirty" file - means file which can be: diff --git a/erigon-lib/state/gc_test.go b/erigon-lib/state/gc_test.go index 8a384fa3529..9f3c14e8dda 100644 --- a/erigon-lib/state/gc_test.go +++ b/erigon-lib/state/gc_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) func TestGCReadAfterRemoveFile(t *testing.T) { diff --git a/erigon-lib/state/history.go b/erigon-lib/state/history.go index 751e5811e2b..9b810e932c9 100644 --- a/erigon-lib/state/history.go +++ b/erigon-lib/state/history.go @@ -33,18 +33,18 @@ import ( btree2 "github.com/tidwall/btree" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) type History struct { diff --git a/erigon-lib/state/history_test.go b/erigon-lib/state/history_test.go index 7ca20ca0ac0..3838f21da90 100644 --- a/erigon-lib/state/history_test.go +++ b/erigon-lib/state/history_test.go @@ -28,23 +28,23 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) func testDbAndHistory(tb testing.TB, largeValues bool, logger log.Logger) (kv.RwDB, *History) { diff --git a/erigon-lib/state/inverted_index.go b/erigon-lib/state/inverted_index.go index 4daa68384fb..d84289061c9 100644 --- a/erigon-lib/state/inverted_index.go +++ b/erigon-lib/state/inverted_index.go @@ -33,27 +33,27 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/RoaringBitmap/roaring/roaring64" "github.com/spaolacci/murmur3" btree2 "github.com/tidwall/btree" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) type InvertedIndex struct { diff --git a/erigon-lib/state/inverted_index_test.go b/erigon-lib/state/inverted_index_test.go index cc6d2097d13..ebfe67319bb 100644 --- a/erigon-lib/state/inverted_index_test.go +++ b/erigon-lib/state/inverted_index_test.go @@ -29,16 +29,16 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) func testDbAndInvertedIndex(tb testing.TB, aggStep uint64, logger log.Logger) (kv.RwDB, *InvertedIndex) { diff --git a/erigon-lib/state/iters.go b/erigon-lib/state/iters.go index be27005366c..e6b65572144 100644 --- a/erigon-lib/state/iters.go +++ b/erigon-lib/state/iters.go @@ -17,10 +17,10 @@ package state import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/stream" ) //go:generate mockgen -typed=true -destination=./iters_mock.go -package=state . CanonicalsReader diff --git a/erigon-lib/state/iters_mock.go b/erigon-lib/state/iters_mock.go index 6e8aa5a757d..ee9ab6869e1 100644 --- a/erigon-lib/state/iters_mock.go +++ b/erigon-lib/state/iters_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/state (interfaces: CanonicalsReader) +// Source: github.com/erigontech/erigon-lib/state (interfaces: CanonicalsReader) // // Generated by this command: // @@ -12,10 +12,10 @@ package state import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - kv "github.com/ledgerwatch/erigon-lib/kv" - order "github.com/ledgerwatch/erigon-lib/kv/order" - stream "github.com/ledgerwatch/erigon-lib/kv/stream" + common "github.com/erigontech/erigon-lib/common" + kv "github.com/erigontech/erigon-lib/kv" + order "github.com/erigontech/erigon-lib/kv/order" + stream "github.com/erigontech/erigon-lib/kv/stream" gomock "go.uber.org/mock/gomock" ) diff --git a/erigon-lib/state/merge.go b/erigon-lib/state/merge.go index f9870bfd863..dc15f5c93ef 100644 --- a/erigon-lib/state/merge.go +++ b/erigon-lib/state/merge.go @@ -29,14 +29,14 @@ import ( "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) func (d *Domain) dirtyFilesEndTxNumMinimax() uint64 { diff --git a/erigon-lib/state/merge_test.go b/erigon-lib/state/merge_test.go index e8990eb8311..62e9df6d457 100644 --- a/erigon-lib/state/merge_test.go +++ b/erigon-lib/state/merge_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/seg" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) func emptyTestInvertedIndex(aggStep uint64) *InvertedIndex { diff --git a/erigon-lib/state/metrics.go b/erigon-lib/state/metrics.go index 331db151e24..248e523edf0 100644 --- a/erigon-lib/state/metrics.go +++ b/erigon-lib/state/metrics.go @@ -16,7 +16,7 @@ package state -import "github.com/ledgerwatch/erigon-lib/metrics" +import "github.com/erigontech/erigon-lib/metrics" var ( //LatestStateReadWarm = metrics.GetOrCreateSummary(`latest_state_read{type="warm",found="yes"}`) //nolint diff --git a/erigon-lib/state/reconst.go b/erigon-lib/state/reconst.go index 24cc0849930..cebcc9ab8e0 100644 --- a/erigon-lib/state/reconst.go +++ b/erigon-lib/state/reconst.go @@ -3,7 +3,7 @@ package state import ( "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) // AggregatorStep is used for incremental reconstitution, it allows diff --git a/erigon-lib/state/state_changeset.go b/erigon-lib/state/state_changeset.go index 712e78770d0..cb12a8e974a 100644 --- a/erigon-lib/state/state_changeset.go +++ b/erigon-lib/state/state_changeset.go @@ -22,9 +22,9 @@ import ( "math" "sort" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" ) type StateChangeSet struct { diff --git a/erigon-lib/state/state_recon.go b/erigon-lib/state/state_recon.go index d34b56ecfd8..46b8563abfe 100644 --- a/erigon-lib/state/state_recon.go +++ b/erigon-lib/state/state_recon.go @@ -20,9 +20,9 @@ import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) // Algorithms for reconstituting the state from state history diff --git a/erigon-lib/state/state_util.go b/erigon-lib/state/state_util.go index 4a1565a6fad..b94bc41fa63 100644 --- a/erigon-lib/state/state_util.go +++ b/erigon-lib/state/state_util.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" ) func buildSimpleMapAccessor(ctx context.Context, d *seg.Decompressor, compression FileCompression, cfg recsplit.RecSplitArgs, logger log.Logger, walker func(idx *recsplit.RecSplit, i, offset uint64, word []byte) error) error { diff --git a/erigon-lib/txpool/fetch.go b/erigon-lib/txpool/fetch.go index 108dfe2f5d9..adc8fe5fd6f 100644 --- a/erigon-lib/txpool/fetch.go +++ b/erigon-lib/txpool/fetch.go @@ -27,15 +27,15 @@ import ( "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" ) // Fetch connects to sentry and implements eth/66 protocol regarding the transaction diff --git a/erigon-lib/txpool/fetch_test.go b/erigon-lib/txpool/fetch_test.go index 38ba58bb13d..b2c90b97627 100644 --- a/erigon-lib/txpool/fetch_test.go +++ b/erigon-lib/txpool/fetch_test.go @@ -29,15 +29,15 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + erigonlibtypes "github.com/erigontech/erigon-lib/types" ) func TestFetch(t *testing.T) { diff --git a/erigon-lib/txpool/pool.go b/erigon-lib/txpool/pool.go index 58e342f0622..eacb87ec7a7 100644 --- a/erigon-lib/txpool/pool.go +++ b/erigon-lib/txpool/pool.go @@ -39,25 +39,26 @@ import ( "github.com/google/btree" "github.com/hashicorp/golang-lru/v2/simplelru" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - libkzg "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/u256" + libkzg "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/types" ) const DefaultBlockGasLimit = uint64(30000000) diff --git a/erigon-lib/txpool/pool_fuzz_test.go b/erigon-lib/txpool/pool_fuzz_test.go index b49ebe37c87..d79b607475b 100644 --- a/erigon-lib/txpool/pool_fuzz_test.go +++ b/erigon-lib/txpool/pool_fuzz_test.go @@ -28,21 +28,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/rlp" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/rlp" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/types" ) // https://go.dev/doc/fuzz/ diff --git a/erigon-lib/txpool/pool_mock.go b/erigon-lib/txpool/pool_mock.go index ef5d5ec4d8a..a9c1b4aa427 100644 --- a/erigon-lib/txpool/pool_mock.go +++ b/erigon-lib/txpool/pool_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/txpool (interfaces: Pool) +// Source: github.com/erigontech/erigon-lib/txpool (interfaces: Pool) // // Generated by this command: // @@ -13,10 +13,10 @@ import ( context "context" reflect "reflect" - remoteproto "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - kv "github.com/ledgerwatch/erigon-lib/kv" - txpoolcfg "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types "github.com/ledgerwatch/erigon-lib/types" + remoteproto "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + kv "github.com/erigontech/erigon-lib/kv" + txpoolcfg "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + types "github.com/erigontech/erigon-lib/types" gomock "go.uber.org/mock/gomock" ) diff --git a/erigon-lib/txpool/pool_test.go b/erigon-lib/txpool/pool_test.go index 1514bfb2513..4baece7a472 100644 --- a/erigon-lib/txpool/pool_test.go +++ b/erigon-lib/txpool/pool_test.go @@ -29,22 +29,22 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/types" ) func TestNonceFromAddress(t *testing.T) { diff --git a/erigon-lib/txpool/send.go b/erigon-lib/txpool/send.go index e4ba247cd30..61ef47fca09 100644 --- a/erigon-lib/txpool/send.go +++ b/erigon-lib/txpool/send.go @@ -23,11 +23,11 @@ import ( "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/rlp" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" ) type SentryClient interface { diff --git a/erigon-lib/txpool/test_util.go b/erigon-lib/txpool/test_util.go index 38d203f84df..618eef27034 100644 --- a/erigon-lib/txpool/test_util.go +++ b/erigon-lib/txpool/test_util.go @@ -22,9 +22,9 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/gointerfaces" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/types" ) type MockSentry struct { diff --git a/erigon-lib/txpool/txpool_grpc_server.go b/erigon-lib/txpool/txpool_grpc_server.go index 26e89d9b826..7d4bfebbe8b 100644 --- a/erigon-lib/txpool/txpool_grpc_server.go +++ b/erigon-lib/txpool/txpool_grpc_server.go @@ -36,15 +36,15 @@ import ( "google.golang.org/grpc/reflection" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/types" ) // TxPoolAPIVersion diff --git a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go index e7e65e6dccb..cfcbb0c6a65 100644 --- a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go +++ b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go @@ -23,10 +23,10 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - emath "github.com/ledgerwatch/erigon-lib/common/math" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + emath "github.com/erigontech/erigon-lib/common/math" + "github.com/erigontech/erigon-lib/types" ) // BorDefaultTxPoolPriceLimit defines the minimum gas price limit for bor to enforce txs acceptance into the pool. diff --git a/erigon-lib/txpool/txpooluitl/all_components.go b/erigon-lib/txpool/txpooluitl/all_components.go index 29e89d8f47d..d702fab10b9 100644 --- a/erigon-lib/txpool/txpooluitl/all_components.go +++ b/erigon-lib/txpool/txpooluitl/all_components.go @@ -25,15 +25,15 @@ import ( "github.com/c2h5oh/datasize" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/txpool" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/types" ) func SaveChainConfigIfNeed(ctx context.Context, coreDB kv.RoDB, txPoolDB kv.RwDB, force bool, logger log.Logger) (cc *chain.Config, blockNum uint64, err error) { diff --git a/erigon-lib/types/ssz/ssz.go b/erigon-lib/types/ssz/ssz.go index 7de3ef6c001..60800543ae1 100644 --- a/erigon-lib/types/ssz/ssz.go +++ b/erigon-lib/types/ssz/ssz.go @@ -19,9 +19,9 @@ package ssz import ( "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/types/clonable" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/types/clonable" ) var ( diff --git a/erigon-lib/types/txn.go b/erigon-lib/types/txn.go index c0e40e2da85..74e0c849b04 100644 --- a/erigon-lib/types/txn.go +++ b/erigon-lib/types/txn.go @@ -32,13 +32,13 @@ import ( "github.com/erigontech/secp256k1" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/crypto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/crypto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/rlp" ) type TxParseConfig struct { diff --git a/erigon-lib/types/txn_packets.go b/erigon-lib/types/txn_packets.go index 2b06a63309b..506c8f15e4f 100644 --- a/erigon-lib/types/txn_packets.go +++ b/erigon-lib/types/txn_packets.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/rlp" ) type NewPooledTransactionHashesPacket [][length.Hash]byte diff --git a/erigon-lib/types/txn_packets_fuzz_test.go b/erigon-lib/types/txn_packets_fuzz_test.go index 514a89bb743..90955d0476a 100644 --- a/erigon-lib/types/txn_packets_fuzz_test.go +++ b/erigon-lib/types/txn_packets_fuzz_test.go @@ -21,8 +21,8 @@ package types import ( "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/u256" ) func FuzzPooledTransactions66(f *testing.F) { diff --git a/erigon-lib/types/txn_packets_test.go b/erigon-lib/types/txn_packets_test.go index d1b7107ae9d..50ff893bd65 100644 --- a/erigon-lib/types/txn_packets_test.go +++ b/erigon-lib/types/txn_packets_test.go @@ -24,7 +24,7 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" ) var hashParseTests = []struct { diff --git a/erigon-lib/types/txn_test.go b/erigon-lib/types/txn_test.go index aa5708fe84a..6d7f57bfc41 100644 --- a/erigon-lib/types/txn_test.go +++ b/erigon-lib/types/txn_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/hexutility" ) func TestParseTransactionRLP(t *testing.T) { diff --git a/erigon-lib/types/txn_types_fuzz_test.go b/erigon-lib/types/txn_types_fuzz_test.go index d19783c6223..100ca9f90a6 100644 --- a/erigon-lib/types/txn_types_fuzz_test.go +++ b/erigon-lib/types/txn_types_fuzz_test.go @@ -21,7 +21,7 @@ package types import ( "testing" - "github.com/ledgerwatch/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/common/u256" ) // golang.org/s/draft-fuzzing-design diff --git a/erigon-lib/wrap/e3_wrapper.go b/erigon-lib/wrap/e3_wrapper.go index b3b27d914d0..9f0e97bfbd9 100644 --- a/erigon-lib/wrap/e3_wrapper.go +++ b/erigon-lib/wrap/e3_wrapper.go @@ -17,8 +17,8 @@ package wrap import ( - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/state" ) type TxContainer struct { diff --git a/eth/backend.go b/eth/backend.go index eadd8c39b3b..d23f5c8e6da 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -46,98 +46,98 @@ import ( "google.golang.org/grpc/credentials" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - protodownloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - rpcsentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinelproto" - protosentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpooluitl" - libtypes "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format/getters" - clcore "github.com/ledgerwatch/erigon/cl/phase1/core" - executionclient "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/cl/utils/eth_clock" - "github.com/ledgerwatch/erigon/cmd/caplin/caplin1" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/clique" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - snaptype2 "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/consensuschain" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconsensusconfig" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/privateapi" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/ethstats" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/finality/flags" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/bridge" - "github.com/ledgerwatch/erigon/polygon/heimdall" - polygonsync "github.com/ledgerwatch/erigon/polygon/sync" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/engineapi" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_block_downloader" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/execution/eth1" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/silkworm" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/snap" - stages2 "github.com/ledgerwatch/erigon/turbo/stages" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/downloadergrpc" + "github.com/erigontech/erigon-lib/downloader/snaptype" + protodownloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + rpcsentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinelproto" + protosentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + prototypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/txpool" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/txpool/txpooluitl" + libtypes "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format/getters" + clcore "github.com/erigontech/erigon/cl/phase1/core" + executionclient "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/cl/utils/eth_clock" + "github.com/erigontech/erigon/cmd/caplin/caplin1" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/clique" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + snaptype2 "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/consensuschain" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconsensusconfig" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/privateapi" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/ethstats" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/finality/flags" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/bridge" + "github.com/erigontech/erigon/polygon/heimdall" + polygonsync "github.com/erigontech/erigon/polygon/sync" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/engineapi" + "github.com/erigontech/erigon/turbo/engineapi/engine_block_downloader" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/execution/eth1" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_chain_reader.go" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/silkworm" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon/turbo/snapshotsync/snap" + stages2 "github.com/erigontech/erigon/turbo/stages" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) // Config contains the configuration options of the ETH protocol. diff --git a/eth/calltracer/calltracer.go b/eth/calltracer/calltracer.go index 5f27f4c5c1a..ca833a0ba1e 100644 --- a/eth/calltracer/calltracer.go +++ b/eth/calltracer/calltracer.go @@ -21,13 +21,14 @@ import ( "sort" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" ) type CallTracer struct { diff --git a/eth/consensuschain/consensus_chain_reader.go b/eth/consensuschain/consensus_chain_reader.go index 159473f032a..319675be2fe 100644 --- a/eth/consensuschain/consensus_chain_reader.go +++ b/eth/consensuschain/consensus_chain_reader.go @@ -20,14 +20,14 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) type Reader struct { diff --git a/eth/discovery.go b/eth/discovery.go index 1059b0459c3..89b2ec29d84 100644 --- a/eth/discovery.go +++ b/eth/discovery.go @@ -20,8 +20,8 @@ package eth import ( - "github.com/ledgerwatch/erigon/p2p/dnsdisc" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/dnsdisc" + "github.com/erigontech/erigon/p2p/enode" ) // setupDiscovery creates the node discovery source for the `eth` and `snap` diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index 51574c8c77b..8e9c7a1a0ad 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -31,20 +31,20 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" ) // BorDefaultMinerGasPrice defines the minimum gas price for bor validators to mine a transaction. diff --git a/eth/ethconfig/estimate/esitmated_ram.go b/eth/ethconfig/estimate/esitmated_ram.go index 74a80015488..6d393e20206 100644 --- a/eth/ethconfig/estimate/esitmated_ram.go +++ b/eth/ethconfig/estimate/esitmated_ram.go @@ -21,7 +21,7 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/mmap" + "github.com/erigontech/erigon-lib/mmap" ) type EstimatedRamPerWorker datasize.ByteSize diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 00f4d53a06f..ddbdba296de 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -6,18 +6,18 @@ import ( "math/big" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" ) // MarshalTOML marshals as TOML. diff --git a/eth/ethconfig/tx_pool.go b/eth/ethconfig/tx_pool.go index f7701499ecf..0bcb4eaee9f 100644 --- a/eth/ethconfig/tx_pool.go +++ b/eth/ethconfig/tx_pool.go @@ -22,8 +22,8 @@ package ethconfig import ( "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" ) // DeprecatedTxPoolConfig are the configuration parameters of the transaction pool. diff --git a/eth/ethconsensusconfig/config.go b/eth/ethconsensusconfig/config.go index 0e8378b1ad9..9df1a2cc588 100644 --- a/eth/ethconsensusconfig/config.go +++ b/eth/ethconsensusconfig/config.go @@ -22,25 +22,25 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bridge" - - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/aura" - "github.com/ledgerwatch/erigon/consensus/clique" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bridge" + + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/aura" + "github.com/erigontech/erigon/consensus/clique" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/services" ) func CreateConsensusEngine(ctx context.Context, nodeConfig *nodecfg.Config, chainConfig *chain.Config, config interface{}, notify []string, noVerify bool, diff --git a/eth/ethutils/receipt.go b/eth/ethutils/receipt.go index d8c12da4b01..ce7925c6911 100644 --- a/eth/ethutils/receipt.go +++ b/eth/ethutils/receipt.go @@ -21,13 +21,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/types" ) func MarshalReceipt( diff --git a/eth/ethutils/utils.go b/eth/ethutils/utils.go index 63b325e14a0..c991cdfb4cc 100644 --- a/eth/ethutils/utils.go +++ b/eth/ethutils/utils.go @@ -20,12 +20,12 @@ import ( "errors" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/crypto/kzg" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/crypto/kzg" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 75e9f627d7f..3e2383f1ca4 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,13 +25,13 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/rpc" + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/rpc" ) // FilterCriteria represents a request to create a new filter. diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 68945848f02..b57859ee69c 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -24,9 +24,9 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go index 35399d18fda..cd1e1cef3eb 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -28,10 +28,11 @@ import ( "sync/atomic" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" ) var ( diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go index 9f432cb3733..a462f095cb4 100644 --- a/eth/gasprice/feehistory_test.go +++ b/eth/gasprice/feehistory_test.go @@ -24,11 +24,11 @@ import ( "errors" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/gasprice" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/gasprice" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/jsonrpc" ) func TestFeeHistory(t *testing.T) { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index 8cf97f480d6..2a7133dc3b1 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -27,14 +27,14 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/params" - - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon/params" + + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" ) const sampleNumber = 3 // Number of transactions sampled in a block diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index 0f519626fe4..bce78a2e25d 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -27,22 +27,22 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/gasprice" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" + + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/gasprice" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" ) type testBackend struct { diff --git a/eth/gasprice/gaspricecfg/gaspricecfg.go b/eth/gasprice/gaspricecfg/gaspricecfg.go index ddf02bf9447..ef9dc34bf33 100644 --- a/eth/gasprice/gaspricecfg/gaspricecfg.go +++ b/eth/gasprice/gaspricecfg/gaspricecfg.go @@ -19,7 +19,7 @@ package gaspricecfg import ( "math/big" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) var DefaultIgnorePrice = big.NewInt(2 * params.Wei) diff --git a/eth/integrity/e3_ef_files.go b/eth/integrity/e3_ef_files.go index 3e3a933d971..07f8f068b1b 100644 --- a/eth/integrity/e3_ef_files.go +++ b/eth/integrity/e3_ef_files.go @@ -20,9 +20,9 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/state" "golang.org/x/sync/errgroup" ) diff --git a/eth/integrity/e3_history_no_system_txs.go b/eth/integrity/e3_history_no_system_txs.go index 3c2048174dc..71db14064a8 100644 --- a/eth/integrity/e3_history_no_system_txs.go +++ b/eth/integrity/e3_history_no_system_txs.go @@ -25,12 +25,12 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" ) // E3 History - usually don't have anything attributed to 1-st system txs (except genesis) diff --git a/eth/integrity/no_gaps_in_canonical_headers.go b/eth/integrity/no_gaps_in_canonical_headers.go index 958099f8298..901b9951d38 100644 --- a/eth/integrity/no_gaps_in_canonical_headers.go +++ b/eth/integrity/no_gaps_in_canonical_headers.go @@ -21,13 +21,13 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/services" ) func NoGapsInCanonicalHeaders(tx kv.Tx, ctx context.Context, br services.FullBlockReader) { diff --git a/eth/integrity/snap_blocks_read.go b/eth/integrity/snap_blocks_read.go index f3a1711d5bc..0923bdfdcfe 100644 --- a/eth/integrity/snap_blocks_read.go +++ b/eth/integrity/snap_blocks_read.go @@ -21,9 +21,9 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/services" ) func SnapBlocksRead(db kv.RoDB, blockReader services.FullBlockReader, ctx context.Context, failFast bool) error { diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go index c4bfbcc1a01..a10ce596043 100644 --- a/eth/protocols/eth/discovery.go +++ b/eth/protocols/eth/discovery.go @@ -22,11 +22,11 @@ package eth import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) // enrEntry is the ENR entry which advertises `eth` protocol on the discovery. diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go index 9b685ef67bb..7c6ce46e7e1 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -22,11 +22,11 @@ package eth import ( "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb" ) const ( diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go index bc545a5318f..a096e4c33ea 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -26,19 +26,19 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages/mock" ) var ( diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go index a9293760eb2..01aa6d71a7f 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -22,15 +22,15 @@ package eth import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) func AnswerGetBlockHeadersQuery(db kv.Tx, query *GetBlockHeadersPacket, blockReader services.HeaderAndCanonicalReader) ([]*types.Header, error) { diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go index b4b22565dee..776bb52c0ea 100644 --- a/eth/protocols/eth/protocol.go +++ b/eth/protocols/eth/protocol.go @@ -24,14 +24,14 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + rlp2 "github.com/erigontech/erigon-lib/rlp" + + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" ) var ProtocolToString = map[uint]string{ diff --git a/eth/protocols/eth/protocol_test.go b/eth/protocols/eth/protocol_test.go index 48b0b0e880d..82fa9f846c6 100644 --- a/eth/protocols/eth/protocol_test.go +++ b/eth/protocols/eth/protocol_test.go @@ -24,11 +24,11 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" ) // Tests that the custom union field encoder and decoder works correctly. diff --git a/eth/stagedsync/README.md b/eth/stagedsync/README.md index bfedd50c9aa..140e3e2923e 100644 --- a/eth/stagedsync/README.md +++ b/eth/stagedsync/README.md @@ -45,7 +45,7 @@ state.unwindOrder = []*Stage{ } ``` -## Preprocessing with [ETL](https://github.com/ledgerwatch/erigon-lib/tree/main/etl) +## Preprocessing with [ETL](https://github.com/erigontech/erigon-lib/tree/main/etl) Some stages use our ETL framework to sort data by keys before inserting it into the database. diff --git a/eth/stagedsync/bor_heimdall_shared.go b/eth/stagedsync/bor_heimdall_shared.go index 9fdac8956c5..531403c9b60 100644 --- a/eth/stagedsync/bor_heimdall_shared.go +++ b/eth/stagedsync/bor_heimdall_shared.go @@ -25,15 +25,15 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) var ( diff --git a/eth/stagedsync/chain_reader.go b/eth/stagedsync/chain_reader.go index 60e8ed6e229..5073c548383 100644 --- a/eth/stagedsync/chain_reader.go +++ b/eth/stagedsync/chain_reader.go @@ -20,15 +20,15 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) // ChainReader implements consensus.ChainReader diff --git a/eth/stagedsync/default_stages.go b/eth/stagedsync/default_stages.go index 1a6723efbfa..8c311d9ee8b 100644 --- a/eth/stagedsync/default_stages.go +++ b/eth/stagedsync/default_stages.go @@ -19,12 +19,12 @@ package stagedsync import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func DefaultStages(ctx context.Context, diff --git a/eth/stagedsync/exec3.go b/eth/stagedsync/exec3.go index 13c5d120be8..4aa51a78eea 100644 --- a/eth/stagedsync/exec3.go +++ b/eth/stagedsync/exec3.go @@ -29,41 +29,41 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/ethconfig/estimate" "github.com/c2h5oh/datasize" "github.com/erigontech/mdbx-go/mdbx" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - metrics2 "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/metrics" - state2 "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/cmd/state/exec3" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/rawdbhelpers" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + metrics2 "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/metrics" + state2 "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/cmd/state/exec3" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/rawdbhelpers" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" ) var execStepsInDB = metrics.NewGauge(`exec_steps_in_db`) //nolint diff --git a/eth/stagedsync/stage.go b/eth/stagedsync/stage.go index 468d9eb4ec8..ce651474132 100644 --- a/eth/stagedsync/stage.go +++ b/eth/stagedsync/stage.go @@ -17,12 +17,12 @@ package stagedsync import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) // ExecFunc is the execution function for the stage to move forward. diff --git a/eth/stagedsync/stage_blockhashes.go b/eth/stagedsync/stage_blockhashes.go index 4b16c57d02c..965847bf8b0 100644 --- a/eth/stagedsync/stage_blockhashes.go +++ b/eth/stagedsync/stage_blockhashes.go @@ -20,11 +20,11 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) type BlockHashesCfg struct { diff --git a/eth/stagedsync/stage_bodies.go b/eth/stagedsync/stage_bodies.go index 8daa9f14985..64bf10e79d9 100644 --- a/eth/stagedsync/stage_bodies.go +++ b/eth/stagedsync/stage_bodies.go @@ -22,22 +22,22 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/dataflow" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/adapter" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/dataflow" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/adapter" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) const requestLoopCutOff int = 1 diff --git a/eth/stagedsync/stage_bodies_test.go b/eth/stagedsync/stage_bodies_test.go index e0c93d766a4..710ceeab52f 100644 --- a/eth/stagedsync/stage_bodies_test.go +++ b/eth/stagedsync/stage_bodies_test.go @@ -23,17 +23,17 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/stages/mock" ) func testingHeaderBody(t *testing.T) (h *types.Header, b *types.RawBody) { diff --git a/eth/stagedsync/stage_bor_heimdall.go b/eth/stagedsync/stage_bor_heimdall.go index c057296e8f1..f5e814c1052 100644 --- a/eth/stagedsync/stage_bor_heimdall.go +++ b/eth/stagedsync/stage_bor_heimdall.go @@ -30,29 +30,29 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/dataflow" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/finality" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/sync" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/dataflow" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/finality" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/sync" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) const ( diff --git a/eth/stagedsync/stage_bor_heimdall_test.go b/eth/stagedsync/stage_bor_heimdall_test.go index a3fe1b1e33f..92251ca3b55 100644 --- a/eth/stagedsync/stage_bor_heimdall_test.go +++ b/eth/stagedsync/stage_bor_heimdall_test.go @@ -26,17 +26,17 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stagedsynctest" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stagedsynctest" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall" ) func TestBorHeimdallForwardPersistsSpans(t *testing.T) { diff --git a/eth/stagedsync/stage_call_traces.go b/eth/stagedsync/stage_call_traces.go index c0420a178d7..5c5daa4114b 100644 --- a/eth/stagedsync/stage_call_traces.go +++ b/eth/stagedsync/stage_call_traces.go @@ -28,18 +28,18 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" ) type CallTracesCfg struct { diff --git a/eth/stagedsync/stage_call_traces_test.go b/eth/stagedsync/stage_call_traces_test.go index e5d1810946d..cbd8ca4cec0 100644 --- a/eth/stagedsync/stage_call_traces_test.go +++ b/eth/stagedsync/stage_call_traces_test.go @@ -24,14 +24,14 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func genTestCallTraceSet(t *testing.T, tx kv.RwTx, to uint64) { diff --git a/eth/stagedsync/stage_custom_trace.go b/eth/stagedsync/stage_custom_trace.go index b8afe1a7eb9..d7be07cff56 100644 --- a/eth/stagedsync/stage_custom_trace.go +++ b/eth/stagedsync/stage_custom_trace.go @@ -20,17 +20,17 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/cmd/state/exec3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/cmd/state/exec3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/turbo/services" ) type CustomTraceCfg struct { diff --git a/eth/stagedsync/stage_execute.go b/eth/stagedsync/stage_execute.go index 81bc62fd6fc..1af71330fee 100644 --- a/eth/stagedsync/stage_execute.go +++ b/eth/stagedsync/stage_execute.go @@ -24,30 +24,30 @@ import ( "github.com/c2h5oh/datasize" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/rawdbhelpers" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/silkworm" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/rawdbhelpers" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/silkworm" ) const ( diff --git a/eth/stagedsync/stage_execute_test.go b/eth/stagedsync/stage_execute_test.go index b0e976dbbfc..f2f58c9d098 100644 --- a/eth/stagedsync/stage_execute_test.go +++ b/eth/stagedsync/stage_execute_test.go @@ -19,11 +19,11 @@ package stagedsync import ( "context" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/params" ) func apply(tx kv.RwTx, logger log.Logger) (beforeBlock, afterBlock testGenHook, w state.StateWriter) { diff --git a/eth/stagedsync/stage_finish.go b/eth/stagedsync/stage_finish.go index ef88b8c6d15..f768598385a 100644 --- a/eth/stagedsync/stage_finish.go +++ b/eth/stagedsync/stage_finish.go @@ -23,23 +23,23 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/services" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/services" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/ethdb/cbor" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/ethdb/cbor" + "github.com/erigontech/erigon/params" ) type FinishCfg struct { diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go index 305297e60f0..d1fc58db82f 100644 --- a/eth/stagedsync/stage_headers.go +++ b/eth/stagedsync/stage_headers.go @@ -26,27 +26,27 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) // The number of blocks we should be able to re-org sub-second on commodity hardware. diff --git a/eth/stagedsync/stage_indexes.go b/eth/stagedsync/stage_indexes.go index 563336e48a3..7170a18918b 100644 --- a/eth/stagedsync/stage_indexes.go +++ b/eth/stagedsync/stage_indexes.go @@ -27,24 +27,24 @@ import ( "slices" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common/changeset" - "github.com/ledgerwatch/erigon/ethdb" - "github.com/ledgerwatch/erigon/ethdb/prune" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common/changeset" + "github.com/erigontech/erigon/ethdb" + "github.com/erigontech/erigon/ethdb/prune" ) type HistoryCfg struct { diff --git a/eth/stagedsync/stage_indexes_test.go b/eth/stagedsync/stage_indexes_test.go index 20100b37f42..cb00afa2ccf 100644 --- a/eth/stagedsync/stage_indexes_test.go +++ b/eth/stagedsync/stage_indexes_test.go @@ -26,24 +26,24 @@ import ( "testing" "time" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/RoaringBitmap/roaring/roaring64" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - kv2 "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/ethdb/prune" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + kv2 "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/ethdb/prune" ) func TestIndexGenerator_GenerateIndex_SimpleCase(t *testing.T) { diff --git a/eth/stagedsync/stage_log_index.go b/eth/stagedsync/stage_log_index.go index b7fd863ff79..e29e59ab490 100644 --- a/eth/stagedsync/stage_log_index.go +++ b/eth/stagedsync/stage_log_index.go @@ -28,18 +28,18 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/ethdb/prune" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/dbutils" + + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/ethdb/prune" ) const ( diff --git a/eth/stagedsync/stage_mining_bor_heimdall.go b/eth/stagedsync/stage_mining_bor_heimdall.go index a3fbc7f4b4a..46716a358c2 100644 --- a/eth/stagedsync/stage_mining_bor_heimdall.go +++ b/eth/stagedsync/stage_mining_bor_heimdall.go @@ -20,13 +20,13 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/dataflow" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/dataflow" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" ) func MiningBorHeimdallForward( diff --git a/eth/stagedsync/stage_mining_bor_heimdall_test.go b/eth/stagedsync/stage_mining_bor_heimdall_test.go index 4c4dc4626c8..a55ca4ade69 100644 --- a/eth/stagedsync/stage_mining_bor_heimdall_test.go +++ b/eth/stagedsync/stage_mining_bor_heimdall_test.go @@ -22,11 +22,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/stagedsync/stagedsynctest" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/eth/stagedsync/stagedsynctest" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/polygon/heimdall" ) func TestMiningBorHeimdallForwardPersistsSpans(t *testing.T) { diff --git a/eth/stagedsync/stage_mining_create_block.go b/eth/stagedsync/stage_mining_create_block.go index fb685f4c30b..c312ddab0d9 100644 --- a/eth/stagedsync/stage_mining_create_block.go +++ b/eth/stagedsync/stage_mining_create_block.go @@ -25,20 +25,20 @@ import ( mapset "github.com/deckarep/golang-set/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/common/debug" - "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/eth/ethutils" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/services" ) type MiningBlock struct { diff --git a/eth/stagedsync/stage_mining_exec.go b/eth/stagedsync/stage_mining_exec.go index 14b8b14b341..2f30c4a6152 100644 --- a/eth/stagedsync/stage_mining_exec.go +++ b/eth/stagedsync/stage_mining_exec.go @@ -28,26 +28,26 @@ import ( "github.com/holiman/uint256" "golang.org/x/net/context" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - state2 "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/kv" - types2 "github.com/ledgerwatch/erigon-lib/types" - "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/types/accounts" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/log/v3" + state2 "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/kv" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/services" ) type MiningExecCfg struct { diff --git a/eth/stagedsync/stage_mining_finish.go b/eth/stagedsync/stage_mining_finish.go index c2333341582..576f755b1e7 100644 --- a/eth/stagedsync/stage_mining_finish.go +++ b/eth/stagedsync/stage_mining_finish.go @@ -19,14 +19,14 @@ package stagedsync import ( "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/services" ) type MiningFinishCfg struct { diff --git a/eth/stagedsync/stage_polygon_sync.go b/eth/stagedsync/stage_polygon_sync.go index 18409f5798d..875981e760d 100644 --- a/eth/stagedsync/stage_polygon_sync.go +++ b/eth/stagedsync/stage_polygon_sync.go @@ -28,22 +28,22 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/p2p" - polygonsync "github.com/ledgerwatch/erigon/polygon/sync" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" + polygonsync "github.com/erigontech/erigon/polygon/sync" + "github.com/erigontech/erigon/turbo/services" ) var updateForkChoiceSuccessErr = errors.New("update fork choice success") diff --git a/eth/stagedsync/stage_postexec.go b/eth/stagedsync/stage_postexec.go index 44c0ceea15b..9f94c5b6fad 100644 --- a/eth/stagedsync/stage_postexec.go +++ b/eth/stagedsync/stage_postexec.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) // PostExec stage is run after execution stage to peform extra verifications that are only possible when state is available. diff --git a/eth/stagedsync/stage_senders.go b/eth/stagedsync/stage_senders.go index 787b09ba3fa..b8b4fdfd800 100644 --- a/eth/stagedsync/stage_senders.go +++ b/eth/stagedsync/stage_senders.go @@ -27,24 +27,24 @@ import ( "github.com/erigontech/secp256k1" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) type SendersCfg struct { diff --git a/eth/stagedsync/stage_senders_test.go b/eth/stagedsync/stage_senders_test.go index 2c2a9512a57..6dd05726abd 100644 --- a/eth/stagedsync/stage_senders_test.go +++ b/eth/stagedsync/stage_senders_test.go @@ -22,20 +22,20 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/turbo/stages/mock" + + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" ) func TestSenders(t *testing.T) { diff --git a/eth/stagedsync/stage_snapshots.go b/eth/stagedsync/stage_snapshots.go index 25f7c9bf481..d420dd51a93 100644 --- a/eth/stagedsync/stage_snapshots.go +++ b/eth/stagedsync/stage_snapshots.go @@ -39,37 +39,37 @@ import ( "github.com/anacrolix/torrent" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/etl" - protodownloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/rawdb" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/silkworm" - "github.com/ledgerwatch/erigon/turbo/snapshotsync" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/kv/temporal" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/etl" + protodownloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/rawdb" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/silkworm" + "github.com/erigontech/erigon/turbo/snapshotsync" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) type SnapshotsCfg struct { diff --git a/eth/stagedsync/stage_trie3.go b/eth/stagedsync/stage_trie3.go index d3827bc064d..50d24fbc4c1 100644 --- a/eth/stagedsync/stage_trie3.go +++ b/eth/stagedsync/stage_trie3.go @@ -23,22 +23,22 @@ import ( "fmt" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" - - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/turbo/services" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/stages/headerdownload" + + "github.com/erigontech/erigon-lib/commitment" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/turbo/services" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/trie" ) func collectAndComputeCommitment(ctx context.Context, tx kv.RwTx, tmpDir string, toTxNum uint64) ([]byte, error) { diff --git a/eth/stagedsync/stage_trie3_test.go b/eth/stagedsync/stage_trie3_test.go index 412fcef4d46..f848859c56c 100644 --- a/eth/stagedsync/stage_trie3_test.go +++ b/eth/stagedsync/stage_trie3_test.go @@ -23,13 +23,13 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func TestRebuildPatriciaTrieBasedOnFiles(t *testing.T) { diff --git a/eth/stagedsync/stage_txlookup.go b/eth/stagedsync/stage_txlookup.go index 6d017673cf4..06b215f0208 100644 --- a/eth/stagedsync/stage_txlookup.go +++ b/eth/stagedsync/stage_txlookup.go @@ -22,18 +22,18 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/polygon/bor/borcfg" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/turbo/services" ) type TxLookupCfg struct { diff --git a/eth/stagedsync/stage_verkle_trie.go b/eth/stagedsync/stage_verkle_trie.go index 5f7d4302a1b..942b9dbecfd 100644 --- a/eth/stagedsync/stage_verkle_trie.go +++ b/eth/stagedsync/stage_verkle_trie.go @@ -20,13 +20,13 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/verkle/verkletrie" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/cmd/verkle/verkletrie" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func SpawnVerkleTrie(s *StageState, u Unwinder, tx kv.RwTx, cfg TrieCfg, ctx context.Context, logger log.Logger) (libcommon.Hash, error) { diff --git a/eth/stagedsync/stagebuilder.go b/eth/stagedsync/stagebuilder.go index a0c6667eb2c..5352b6a4303 100644 --- a/eth/stagedsync/stagebuilder.go +++ b/eth/stagedsync/stagebuilder.go @@ -19,13 +19,13 @@ package stagedsync import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) type ChainEventNotifier interface { diff --git a/eth/stagedsync/stagedsynctest/chain_configs.go b/eth/stagedsync/stagedsynctest/chain_configs.go index 48331f78e00..db27a30a7c2 100644 --- a/eth/stagedsync/stagedsynctest/chain_configs.go +++ b/eth/stagedsync/stagedsynctest/chain_configs.go @@ -17,9 +17,9 @@ package stagedsynctest import ( - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) func BorDevnetChainConfigWithNoBlockSealDelays() *chain.Config { diff --git a/eth/stagedsync/stagedsynctest/harness.go b/eth/stagedsync/stagedsynctest/harness.go index 994e6a5a97e..05f565d27b7 100644 --- a/eth/stagedsync/stagedsynctest/harness.go +++ b/eth/stagedsync/stagedsynctest/harness.go @@ -31,28 +31,28 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/testlog" ) func InitHarness(ctx context.Context, t *testing.T, cfg HarnessCfg) Harness { diff --git a/eth/stagedsync/stages/metrics.go b/eth/stagedsync/stages/metrics.go index 83979b12204..02e1734246d 100644 --- a/eth/stagedsync/stages/metrics.go +++ b/eth/stagedsync/stages/metrics.go @@ -21,8 +21,8 @@ import ( "github.com/huandu/xstrings" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/metrics" ) var SyncMetrics = map[SyncStage]metrics.Gauge{} diff --git a/eth/stagedsync/stages/stages.go b/eth/stagedsync/stages/stages.go index 01d93e50e81..8cc732677e2 100644 --- a/eth/stagedsync/stages/stages.go +++ b/eth/stagedsync/stages/stages.go @@ -20,7 +20,7 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) // SyncStage represents the stages of syncronisation in the Mode.StagedSync mode diff --git a/eth/stagedsync/sync.go b/eth/stagedsync/sync.go index 36366fcaf5c..83541f975a0 100644 --- a/eth/stagedsync/sync.go +++ b/eth/stagedsync/sync.go @@ -22,16 +22,16 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/wrap" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) type Sync struct { diff --git a/eth/stagedsync/sync_test.go b/eth/stagedsync/sync_test.go index e8353d33314..350a1d021ce 100644 --- a/eth/stagedsync/sync_test.go +++ b/eth/stagedsync/sync_test.go @@ -23,12 +23,12 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/wrap" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func TestStagesSuccess(t *testing.T) { diff --git a/eth/stagedsync/testutil.go b/eth/stagedsync/testutil.go index 6664a390fe4..5bb4a71ef13 100644 --- a/eth/stagedsync/testutil.go +++ b/eth/stagedsync/testutil.go @@ -22,9 +22,10 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types/accounts" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types/accounts" ) const ( diff --git a/eth/stagedsync/types.go b/eth/stagedsync/types.go index 62e6318f2ad..a98c22f6708 100644 --- a/eth/stagedsync/types.go +++ b/eth/stagedsync/types.go @@ -16,7 +16,7 @@ package stagedsync -import "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" +import "github.com/erigontech/erigon/turbo/stages/bodydownload" type DownloaderGlue interface { SpawnHeaderDownloadStage([]func() error, *StageState, Unwinder) error diff --git a/eth/tracers/config/api.go b/eth/tracers/config/api.go index 3d0ee9d10fc..a729f644130 100644 --- a/eth/tracers/config/api.go +++ b/eth/tracers/config/api.go @@ -22,9 +22,9 @@ package config import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) // TraceConfig holds extra parameters to trace functions. diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go index a5edad2b008..9a588a9038c 100644 --- a/eth/tracers/internal/tracetest/calltrace_test.go +++ b/eth/tracers/internal/tracetest/calltrace_test.go @@ -30,25 +30,25 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/tracers" - _ "github.com/ledgerwatch/erigon/eth/tracers/js" - _ "github.com/ledgerwatch/erigon/eth/tracers/native" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/tracers" + _ "github.com/erigontech/erigon/eth/tracers/js" + _ "github.com/erigontech/erigon/eth/tracers/native" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/stages/mock" ) type callContext struct { diff --git a/eth/tracers/internal/tracetest/prestate_test.go b/eth/tracers/internal/tracetest/prestate_test.go index 36f4ed7f8bc..2a4a5852ee6 100644 --- a/eth/tracers/internal/tracetest/prestate_test.go +++ b/eth/tracers/internal/tracetest/prestate_test.go @@ -30,17 +30,17 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/tracers" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/tracers" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/stages/mock" ) // prestateTrace is the result of a prestateTrace run. diff --git a/eth/tracers/internal/tracetest/util.go b/eth/tracers/internal/tracetest/util.go index 77530f57a04..40e31fd53c5 100644 --- a/eth/tracers/internal/tracetest/util.go +++ b/eth/tracers/internal/tracetest/util.go @@ -24,7 +24,7 @@ import ( "unicode" // Force-load native and js packages, to trigger registration - _ "github.com/ledgerwatch/erigon/eth/tracers/js" + _ "github.com/erigontech/erigon/eth/tracers/js" ) // To generate a new callTracer test, copy paste the makeTest method below into diff --git a/eth/tracers/js/goja.go b/eth/tracers/js/goja.go index c0c2d12c7eb..7d17ab97271 100644 --- a/eth/tracers/js/goja.go +++ b/eth/tracers/js/goja.go @@ -27,16 +27,17 @@ import ( "github.com/dop251/goja" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/core/vm/stack" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/tracers" - jsassets "github.com/ledgerwatch/erigon/eth/tracers/js/internal/tracers" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/core/vm/stack" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/tracers" + jsassets "github.com/erigontech/erigon/eth/tracers/js/internal/tracers" ) const ( diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go index c8ec6d6e24f..da6578258f7 100644 --- a/eth/tracers/js/tracer_test.go +++ b/eth/tracers/js/tracer_test.go @@ -28,14 +28,15 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/tracers" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/tracers" + "github.com/erigontech/erigon/params" ) type account struct{} diff --git a/eth/tracers/logger/access_list_tracer.go b/eth/tracers/logger/access_list_tracer.go index 09505d15fb6..eb319f14575 100644 --- a/eth/tracers/logger/access_list_tracer.go +++ b/eth/tracers/logger/access_list_tracer.go @@ -23,12 +23,13 @@ import ( "sort" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" ) // accessList is an accumulator for the set of accounts and storage slots an EVM diff --git a/eth/tracers/logger/access_list_tracer_test.go b/eth/tracers/logger/access_list_tracer_test.go index 4110870a267..7da3eda984a 100644 --- a/eth/tracers/logger/access_list_tracer_test.go +++ b/eth/tracers/logger/access_list_tracer_test.go @@ -19,8 +19,8 @@ package logger import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" "github.com/stretchr/testify/require" ) diff --git a/eth/tracers/logger/gen_structlog.go b/eth/tracers/logger/gen_structlog.go index 930120eab04..8175a654249 100644 --- a/eth/tracers/logger/gen_structlog.go +++ b/eth/tracers/logger/gen_structlog.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/vm" ) var _ = (*structLogMarshaling)(nil) diff --git a/eth/tracers/logger/json_stream.go b/eth/tracers/logger/json_stream.go index a97e171c685..7d80e80a62a 100644 --- a/eth/tracers/logger/json_stream.go +++ b/eth/tracers/logger/json_stream.go @@ -23,10 +23,11 @@ import ( "github.com/holiman/uint256" jsoniter "github.com/json-iterator/go" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/vm" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/vm" ) // JsonStreamLogger is an EVM state logger and implements Tracer. diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go index 0f7e53991b6..e97cd1a377d 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -29,13 +29,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" ) var ErrTraceLimitReached = errors.New("the number of logs reached the specified limit") diff --git a/eth/tracers/logger/logger_json.go b/eth/tracers/logger/logger_json.go index 5b6b1f84f32..1d59f0e1dd6 100644 --- a/eth/tracers/logger/logger_json.go +++ b/eth/tracers/logger/logger_json.go @@ -25,11 +25,12 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/vm" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/vm" ) type JSONLogger struct { diff --git a/eth/tracers/logger/logger_test.go b/eth/tracers/logger/logger_test.go index 3a4590f0af8..7042d6a71ff 100644 --- a/eth/tracers/logger/logger_test.go +++ b/eth/tracers/logger/logger_test.go @@ -24,14 +24,14 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm/stack" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/core/vm/stack" + "github.com/erigontech/erigon/params" ) type dummyContractRef struct { diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go index 3e78f2e8532..f7cc63eb654 100644 --- a/eth/tracers/native/4byte.go +++ b/eth/tracers/native/4byte.go @@ -25,11 +25,12 @@ import ( "sync/atomic" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers" ) func init() { diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go index f1781a06474..f9b60edde41 100644 --- a/eth/tracers/native/call.go +++ b/eth/tracers/native/call.go @@ -27,12 +27,12 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers" ) //go:generate gencodec -type callFrame -field-override callFrameMarshaling -out gen_callframe_json.go diff --git a/eth/tracers/native/gen_account_json.go b/eth/tracers/native/gen_account_json.go index df71d65efec..f1f82e56eab 100644 --- a/eth/tracers/native/gen_account_json.go +++ b/eth/tracers/native/gen_account_json.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" ) var _ = (*accountMarshaling)(nil) diff --git a/eth/tracers/native/gen_callframe_json.go b/eth/tracers/native/gen_callframe_json.go index f77eae74457..8133bd0329f 100644 --- a/eth/tracers/native/gen_callframe_json.go +++ b/eth/tracers/native/gen_callframe_json.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/core/vm" ) var _ = (*callFrameMarshaling)(nil) diff --git a/eth/tracers/native/mux.go b/eth/tracers/native/mux.go index 232bc7b167f..c5748b3b444 100644 --- a/eth/tracers/native/mux.go +++ b/eth/tracers/native/mux.go @@ -23,10 +23,11 @@ import ( "encoding/json" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers" ) func init() { diff --git a/eth/tracers/native/noop.go b/eth/tracers/native/noop.go index 6b02a6249cf..862e1a8f0f1 100644 --- a/eth/tracers/native/noop.go +++ b/eth/tracers/native/noop.go @@ -23,10 +23,11 @@ import ( "encoding/json" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers" ) func init() { diff --git a/eth/tracers/native/prestate.go b/eth/tracers/native/prestate.go index f8d8ab4ba36..0f15b86726d 100644 --- a/eth/tracers/native/prestate.go +++ b/eth/tracers/native/prestate.go @@ -25,15 +25,15 @@ import ( "math/big" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/tracers" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/tracers" ) //go:generate gencodec -type account -field-override accountMarshaling -out gen_account_json.go diff --git a/eth/tracers/native/tracer.go b/eth/tracers/native/tracer.go index cfaa09c6d7e..4a6f31adaa5 100644 --- a/eth/tracers/native/tracer.go +++ b/eth/tracers/native/tracer.go @@ -37,7 +37,7 @@ import ( "encoding/json" "errors" - "github.com/ledgerwatch/erigon/eth/tracers" + "github.com/erigontech/erigon/eth/tracers" ) // init registers itself this packages as a lookup for tracers. diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 97b3b70af9b..efecbda3c93 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -24,9 +24,9 @@ import ( "encoding/json" "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/core/vm" ) // Context contains some contextual infos for a transaction execution that is not diff --git a/eth/tracers/tracers_test.go b/eth/tracers/tracers_test.go index bc4d7923c2c..b38e7b22787 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -29,23 +29,23 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/stages/mock" // Force-load native and js packages, to trigger registration - "github.com/ledgerwatch/erigon/eth/tracers" - _ "github.com/ledgerwatch/erigon/eth/tracers/js" - _ "github.com/ledgerwatch/erigon/eth/tracers/native" + "github.com/erigontech/erigon/eth/tracers" + _ "github.com/erigontech/erigon/eth/tracers/js" + _ "github.com/erigontech/erigon/eth/tracers/native" ) func TestPrestateTracerCreate2(t *testing.T) { diff --git a/ethdb/cbor/pool.go b/ethdb/cbor/pool.go index 8f02176fce6..a8f0e22bb42 100644 --- a/ethdb/cbor/pool.go +++ b/ethdb/cbor/pool.go @@ -21,7 +21,7 @@ import ( "github.com/ugorji/go/codec" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var logger = log.New("package", "cbor") diff --git a/ethdb/db_interface.go b/ethdb/db_interface.go index 31273659eb0..1bd4a2d0f21 100644 --- a/ethdb/db_interface.go +++ b/ethdb/db_interface.go @@ -22,7 +22,7 @@ package ethdb import ( "errors" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) // DESCRIBED: For info on database buckets see docs/programmers_guide/db_walkthrough.MD diff --git a/ethdb/kv_util.go b/ethdb/kv_util.go index 9885053d810..d1fb8465d86 100644 --- a/ethdb/kv_util.go +++ b/ethdb/kv_util.go @@ -19,8 +19,8 @@ package ethdb import ( "bytes" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) func Walk(c kv.Cursor, startkey []byte, fixedbits int, walker func(k, v []byte) (bool, error)) error { diff --git a/ethdb/privateapi/all.go b/ethdb/privateapi/all.go index 13b989c0854..f8091fb1769 100644 --- a/ethdb/privateapi/all.go +++ b/ethdb/privateapi/all.go @@ -20,17 +20,17 @@ import ( "fmt" "net" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/log/v3" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/log/v3" ) func StartGrpc(kv *remotedbserver.KvServer, ethBackendSrv *EthBackendServer, txPoolServer txpool_proto.TxpoolServer, diff --git a/ethdb/privateapi/ethbackend.go b/ethdb/privateapi/ethbackend.go index 982894cb191..b9d40d91831 100644 --- a/ethdb/privateapi/ethbackend.go +++ b/ethdb/privateapi/ethbackend.go @@ -23,21 +23,21 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" ) // EthBackendAPIVersion diff --git a/ethdb/privateapi/logsfilter.go b/ethdb/privateapi/logsfilter.go index 80f55b043d7..a791ac60439 100644 --- a/ethdb/privateapi/logsfilter.go +++ b/ethdb/privateapi/logsfilter.go @@ -21,12 +21,12 @@ import ( "io" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/shards" ) type LogsFilterAggregator struct { diff --git a/ethdb/privateapi/logsfilter_test.go b/ethdb/privateapi/logsfilter_test.go index 5e00ee01215..2b63ac9b205 100644 --- a/ethdb/privateapi/logsfilter_test.go +++ b/ethdb/privateapi/logsfilter_test.go @@ -20,13 +20,13 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/shards" ) var ( diff --git a/ethdb/privateapi/mining.go b/ethdb/privateapi/mining.go index 232e4b50a76..b8f9d6e3ea7 100644 --- a/ethdb/privateapi/mining.go +++ b/ethdb/privateapi/mining.go @@ -22,18 +22,18 @@ import ( "errors" "sync" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "google.golang.org/protobuf/types/known/emptypb" - libcommon "github.com/ledgerwatch/erigon-lib/common" - proto_txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + proto_txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" ) // MiningAPIVersion diff --git a/ethdb/prune/storage_mode.go b/ethdb/prune/storage_mode.go index 8ef85275ee6..2b120484ef3 100644 --- a/ethdb/prune/storage_mode.go +++ b/ethdb/prune/storage_mode.go @@ -25,9 +25,9 @@ import ( "reflect" "strings" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/params" ) var DefaultMode = Mode{ diff --git a/ethdb/prune/storage_mode_test.go b/ethdb/prune/storage_mode_test.go index f6d10332967..29abec1f968 100644 --- a/ethdb/prune/storage_mode_test.go +++ b/ethdb/prune/storage_mode_test.go @@ -21,8 +21,8 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/common/math" "github.com/stretchr/testify/assert" ) diff --git a/ethdb/walk.go b/ethdb/walk.go index 083d33e4877..fe31f7548c3 100644 --- a/ethdb/walk.go +++ b/ethdb/walk.go @@ -22,7 +22,7 @@ package ethdb import ( "bytes" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) // splitCursor implements cursor with two keys diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index a7b55596a86..a042435b40a 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -34,21 +34,21 @@ import ( "sync" "time" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" "github.com/gorilla/websocket" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/services" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/p2p/sentry" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/services" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/p2p/sentry" ) const ( diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 08dc4194be9..6abc64247b2 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -22,7 +22,7 @@ package event_test import ( "fmt" - "github.com/ledgerwatch/erigon/event" + "github.com/erigontech/erigon/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 68eab865c71..4df5168a9ed 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -23,7 +23,7 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon/event" + "github.com/erigontech/erigon/event" ) // This example demonstrates how SubscriptionScope can be used to control the lifetime of diff --git a/event/example_subscription_test.go b/event/example_subscription_test.go index 5b936853281..331ecd9f255 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -22,7 +22,7 @@ package event_test import ( "fmt" - "github.com/ledgerwatch/erigon/event" + "github.com/erigontech/erigon/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index 08900beb512..2eda0e2b7fc 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) // Subscription represents a stream of events. The carrier of the events is typically a diff --git a/go.mod b/go.mod index 83a7ff3c15a..e433ce87d92 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ledgerwatch/erigon +module github.com/erigontech/erigon go 1.21.5 @@ -8,7 +8,7 @@ require ( github.com/erigontech/silkworm-go v0.18.0 ) -replace github.com/ledgerwatch/erigon-lib => ./erigon-lib +replace github.com/erigontech/erigon-lib => ./erigon-lib require ( gfx.cafe/util/go/generic v0.0.0-20230721185457-c559e86c829c @@ -34,6 +34,7 @@ require ( github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf github.com/edsrzf/mmap-go v1.1.0 github.com/emicklei/dot v1.6.2 + github.com/erigontech/erigon-lib v0.0.0-00010101000000-000000000000 github.com/fjl/gencodec v0.0.0-20220412091415-8bb9e558978c github.com/gballet/go-verkle v0.0.0-20221121182333-31427a1f2d35 github.com/gfx-labs/sse v0.0.0-20231226060816-f747e26a9baa @@ -60,7 +61,6 @@ require ( github.com/json-iterator/go v1.1.12 github.com/julienschmidt/httprouter v1.3.0 github.com/klauspost/compress v1.17.8 - github.com/ledgerwatch/erigon-lib v0.0.0-00010101000000-000000000000 github.com/libp2p/go-libp2p v0.34.0 github.com/libp2p/go-libp2p-mplex v0.9.0 github.com/libp2p/go-libp2p-pubsub v0.11.0 diff --git a/interfaces.go b/interfaces.go index e850af6360f..37afb4e94f3 100644 --- a/interfaces.go +++ b/interfaces.go @@ -26,10 +26,11 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/migrations/commitment.go b/migrations/commitment.go index 76d97d7b686..5133abbac76 100644 --- a/migrations/commitment.go +++ b/migrations/commitment.go @@ -20,12 +20,12 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + libstate "github.com/erigontech/erigon-lib/state" ) var EnableSqueezeCommitmentFiles = false diff --git a/migrations/db_schema_version.go b/migrations/db_schema_version.go index 6aba4b3e15e..704acff8415 100644 --- a/migrations/db_schema_version.go +++ b/migrations/db_schema_version.go @@ -19,9 +19,9 @@ package migrations import ( "context" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" ) var dbSchemaVersion5 = Migration{ diff --git a/migrations/migrations.go b/migrations/migrations.go index 8cd399efcec..f9026692080 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -23,13 +23,13 @@ import ( "fmt" "path/filepath" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) // migrations apply sequentially in order of this array, skips applied migrations diff --git a/migrations/migrations_test.go b/migrations/migrations_test.go index 9571975eb99..5ff59dd8eb1 100644 --- a/migrations/migrations_test.go +++ b/migrations/migrations_test.go @@ -23,11 +23,11 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func TestApplyWithInit(t *testing.T) { diff --git a/migrations/prohibit_new_downloads2.go b/migrations/prohibit_new_downloads2.go index d04b50682db..d41ec5fa037 100644 --- a/migrations/prohibit_new_downloads2.go +++ b/migrations/prohibit_new_downloads2.go @@ -23,14 +23,14 @@ import ( "os" "path/filepath" - "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/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" ) // Switch to the second version of download.lock. diff --git a/migrations/prohibit_new_downloads_lock.go b/migrations/prohibit_new_downloads_lock.go index e8ef71eb3bc..7dc3ca13c02 100644 --- a/migrations/prohibit_new_downloads_lock.go +++ b/migrations/prohibit_new_downloads_lock.go @@ -21,12 +21,12 @@ import ( "os" "path/filepath" - "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/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) var ProhibitNewDownloadsLock = Migration{ diff --git a/node/endpoints.go b/node/endpoints.go index 1e68366dcbc..b8653bb1e09 100644 --- a/node/endpoints.go +++ b/node/endpoints.go @@ -31,10 +31,10 @@ import ( "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" ) type HttpEndpointConfig struct { diff --git a/node/node.go b/node/node.go index d24d0ec2ebd..704c6745e68 100644 --- a/node/node.go +++ b/node/node.go @@ -32,21 +32,21 @@ import ( "github.com/c2h5oh/datasize" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/debug" "github.com/gofrs/flock" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/migrations" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/migrations" ) // Node is a container on which services can be registered. diff --git a/node/node_example_test.go b/node/node_example_test.go index de29f89e263..85d1a91144a 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -24,9 +24,9 @@ import ( "fmt" log2 "log" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" ) // SampleLifecycle is a trivial network service that can be attached to a node for diff --git a/node/node_test.go b/node/node_test.go index 9a204976d3d..c554f8b0ec2 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -28,12 +28,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/p2p" ) var ( diff --git a/node/nodecfg/config.go b/node/nodecfg/config.go index d489639d2c4..e13c6cb21ab 100644 --- a/node/nodecfg/config.go +++ b/node/nodecfg/config.go @@ -29,15 +29,15 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/paths" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/paths" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/rpc/rpccfg" ) const ( diff --git a/node/nodecfg/config_test.go b/node/nodecfg/config_test.go index 5b5f55d9265..ca48b281c6c 100644 --- a/node/nodecfg/config_test.go +++ b/node/nodecfg/config_test.go @@ -26,10 +26,10 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/log/v3" - node2 "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/log/v3" + node2 "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/nodecfg/defaults.go b/node/nodecfg/defaults.go index 9dccf99e453..68cf6f166f2 100644 --- a/node/nodecfg/defaults.go +++ b/node/nodecfg/defaults.go @@ -20,11 +20,11 @@ package nodecfg import ( - "github.com/ledgerwatch/erigon-lib/direct" + "github.com/erigontech/erigon-lib/direct" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/rpc/rpccfg" ) const ( diff --git a/node/rpcstack.go b/node/rpcstack.go index 9b3802b0fb0..c6ed3e6814f 100644 --- a/node/rpcstack.go +++ b/node/rpcstack.go @@ -33,9 +33,9 @@ import ( "github.com/rs/cors" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" ) // httpConfig is the JSON-RPC/HTTP configuration. diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index fa7aa9daea1..abfb27981fa 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -29,14 +29,14 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "github.com/gorilla/websocket" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/testlog" "github.com/stretchr/testify/assert" ) diff --git a/oss-fuzz.sh b/oss-fuzz.sh index a21aaf0db10..9d70fff6207 100755 --- a/oss-fuzz.sh +++ b/oss-fuzz.sh @@ -27,7 +27,7 @@ # $LIB_FUZZING_ENGINE C++ compiler argument to link fuzz target against the prebuilt engine library (e.g. libFuzzer). # This sets the -coverpgk for the coverage report when the corpus is executed through go test -coverpkg="github.com/ledgerwatch/erigon/..." +coverpkg="github.com/erigontech/erigon/..." function coverbuild { path=$1 diff --git a/p2p/dial.go b/p2p/dial.go index 6da7edf04df..b9523ed66f5 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -31,11 +31,11 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 486fad4c1a7..d88f1ca93eb 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -30,11 +30,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/netutil" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/netutil" + "github.com/erigontech/erigon/turbo/testlog" ) // This test checks that dynamic dials are launched from discovery results. diff --git a/p2p/discover/common.go b/p2p/discover/common.go index fee6c4fee03..e2791174ef6 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -25,13 +25,13 @@ import ( "net" "time" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/netutil" ) // UDPConn is a network connection on which discovery can operate. diff --git a/p2p/discover/lookup.go b/p2p/discover/lookup.go index 44de68e2386..fdc3d778cb9 100644 --- a/p2p/discover/lookup.go +++ b/p2p/discover/lookup.go @@ -23,7 +23,7 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enode" ) // lookup performs a network search for nodes close to the given target. It approaches the diff --git a/p2p/discover/lookup_util_test.go b/p2p/discover/lookup_util_test.go index 801eb3301fa..a6f19b726b8 100644 --- a/p2p/discover/lookup_util_test.go +++ b/p2p/discover/lookup_util_test.go @@ -28,10 +28,10 @@ import ( "sort" "testing" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/discover/v4wire" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/discover/v4wire" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) // This is the test network for the Lookup test. diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 1be6cf7b0bf..fc2ba511e41 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -23,7 +23,7 @@ import ( "net" "time" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index d95ed5478b4..d0a7d2a4016 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -28,8 +28,8 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/debug" ) const ( diff --git a/p2p/discover/table.go b/p2p/discover/table.go index b117869ea10..3fb9a240d31 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -36,12 +36,12 @@ import ( "sync/atomic" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 34f77f8e833..18dd5dae357 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -30,11 +30,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/netutil" ) func TestTable_pingReplace(t *testing.T) { diff --git a/p2p/discover/table_util_test.go b/p2p/discover/table_util_test.go index fca82b417d1..76494b3a1aa 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -34,10 +34,10 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) var nullNode *enode.Node diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go index 5b9c5d39836..303baf67427 100644 --- a/p2p/discover/v4_lookup_test.go +++ b/p2p/discover/v4_lookup_test.go @@ -29,10 +29,10 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/discover/v4wire" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/discover/v4wire" + "github.com/erigontech/erigon/p2p/enode" ) func TestUDPv4_Lookup(t *testing.T) { diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index 8799c07c766..1bcba52c113 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -33,13 +33,13 @@ import ( lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/discover/v4wire" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/discover/v4wire" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/netutil" ) // Errors diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index 1e428461cfb..ddb172ba757 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -37,12 +37,12 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/testlog" - "github.com/ledgerwatch/erigon/p2p/discover/v4wire" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/discover/v4wire" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) // shared test variables @@ -553,7 +553,7 @@ func TestUDPv4_EIP868(t *testing.T) { // This test verifies that a small network of nodes can boot up into a healthy state. func TestUDPv4_smallNetConvergence(t *testing.T) { - t.Skip("FIXME: https://github.com/ledgerwatch/erigon/issues/8731") + t.Skip("FIXME: https://github.com/erigontech/erigon/issues/8731") t.Parallel() logger := log.New() diff --git a/p2p/discover/v4wire/v4wire.go b/p2p/discover/v4wire/v4wire.go index 154998db94e..24eee6c717b 100644 --- a/p2p/discover/v4wire/v4wire.go +++ b/p2p/discover/v4wire/v4wire.go @@ -30,10 +30,10 @@ import ( "net" "time" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) // RPC packet types diff --git a/p2p/discover/v4wire/v4wire_test.go b/p2p/discover/v4wire/v4wire_test.go index da416f9f688..c6ce5cc5fea 100644 --- a/p2p/discover/v4wire/v4wire_test.go +++ b/p2p/discover/v4wire/v4wire_test.go @@ -26,8 +26,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // EIP-8 test vectors. diff --git a/p2p/discover/v5_lookup_test.go b/p2p/discover/v5_lookup_test.go index 683301a589e..f64da8b2625 100644 --- a/p2p/discover/v5_lookup_test.go +++ b/p2p/discover/v5_lookup_test.go @@ -25,9 +25,9 @@ import ( "sort" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/discover/v5wire" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/discover/v5wire" + "github.com/erigontech/erigon/p2p/enode" ) // This test checks that lookup works. diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index bcc80d9665b..d28120b5303 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -32,14 +32,14 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/discover/v5wire" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/discover/v5wire" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/netutil" ) const ( diff --git a/p2p/discover/v5_udp_integration_test.go b/p2p/discover/v5_udp_integration_test.go index 3ee4ea7e72e..d6ae72395ac 100644 --- a/p2p/discover/v5_udp_integration_test.go +++ b/p2p/discover/v5_udp_integration_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/discover/v5wire" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/discover/v5wire" ) // This test checks that pending calls are re-sent when a handshake happens. diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go index 5ca765d0228..fa770f619b3 100644 --- a/p2p/discover/v5_udp_test.go +++ b/p2p/discover/v5_udp_test.go @@ -34,13 +34,13 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/testlog" - "github.com/ledgerwatch/erigon/p2p/discover/v5wire" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/p2p/discover/v5wire" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) func startLocalhostV5(t *testing.T, cfg Config, logger log.Logger) *UDPv5 { diff --git a/p2p/discover/v5wire/crypto.go b/p2p/discover/v5wire/crypto.go index c6916fba403..b03cbcee5cc 100644 --- a/p2p/discover/v5wire/crypto.go +++ b/p2p/discover/v5wire/crypto.go @@ -28,9 +28,9 @@ import ( "fmt" "hash" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" "golang.org/x/crypto/hkdf" ) diff --git a/p2p/discover/v5wire/crypto_test.go b/p2p/discover/v5wire/crypto_test.go index e018b70b32c..0706839350f 100644 --- a/p2p/discover/v5wire/crypto_test.go +++ b/p2p/discover/v5wire/crypto_test.go @@ -28,11 +28,11 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" ) func TestVector_ECDH(t *testing.T) { diff --git a/p2p/discover/v5wire/encoding.go b/p2p/discover/v5wire/encoding.go index f8efc0c9e32..4b4ed628a97 100644 --- a/p2p/discover/v5wire/encoding.go +++ b/p2p/discover/v5wire/encoding.go @@ -31,10 +31,10 @@ import ( "fmt" "hash" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) // TODO concurrent WHOAREYOU tie-breaker diff --git a/p2p/discover/v5wire/encoding_test.go b/p2p/discover/v5wire/encoding_test.go index 71a861e8d93..15039602e8a 100644 --- a/p2p/discover/v5wire/encoding_test.go +++ b/p2p/discover/v5wire/encoding_test.go @@ -34,14 +34,14 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" ) // To regenerate discv5 test vectors, run diff --git a/p2p/discover/v5wire/msg.go b/p2p/discover/v5wire/msg.go index eec343f89ee..4931db883bc 100644 --- a/p2p/discover/v5wire/msg.go +++ b/p2p/discover/v5wire/msg.go @@ -23,10 +23,10 @@ import ( "fmt" "net" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) // Packet is implemented by all message types. diff --git a/p2p/discover/v5wire/session.go b/p2p/discover/v5wire/session.go index 84518410ffe..28125a35fd6 100644 --- a/p2p/discover/v5wire/session.go +++ b/p2p/discover/v5wire/session.go @@ -25,9 +25,9 @@ import ( "encoding/binary" "time" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" "github.com/hashicorp/golang-lru/v2/simplelru" ) diff --git a/p2p/dnsdisc/client.go b/p2p/dnsdisc/client.go index b5456628db4..850f5004532 100644 --- a/p2p/dnsdisc/client.go +++ b/p2p/dnsdisc/client.go @@ -34,11 +34,11 @@ import ( "golang.org/x/sync/singleflight" "golang.org/x/time/rate" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) // Client discovers nodes by querying DNS servers. diff --git a/p2p/dnsdisc/client_test.go b/p2p/dnsdisc/client_test.go index 32039dfbb64..54518087413 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/turbo/testlog" ) var signingKeyForTesting, _ = crypto.ToECDSA(hexutil.MustDecode("0xdc599867fc513f8f5e2c2c9c489cde5e71362d1d9ec6e693e0de063236ed1240")) diff --git a/p2p/dnsdisc/sync.go b/p2p/dnsdisc/sync.go index 444999d609c..36eb8e7a7a9 100644 --- a/p2p/dnsdisc/sync.go +++ b/p2p/dnsdisc/sync.go @@ -24,8 +24,8 @@ import ( "math/rand" "time" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/p2p/enode" ) // This is the number of consecutive leaf requests that may fail before diff --git a/p2p/dnsdisc/tree.go b/p2p/dnsdisc/tree.go index 84dca5ec78a..64105a172e8 100644 --- a/p2p/dnsdisc/tree.go +++ b/p2p/dnsdisc/tree.go @@ -29,10 +29,10 @@ import ( "slices" "strings" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/dnsdisc/tree_test.go b/p2p/dnsdisc/tree_test.go index aa8efa8e1cb..b81a0f33295 100644 --- a/p2p/dnsdisc/tree_test.go +++ b/p2p/dnsdisc/tree_test.go @@ -25,9 +25,9 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enode" ) func TestParseRoot(t *testing.T) { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index 8461d6ab2ab..f0a3b8f6365 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -24,10 +24,10 @@ import ( "fmt" "io" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/discover/v4wire" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/discover/v4wire" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0d0dc89b0a8..136e0765cf9 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -26,9 +26,9 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enode/iter.go b/p2p/enode/iter.go index bd5a8ae2b09..7a06c187fcc 100644 --- a/p2p/enode/iter.go +++ b/p2p/enode/iter.go @@ -23,7 +23,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon/common/debug" + "github.com/erigontech/erigon/common/debug" ) // Iterator represents a sequence of nodes. The Next method moves to the next node in the diff --git a/p2p/enode/iter_test.go b/p2p/enode/iter_test.go index 590b1e6e974..7ff0dddd601 100644 --- a/p2p/enode/iter_test.go +++ b/p2p/enode/iter_test.go @@ -26,7 +26,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/enr" ) func TestReadNodes(t *testing.T) { diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index a4a37f629f8..51bb52c13bc 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -29,9 +29,9 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 9a0deee4c89..57692388cf0 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -27,9 +27,9 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enr" ) func newLocalNodeForTesting(tmpDir string, logger log.Logger) (*LocalNode, *DB) { diff --git a/p2p/enode/node.go b/p2p/enode/node.go index ec3a99cac71..a504b719fdd 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -29,8 +29,8 @@ import ( "net" "strings" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) var errMissingPrefix = errors.New("missing 'enr:' prefix for base64-encoded record") diff --git a/p2p/enode/node_test.go b/p2p/enode/node_test.go index 08d2bf5ec23..5aae5d2ddcf 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -27,8 +27,8 @@ import ( "testing" "testing/quick" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index a2661d6fb69..498733f2b24 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -33,11 +33,11 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon/rlp" ) // Keys in the node database. diff --git a/p2p/enode/nodedb_test.go b/p2p/enode/nodedb_test.go index b16253a13b4..ae0b5a58623 100644 --- a/p2p/enode/nodedb_test.go +++ b/p2p/enode/nodedb_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var keytestID = HexID("51232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439") diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index c735b6d4a2b..48ffb6bd901 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -29,8 +29,8 @@ import ( "regexp" "strconv" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enr" ) var ( diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index 61d6bf12417..9d5c2e30e98 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enr" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 3aa2061318a..6b1719c39a3 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -43,7 +43,7 @@ import ( "io" "sort" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) const SizeLimit = 300 // maximum encoded size of a node record in bytes diff --git a/p2p/enr/enr_test.go b/p2p/enr/enr_test.go index 5d39aa093ee..bfcd5f74806 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index dee2c1956cf..d433d46706c 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -24,7 +24,7 @@ import ( "io" "net" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 84084b22f0e..c847e353a82 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -28,10 +28,10 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/event" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/event" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index e1d78bcaaaf..6d8698e7745 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -24,7 +24,7 @@ package p2p import ( "net" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) const ( diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 4b25631f57b..869f1eb2f3e 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -28,7 +28,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" natpmp "github.com/jackpal/go-nat-pmp" ) diff --git a/p2p/nat/natpmp.go b/p2p/nat/natpmp.go index d263282ecb2..4d29a5ddc93 100644 --- a/p2p/nat/natpmp.go +++ b/p2p/nat/natpmp.go @@ -26,7 +26,8 @@ import ( "time" natpmp "github.com/jackpal/go-nat-pmp" - "github.com/ledgerwatch/erigon/common/debug" + + "github.com/erigontech/erigon/common/debug" ) // natPMPClient adapts the NAT-PMP protocol implementation so it conforms to diff --git a/p2p/nat/natupnp.go b/p2p/nat/natupnp.go index 32cb358f804..062570ead7a 100644 --- a/p2p/nat/natupnp.go +++ b/p2p/nat/natupnp.go @@ -30,7 +30,8 @@ import ( "github.com/huin/goupnp" "github.com/huin/goupnp/dcps/internetgateway1" "github.com/huin/goupnp/dcps/internetgateway2" - "github.com/ledgerwatch/erigon/common/debug" + + "github.com/erigontech/erigon/common/debug" ) const ( diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index d74306373b4..c902bf97dbc 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -22,7 +22,7 @@ package netutil import ( "time" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) // IPTracker predicts the external endpoint, i.e. IP address and port, of the local host diff --git a/p2p/netutil/iptrack_test.go b/p2p/netutil/iptrack_test.go index 98a66fe486e..98c9131ad92 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -25,7 +25,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) const ( diff --git a/p2p/node_key_config.go b/p2p/node_key_config.go index 0e8fa3ca102..acbd401c7fa 100644 --- a/p2p/node_key_config.go +++ b/p2p/node_key_config.go @@ -22,7 +22,7 @@ import ( "os" "path" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) type NodeKeyConfig struct { diff --git a/p2p/peer.go b/p2p/peer.go index 62d3f751bba..68a27573c0e 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -29,15 +29,15 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/event" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/event" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/p2p/peer_test.go b/p2p/peer_test.go index 021f2d36b79..0c4cd0c7535 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -31,10 +31,10 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) var discard = Protocol{ diff --git a/p2p/protocol.go b/p2p/protocol.go index 05cc84164d0..9a16a69c9d4 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -22,8 +22,8 @@ package p2p import ( "fmt" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx/buffer_test.go b/p2p/rlpx/buffer_test.go index 895d21abfee..0c3e71db958 100644 --- a/p2p/rlpx/buffer_test.go +++ b/p2p/rlpx/buffer_test.go @@ -23,7 +23,7 @@ import ( "bytes" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/stretchr/testify/assert" ) diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go index 0ba15dc0bf1..9fcc74a58e1 100644 --- a/p2p/rlpx/rlpx.go +++ b/p2p/rlpx/rlpx.go @@ -38,10 +38,11 @@ import ( "time" "github.com/golang/snappy" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/ecies" - "github.com/ledgerwatch/erigon/rlp" "golang.org/x/crypto/sha3" + + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/ecies" + "github.com/erigontech/erigon/rlp" ) // Conn is an RLPx network connection. It wraps a low-level network connection. The diff --git a/p2p/rlpx/rlpx_test.go b/p2p/rlpx/rlpx_test.go index 6e3ed9ea4ce..a7db3c69a0d 100644 --- a/p2p/rlpx/rlpx_test.go +++ b/p2p/rlpx/rlpx_test.go @@ -32,10 +32,10 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/ecies" - "github.com/ledgerwatch/erigon/p2p/simulations/pipes" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/ecies" + "github.com/erigontech/erigon/p2p/simulations/pipes" + "github.com/erigontech/erigon/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/sentry/eth_handshake.go b/p2p/sentry/eth_handshake.go index 04c848b9263..53b29166a5a 100644 --- a/p2p/sentry/eth_handshake.go +++ b/p2p/sentry/eth_handshake.go @@ -19,11 +19,11 @@ package sentry import ( "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p" ) func readAndValidatePeerStatusMessage( diff --git a/p2p/sentry/eth_handshake_test.go b/p2p/sentry/eth_handshake_test.go index 030add0063e..e1c2b9d43ea 100644 --- a/p2p/sentry/eth_handshake_test.go +++ b/p2p/sentry/eth_handshake_test.go @@ -23,14 +23,14 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/params" ) func TestCheckPeerStatusCompatibility(t *testing.T) { diff --git a/p2p/sentry/sentry_grpc_server.go b/p2p/sentry/sentry_grpc_server.go index dd5ff90f71a..b27d791f2ee 100644 --- a/p2p/sentry/sentry_grpc_server.go +++ b/p2p/sentry/sentry_grpc_server.go @@ -39,27 +39,27 @@ import ( "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "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/diagnostics" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - proto_types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/dnsdisc" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + proto_types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/dnsdisc" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) const ( diff --git a/p2p/sentry/sentry_grpc_server_test.go b/p2p/sentry/sentry_grpc_server_test.go index 683d436c193..079301d1a92 100644 --- a/p2p/sentry/sentry_grpc_server_test.go +++ b/p2p/sentry/sentry_grpc_server_test.go @@ -25,20 +25,20 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/p2p" ) func testSentryServer(db kv.Getter, genesis *types.Genesis, genesisHash libcommon.Hash) *GrpcServer { diff --git a/p2p/sentry/sentry_multi_client/broadcast.go b/p2p/sentry/sentry_multi_client/broadcast.go index ded60d13706..702f8d2f84f 100644 --- a/p2p/sentry/sentry_multi_client/broadcast.go +++ b/p2p/sentry/sentry_multi_client/broadcast.go @@ -25,15 +25,15 @@ import ( "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) func (cs *MultiClient) PropagateNewBlockHashes(ctx context.Context, announces []headerdownload.Announce) { diff --git a/p2p/sentry/sentry_multi_client/sentry_api.go b/p2p/sentry/sentry_multi_client/sentry_api.go index cea7698a6f8..0213d9834d6 100644 --- a/p2p/sentry/sentry_multi_client/sentry_api.go +++ b/p2p/sentry/sentry_multi_client/sentry_api.go @@ -22,15 +22,15 @@ import ( "google.golang.org/grpc" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) // Methods of sentry called by Core diff --git a/p2p/sentry/sentry_multi_client/sentry_multi_client.go b/p2p/sentry/sentry_multi_client/sentry_multi_client.go index 0d481f43cbf..f370448e1bd 100644 --- a/p2p/sentry/sentry_multi_client/sentry_multi_client.go +++ b/p2p/sentry/sentry_multi_client/sentry_multi_client.go @@ -22,40 +22,40 @@ import ( "encoding/hex" "errors" "fmt" - lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/turbo/jsonrpc/receipts" - "golang.org/x/sync/semaphore" "math/rand" "sort" "sync" "time" "github.com/c2h5oh/datasize" + lru "github.com/hashicorp/golang-lru/v2" + "golang.org/x/sync/semaphore" "google.golang.org/grpc" "google.golang.org/grpc/backoff" "google.golang.org/grpc/credentials/insecure" "google.golang.org/grpc/keepalive" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - proto_types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + proto_types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/jsonrpc/receipts" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) type ( diff --git a/p2p/sentry/simulator/sentry_simulator.go b/p2p/sentry/simulator/sentry_simulator.go index b4c328b987d..ca6947050e0 100644 --- a/p2p/sentry/simulator/sentry_simulator.go +++ b/p2p/sentry/simulator/sentry_simulator.go @@ -24,26 +24,26 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - isentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - coretypes "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/discover/v4wire" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/gointerfaces" + isentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon/cmd/snapshots/sync" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + coretypes "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/discover/v4wire" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) type server struct { diff --git a/p2p/sentry/simulator/simulator_test.go b/p2p/sentry/simulator/simulator_test.go index d2de98916c7..53b85407b14 100644 --- a/p2p/sentry/simulator/simulator_test.go +++ b/p2p/sentry/simulator/simulator_test.go @@ -23,14 +23,14 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - sentry_if "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/p2p/sentry/simulator" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + sentry_if "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/p2p/sentry/simulator" + "github.com/erigontech/erigon/rlp" ) func TestSimulatorStart(t *testing.T) { diff --git a/p2p/sentry/status_data_provider.go b/p2p/sentry/status_data_provider.go index 5ae0e8fbc71..f8db9e9cab7 100644 --- a/p2p/sentry/status_data_provider.go +++ b/p2p/sentry/status_data_provider.go @@ -24,16 +24,16 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/forkid" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/forkid" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" ) var ErrNoHead = errors.New("ReadChainHead: ReadCurrentHeader error") diff --git a/p2p/server.go b/p2p/server.go index 5b1199b4823..328e8613f1c 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -37,18 +37,18 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/common/mclock" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/event" - "github.com/ledgerwatch/erigon/p2p/discover" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/common/mclock" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/event" + "github.com/erigontech/erigon/p2p/discover" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/p2p/netutil" ) const ( diff --git a/p2p/server_test.go b/p2p/server_test.go index 4dc627925ff..acde74e77d5 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -32,11 +32,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/p2p/rlpx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/p2p/rlpx" ) type testTransport struct { diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index ac350571781..0e933f40b38 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -26,7 +26,7 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon/p2p/simulations/pipes" + "github.com/erigontech/erigon/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index 9f2bd27f212..da863f6030a 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -27,13 +27,13 @@ import ( "net" "strconv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rpc" "github.com/gorilla/websocket" ) diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index 32d93bc00bb..b2bd41a8c06 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -23,7 +23,7 @@ import ( "errors" "strings" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enode" ) var ( diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index ece86034b01..4c990b85023 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -31,16 +31,16 @@ import ( "strings" "sync" - "github.com/ledgerwatch/erigon/event" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/simulations/adapters" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/event" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/simulations/adapters" + "github.com/erigontech/erigon/rpc" "github.com/gorilla/websocket" "github.com/julienschmidt/httprouter" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // DefaultClient is the default simulation API client which expects the API diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 9cf5651f27c..b9105f3b8fa 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -27,9 +27,9 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/simulations/adapters" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/simulations/adapters" ) // a map of mocker names to its function diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 738ea6dc78f..d3b217a109d 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -30,11 +30,11 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/event" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/simulations/adapters" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/event" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index 9bfca6d530d..ac73524e27e 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -23,7 +23,7 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enode" ) // Simulation provides a framework for running actions in a simulated network diff --git a/p2p/simulations/test.go b/p2p/simulations/test.go index 68350a2da31..06393353ec4 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -22,10 +22,10 @@ package simulations import ( "testing" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/enode" - "github.com/ledgerwatch/erigon/p2p/enr" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/enode" + "github.com/erigontech/erigon/p2p/enr" + "github.com/erigontech/erigon/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/transport.go b/p2p/transport.go index c97e2a0b1bf..2135a5b51de 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -29,10 +29,10 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/bitutil" - "github.com/ledgerwatch/erigon/p2p/rlpx" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/common/bitutil" + "github.com/erigontech/erigon/p2p/rlpx" + "github.com/erigontech/erigon/rlp" ) const ( @@ -105,7 +105,7 @@ func (t *rlpxTransport) WriteMsg(msg Msg) error { // Set metrics. msg.meterSize = size - // TODO: use "github.com/ledgerwatch/erigon-lib/metrics" + // TODO: use "github.com/erigontech/erigon-lib/metrics" //if metrics.Enabled && msg.meterCap.Name != "" { // don't meter non-subprotocol messages // m := fmt.Sprintf("%s/%s/%d/%#02x", egressMeterName, msg.meterCap.Name, msg.meterCap.Version, msg.meterCode) // metrics.GetOrRegisterMeter(m, nil).Mark(int64(msg.meterSize)) diff --git a/p2p/transport_test.go b/p2p/transport_test.go index 9f76d7fa032..1f46b0cc0a1 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -26,11 +26,11 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/p2p/simulations/pipes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/p2p/simulations/pipes" ) func TestProtocolHandshake(t *testing.T) { diff --git a/p2p/util.go b/p2p/util.go index 7db34816383..b6b1fb5e594 100644 --- a/p2p/util.go +++ b/p2p/util.go @@ -22,7 +22,7 @@ package p2p import ( "container/heap" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) // expHeap tracks strings and their expiry time. diff --git a/p2p/util_test.go b/p2p/util_test.go index b66e0ea468e..956aa72d011 100644 --- a/p2p/util_test.go +++ b/p2p/util_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/common/mclock" + "github.com/erigontech/erigon/common/mclock" ) func TestExpHeap(t *testing.T) { diff --git a/params/bootnodes.go b/params/bootnodes.go index 8b7fcd58dc5..0bd101ac392 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -20,8 +20,8 @@ package params import ( - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" ) // MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on @@ -54,7 +54,7 @@ var SepoliaBootnodes = []string{ } var SepoliaStaticPeers = []string{ - // from https://github.com/ledgerwatch/erigon/issues/6134#issuecomment-1354923418 + // from https://github.com/erigontech/erigon/issues/6134#issuecomment-1354923418 "enode://8ae4559db1b1e160be8cc46018d7db123ed6d03fbbfe481da5ec05f71f0aa4d5f4b02ad059127096aa994568706a0d02933984083b87c5e1e3de2b7692444d37@35.161.233.158:46855", "enode://d0b3b290422f35ec3e68356f3a4cdf9c661f71a868110670e31441a5021d7abd0440ae8dfb9360aafdd0198f177863361e3a7a7eb5e1a3e26575bf1ac3ef4ab3@162.19.136.65:48264", "enode://d64624bda3cdb65d542c90757a4a661cfe9dddf8328bdb1ea97a8d70fad287c360f0101c492d8fd6ab30d79160a3bf148cacfd68f5d2e47eab0b709516419304@51.195.63.10:30040", diff --git a/params/config.go b/params/config.go index 15994b2ff40..92ca47ba91f 100644 --- a/params/config.go +++ b/params/config.go @@ -26,12 +26,12 @@ import ( "math/big" "path" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/common/paths" + "github.com/erigontech/erigon/common/paths" ) //go:embed chainspecs diff --git a/params/config_test.go b/params/config_test.go index 638e396448b..95ac0f9a181 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -27,8 +27,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" ) func TestCheckCompatible(t *testing.T) { diff --git a/params/dao.go b/params/dao.go index e50fe5872e1..c8a21258b8f 100644 --- a/params/dao.go +++ b/params/dao.go @@ -22,9 +22,9 @@ package params import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/params/mining.go b/params/mining.go index 5670765f54b..7993d3be43a 100644 --- a/params/mining.go +++ b/params/mining.go @@ -21,8 +21,8 @@ import ( "math/big" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) // MiningConfig is the configuration parameters of mining. diff --git a/params/protocol_params.go b/params/protocol_params.go index a775a5ec9f7..995108bb216 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -22,7 +22,7 @@ package params import ( "math/big" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) const ( diff --git a/params/version.go b/params/version.go index 5cc4d5b6b98..eb0c5315ed3 100644 --- a/params/version.go +++ b/params/version.go @@ -22,7 +22,7 @@ package params import ( "fmt" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) var ( diff --git a/polygon/bor/bor.go b/polygon/bor/bor.go index 64756ebd82e..e1039762179 100644 --- a/polygon/bor/bor.go +++ b/polygon/bor/bor.go @@ -38,36 +38,36 @@ import ( "golang.org/x/crypto/sha3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/kv" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/crypto/cryptopool" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/finality" - "github.com/ledgerwatch/erigon/polygon/bor/finality/flags" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" - "github.com/ledgerwatch/erigon/polygon/bor/statefull" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/bridge" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/finality" + "github.com/erigontech/erigon/polygon/bor/finality/flags" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon/polygon/bor/statefull" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/bridge" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/services" ) const ( diff --git a/polygon/bor/bor_test.go b/polygon/bor/bor_test.go index 1015846766f..cd3956f2027 100644 --- a/polygon/bor/bor_test.go +++ b/polygon/bor/bor_test.go @@ -24,26 +24,26 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/heimdall" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/heimdall" + + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages/mock" ) type test_heimdall struct { diff --git a/polygon/bor/borcfg/bor_config.go b/polygon/bor/borcfg/bor_config.go index 44f3f675d0c..a8e80873cca 100644 --- a/polygon/bor/borcfg/bor_config.go +++ b/polygon/bor/borcfg/bor_config.go @@ -21,7 +21,7 @@ import ( "sort" "strconv" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // BorConfig is the consensus engine configs for Matic bor based sealing. diff --git a/polygon/bor/bordb/prune.go b/polygon/bor/bordb/prune.go index 40580e14f5e..c1e9949ed41 100644 --- a/polygon/bor/bordb/prune.go +++ b/polygon/bor/bordb/prune.go @@ -21,9 +21,9 @@ import ( "errors" "math" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/polygon/heimdall" ) // PruneBorBlocks - delete [1, to) old blocks after moving it to snapshots. diff --git a/polygon/bor/fake.go b/polygon/bor/fake.go index f542e5b9ad6..ce9b74eb57b 100644 --- a/polygon/bor/fake.go +++ b/polygon/bor/fake.go @@ -17,12 +17,12 @@ package bor import ( - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" ) type FakeBor struct { diff --git a/polygon/bor/fee_log.go b/polygon/bor/fee_log.go index 618bf8d4d4e..29ee63acf6d 100644 --- a/polygon/bor/fee_log.go +++ b/polygon/bor/fee_log.go @@ -19,10 +19,10 @@ package bor import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" ) var transferLogSig = libcommon.HexToHash("0xe6497e3ee548a3372136af2fcb0696db31fc6cf20260707645068bd3fe97f3c4") diff --git a/polygon/bor/finality/api.go b/polygon/bor/finality/api.go index 59373dd4eb7..c249928bf45 100644 --- a/polygon/bor/finality/api.go +++ b/polygon/bor/finality/api.go @@ -17,11 +17,11 @@ package finality import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" ) func GetFinalizedBlockNumber(tx kv.Tx) uint64 { diff --git a/polygon/bor/finality/bor_verifier.go b/polygon/bor/finality/bor_verifier.go index 9b37fe5ae7d..8caaac133a0 100644 --- a/polygon/bor/finality/bor_verifier.go +++ b/polygon/bor/finality/bor_verifier.go @@ -22,11 +22,11 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" ) var ( diff --git a/polygon/bor/finality/generics/generics.go b/polygon/bor/finality/generics/generics.go index cbcb7fe4587..014572c3ae9 100644 --- a/polygon/bor/finality/generics/generics.go +++ b/polygon/bor/finality/generics/generics.go @@ -17,8 +17,8 @@ package generics import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" ) func Empty[T any]() (t T) { diff --git a/polygon/bor/finality/rawdb/checkpoint.go b/polygon/bor/finality/rawdb/checkpoint.go index 14213236b9c..c444344c64a 100644 --- a/polygon/bor/finality/rawdb/checkpoint.go +++ b/polygon/bor/finality/rawdb/checkpoint.go @@ -20,7 +20,7 @@ package rawdb import ( "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/polygon/bor/finality/rawdb/milestone.go b/polygon/bor/finality/rawdb/milestone.go index 4d6021bcb6a..7657694597c 100644 --- a/polygon/bor/finality/rawdb/milestone.go +++ b/polygon/bor/finality/rawdb/milestone.go @@ -21,10 +21,10 @@ import ( "encoding/json" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/polygon/bor/finality/generics" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/polygon/bor/finality/generics" ) var ( diff --git a/polygon/bor/finality/whitelist.go b/polygon/bor/finality/whitelist.go index db2247254e4..7dffe9d363d 100644 --- a/polygon/bor/finality/whitelist.go +++ b/polygon/bor/finality/whitelist.go @@ -22,13 +22,13 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/polygon/bor/finality/flags" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/polygon/bor/finality/flags" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/services" ) type config struct { diff --git a/polygon/bor/finality/whitelist/checkpoint.go b/polygon/bor/finality/whitelist/checkpoint.go index be00e7692e7..a4806c82054 100644 --- a/polygon/bor/finality/whitelist/checkpoint.go +++ b/polygon/bor/finality/whitelist/checkpoint.go @@ -17,10 +17,10 @@ package whitelist import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/finality/rawdb" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/finality/rawdb" ) type checkpoint struct { diff --git a/polygon/bor/finality/whitelist/finality.go b/polygon/bor/finality/whitelist/finality.go index e25cd604b28..fbf8b225a52 100644 --- a/polygon/bor/finality/whitelist/finality.go +++ b/polygon/bor/finality/whitelist/finality.go @@ -19,11 +19,11 @@ package whitelist import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/finality/rawdb" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/finality/rawdb" ) type finality[T rawdb.BlockFinality[T]] struct { diff --git a/polygon/bor/finality/whitelist/milestone.go b/polygon/bor/finality/whitelist/milestone.go index c42242e0510..2fbb1f735b5 100644 --- a/polygon/bor/finality/whitelist/milestone.go +++ b/polygon/bor/finality/whitelist/milestone.go @@ -17,12 +17,12 @@ package whitelist import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/finality/flags" - "github.com/ledgerwatch/erigon/polygon/bor/finality/rawdb" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/finality/flags" + "github.com/erigontech/erigon/polygon/bor/finality/rawdb" ) type milestone struct { diff --git a/polygon/bor/finality/whitelist/service.go b/polygon/bor/finality/whitelist/service.go index eef8e2270c3..db6f84dcbc6 100644 --- a/polygon/bor/finality/whitelist/service.go +++ b/polygon/bor/finality/whitelist/service.go @@ -19,10 +19,10 @@ package whitelist import ( "errors" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/finality/rawdb" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/finality/rawdb" ) var ( diff --git a/polygon/bor/finality/whitelist/service_test.go b/polygon/bor/finality/whitelist/service_test.go index 5a9f211a6fc..57012569b66 100644 --- a/polygon/bor/finality/whitelist/service_test.go +++ b/polygon/bor/finality/whitelist/service_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/finality/rawdb" + "github.com/erigontech/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/finality/rawdb" "github.com/stretchr/testify/require" "pgregory.net/rapid" diff --git a/polygon/bor/finality/whitelist_helpers.go b/polygon/bor/finality/whitelist_helpers.go index 4bc8f4b6ceb..5e3edb6c5ea 100644 --- a/polygon/bor/finality/whitelist_helpers.go +++ b/polygon/bor/finality/whitelist_helpers.go @@ -20,12 +20,12 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" ) var ( diff --git a/polygon/bor/genesis_contracts.go b/polygon/bor/genesis_contracts.go index cd9227a7559..f952c006614 100644 --- a/polygon/bor/genesis_contracts.go +++ b/polygon/bor/genesis_contracts.go @@ -20,13 +20,13 @@ import ( "math/big" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/rlp" ) const ( diff --git a/polygon/bor/snapshot.go b/polygon/bor/snapshot.go index 8803fa2087e..6fa1b5212fb 100644 --- a/polygon/bor/snapshot.go +++ b/polygon/bor/snapshot.go @@ -25,13 +25,13 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/valset" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/valset" ) // Snapshot is the state of the authorization voting at a given point in time. diff --git a/polygon/bor/snapshot_test.go b/polygon/bor/snapshot_test.go index 007354868c8..f305eaa080b 100644 --- a/polygon/bor/snapshot_test.go +++ b/polygon/bor/snapshot_test.go @@ -24,9 +24,9 @@ import ( "github.com/maticnetwork/crand" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/valset" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/valset" ) const ( diff --git a/polygon/bor/snaptype/types.go b/polygon/bor/snaptype/types.go index fee81bd8274..e886b239e1f 100644 --- a/polygon/bor/snaptype/types.go +++ b/polygon/bor/snaptype/types.go @@ -27,23 +27,23 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/chain" - "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/background" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" - "github.com/ledgerwatch/erigon/core/rawdb" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" + "github.com/erigontech/erigon/core/rawdb" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/polygon/heimdall" ) func init() { diff --git a/polygon/bor/snaptype/types_test.go b/polygon/bor/snaptype/types_test.go index d8d85f47d54..5933ec02339 100644 --- a/polygon/bor/snaptype/types_test.go +++ b/polygon/bor/snaptype/types_test.go @@ -19,7 +19,7 @@ package snaptype_test import ( "testing" - "github.com/ledgerwatch/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/polygon/bor/snaptype" ) func TestEnumeration(t *testing.T) { diff --git a/polygon/bor/spanner.go b/polygon/bor/spanner.go index d18de0523bc..b48f0ad66d1 100644 --- a/polygon/bor/spanner.go +++ b/polygon/bor/spanner.go @@ -21,15 +21,15 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/rlp" ) //go:generate mockgen -typed=true -destination=./spanner_mock.go -package=bor . Spanner diff --git a/polygon/bor/spanner_mock.go b/polygon/bor/spanner_mock.go index 185ded6cc7c..ba876a3b748 100644 --- a/polygon/bor/spanner_mock.go +++ b/polygon/bor/spanner_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/bor (interfaces: Spanner) +// Source: github.com/erigontech/erigon/polygon/bor (interfaces: Spanner) // // Generated by this command: // @@ -12,10 +12,10 @@ package bor import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - consensus "github.com/ledgerwatch/erigon/consensus" - valset "github.com/ledgerwatch/erigon/polygon/bor/valset" - heimdall "github.com/ledgerwatch/erigon/polygon/heimdall" + common "github.com/erigontech/erigon-lib/common" + consensus "github.com/erigontech/erigon/consensus" + valset "github.com/erigontech/erigon/polygon/bor/valset" + heimdall "github.com/erigontech/erigon/polygon/heimdall" gomock "go.uber.org/mock/gomock" ) diff --git a/polygon/bor/spanner_test_validators.go b/polygon/bor/spanner_test_validators.go index 4fe46281659..df3b1462269 100644 --- a/polygon/bor/spanner_test_validators.go +++ b/polygon/bor/spanner_test_validators.go @@ -17,9 +17,9 @@ package bor import ( - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/bor/valset" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/bor/valset" ) // NetworkNameVals is a map of network name to validator set for tests/devnets diff --git a/polygon/bor/statefull/processor.go b/polygon/bor/statefull/processor.go index 4bae0861c5c..826b42a7b95 100644 --- a/polygon/bor/statefull/processor.go +++ b/polygon/bor/statefull/processor.go @@ -17,9 +17,9 @@ package statefull import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" ) type ChainContext struct { diff --git a/polygon/bor/types/bor_receipt.go b/polygon/bor/types/bor_receipt.go index 3caa1b676d5..8d48a97d322 100644 --- a/polygon/bor/types/bor_receipt.go +++ b/polygon/bor/types/bor_receipt.go @@ -20,10 +20,11 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" ) const BorTxKeyPrefix string = "matic-bor-receipt-" diff --git a/polygon/bor/valset/validator.go b/polygon/bor/valset/validator.go index 09edb0b1d1e..aea5fd48c25 100644 --- a/polygon/bor/valset/validator.go +++ b/polygon/bor/valset/validator.go @@ -25,7 +25,7 @@ import ( "sort" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // Validator represets Volatile state for each Validator diff --git a/polygon/bor/valset/validator_set.go b/polygon/bor/valset/validator_set.go index 234b7ff5870..d51139aa7a4 100644 --- a/polygon/bor/valset/validator_set.go +++ b/polygon/bor/valset/validator_set.go @@ -26,7 +26,7 @@ import ( "sort" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // MaxTotalVotingPower - the maximum allowed total voting power. diff --git a/polygon/bridge/bridge.go b/polygon/bridge/bridge.go index 0cf6e9eff59..a70e1131291 100644 --- a/polygon/bridge/bridge.go +++ b/polygon/bridge/bridge.go @@ -21,17 +21,17 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/polygon/polygoncommon" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/heimdall" ) type fetchSyncEventsType func(ctx context.Context, fromId uint64, to time.Time, limit int) ([]*heimdall.EventRecordWithTime, error) diff --git a/polygon/bridge/bridge_test.go b/polygon/bridge/bridge_test.go index 3acc71c465f..2b3af979619 100644 --- a/polygon/bridge/bridge_test.go +++ b/polygon/bridge/bridge_test.go @@ -11,17 +11,17 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bridge" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bridge" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/polygoncommon" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/testlog" ) func setup(t *testing.T, abi abi.ABI) (*heimdall.MockHeimdallClient, *bridge.Bridge) { diff --git a/polygon/bridge/db.go b/polygon/bridge/db.go index 10646b9d5d1..f911480e43e 100644 --- a/polygon/bridge/db.go +++ b/polygon/bridge/db.go @@ -24,10 +24,10 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/polygoncommon" ) /* diff --git a/polygon/bridge/service.go b/polygon/bridge/service.go index b1720352598..d9511e82180 100644 --- a/polygon/bridge/service.go +++ b/polygon/bridge/service.go @@ -19,7 +19,7 @@ package bridge import ( "context" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) type PolygonBridge interface { diff --git a/polygon/heimdall/checkpoint.go b/polygon/heimdall/checkpoint.go index 57af7fa062a..9be8e0b4fc7 100644 --- a/polygon/heimdall/checkpoint.go +++ b/polygon/heimdall/checkpoint.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) type CheckpointId uint64 diff --git a/polygon/heimdall/checkpoint_test.go b/polygon/heimdall/checkpoint_test.go index b7d031e67be..2a768e4df00 100644 --- a/polygon/heimdall/checkpoint_test.go +++ b/polygon/heimdall/checkpoint_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/polygon/heimdall/heimdalltest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/polygon/heimdall/heimdalltest" ) func TestCheckpointJsonMarshall(t *testing.T) { diff --git a/polygon/heimdall/client.go b/polygon/heimdall/client.go index aadc544847f..41f6e2fa9f9 100644 --- a/polygon/heimdall/client.go +++ b/polygon/heimdall/client.go @@ -29,9 +29,9 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) var ( diff --git a/polygon/heimdall/client_mock.go b/polygon/heimdall/client_mock.go index db06b63f8b3..2cf5075cb7b 100644 --- a/polygon/heimdall/client_mock.go +++ b/polygon/heimdall/client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/heimdall (interfaces: HeimdallClient) +// Source: github.com/erigontech/erigon/polygon/heimdall (interfaces: HeimdallClient) // // Generated by this command: // diff --git a/polygon/heimdall/client_test.go b/polygon/heimdall/client_test.go index 4f279e47964..c7f7121b455 100644 --- a/polygon/heimdall/client_test.go +++ b/polygon/heimdall/client_test.go @@ -26,9 +26,9 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon/turbo/testlog" ) type emptyBodyReadCloser struct{} diff --git a/polygon/heimdall/entity_fetcher.go b/polygon/heimdall/entity_fetcher.go index a364f066142..e8c0061ed5d 100644 --- a/polygon/heimdall/entity_fetcher.go +++ b/polygon/heimdall/entity_fetcher.go @@ -23,7 +23,7 @@ import ( "slices" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type entityFetcher[TEntity Entity] interface { diff --git a/polygon/heimdall/entity_fetcher_test.go b/polygon/heimdall/entity_fetcher_test.go index 80a7bc5b68e..dcef0edb8f7 100644 --- a/polygon/heimdall/entity_fetcher_test.go +++ b/polygon/heimdall/entity_fetcher_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func makeEntities(count uint64) []*Checkpoint { diff --git a/polygon/heimdall/entity_store.go b/polygon/heimdall/entity_store.go index 4801786658c..dd023f91d8c 100644 --- a/polygon/heimdall/entity_store.go +++ b/polygon/heimdall/entity_store.go @@ -22,9 +22,9 @@ import ( "encoding/json" "sync" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon/polygon/polygoncommon" ) var databaseTablesCfg = kv.TableCfg{ diff --git a/polygon/heimdall/event_record.go b/polygon/heimdall/event_record.go index a98067ea511..44084fe85e1 100644 --- a/polygon/heimdall/event_record.go +++ b/polygon/heimdall/event_record.go @@ -23,10 +23,10 @@ import ( "math/big" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/rlp" ) // EventRecord represents state record diff --git a/polygon/heimdall/http_client_mock.go b/polygon/heimdall/http_client_mock.go index b62ff955323..ab372e61302 100644 --- a/polygon/heimdall/http_client_mock.go +++ b/polygon/heimdall/http_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/heimdall (interfaces: HttpClient) +// Source: github.com/erigontech/erigon/polygon/heimdall (interfaces: HttpClient) // // Generated by this command: // diff --git a/polygon/heimdall/metrics.go b/polygon/heimdall/metrics.go index 9998b5b2b2a..1b622538a6a 100644 --- a/polygon/heimdall/metrics.go +++ b/polygon/heimdall/metrics.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) type ( diff --git a/polygon/heimdall/milestone.go b/polygon/heimdall/milestone.go index 992e899db78..32c12ca41fb 100644 --- a/polygon/heimdall/milestone.go +++ b/polygon/heimdall/milestone.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) type MilestoneId uint64 diff --git a/polygon/heimdall/milestone_test.go b/polygon/heimdall/milestone_test.go index b7bb7ce0d80..0a7a614e09e 100644 --- a/polygon/heimdall/milestone_test.go +++ b/polygon/heimdall/milestone_test.go @@ -21,9 +21,9 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/polygon/heimdall/heimdalltest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/polygon/heimdall/heimdalltest" ) func TestMilestoneJsonMarshall(t *testing.T) { diff --git a/polygon/heimdall/range_index.go b/polygon/heimdall/range_index.go index 69013ea009e..4b62f4314ad 100644 --- a/polygon/heimdall/range_index.go +++ b/polygon/heimdall/range_index.go @@ -22,10 +22,10 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" ) type RangeIndex struct { diff --git a/polygon/heimdall/range_index_test.go b/polygon/heimdall/range_index_test.go index 9fd651684f7..77f14014005 100644 --- a/polygon/heimdall/range_index_test.go +++ b/polygon/heimdall/range_index_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) type rangeIndexTest struct { diff --git a/polygon/heimdall/scraper.go b/polygon/heimdall/scraper.go index 847a7cc3a09..cfebd325894 100644 --- a/polygon/heimdall/scraper.go +++ b/polygon/heimdall/scraper.go @@ -20,10 +20,10 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/polygoncommon" ) type scraper[TEntity Entity] struct { diff --git a/polygon/heimdall/service.go b/polygon/heimdall/service.go index 50a3b99fe19..df6f378b8ae 100644 --- a/polygon/heimdall/service.go +++ b/polygon/heimdall/service.go @@ -23,9 +23,9 @@ import ( "golang.org/x/sync/errgroup" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/polygon/polygoncommon" ) type Service interface { diff --git a/polygon/heimdall/service_store.go b/polygon/heimdall/service_store.go index 8a0cfefb94b..a871f583dd3 100644 --- a/polygon/heimdall/service_store.go +++ b/polygon/heimdall/service_store.go @@ -21,9 +21,9 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/polygon/polygoncommon" ) type ServiceStore interface { diff --git a/polygon/heimdall/span.go b/polygon/heimdall/span.go index 9926ee94ae0..18d8197e7f3 100644 --- a/polygon/heimdall/span.go +++ b/polygon/heimdall/span.go @@ -19,7 +19,7 @@ package heimdall import ( "github.com/google/btree" - "github.com/ledgerwatch/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/bor/valset" ) type Span struct { diff --git a/polygon/heimdall/span_id.go b/polygon/heimdall/span_id.go index 2c3c89d0da2..717c79edfdf 100644 --- a/polygon/heimdall/span_id.go +++ b/polygon/heimdall/span_id.go @@ -17,7 +17,7 @@ package heimdall import ( - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) type SpanId uint64 diff --git a/polygon/heimdall/span_id_test.go b/polygon/heimdall/span_id_test.go index e77741c52c7..30ee24230f5 100644 --- a/polygon/heimdall/span_id_test.go +++ b/polygon/heimdall/span_id_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) func TestSpanIDAt(t *testing.T) { diff --git a/polygon/heimdall/span_test.go b/polygon/heimdall/span_test.go index 0efa8b7131c..9df8cb940ac 100644 --- a/polygon/heimdall/span_test.go +++ b/polygon/heimdall/span_test.go @@ -19,9 +19,9 @@ package heimdall import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/polygon/heimdall/heimdalltest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/polygon/heimdall/heimdalltest" ) func TestSpanJsonMarshall(t *testing.T) { diff --git a/polygon/heimdall/waypoint.go b/polygon/heimdall/waypoint.go index 9aa7c0ec6dc..75604e2a3d4 100644 --- a/polygon/heimdall/waypoint.go +++ b/polygon/heimdall/waypoint.go @@ -20,7 +20,7 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) type Waypoint interface { diff --git a/polygon/p2p/fetcher_base.go b/polygon/p2p/fetcher_base.go index fc7e12316c6..83291d19dc4 100644 --- a/polygon/p2p/fetcher_base.go +++ b/polygon/p2p/fetcher_base.go @@ -25,9 +25,9 @@ import ( "github.com/cenkalti/backoff/v4" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" ) type RequestIdGenerator func() uint64 diff --git a/polygon/p2p/fetcher_base_test.go b/polygon/p2p/fetcher_base_test.go index b79a3bb312f..fc5bfa3b699 100644 --- a/polygon/p2p/fetcher_base_test.go +++ b/polygon/p2p/fetcher_base_test.go @@ -28,12 +28,12 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/common" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + erigonlibtypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/rlp" ) func TestFetcherFetchHeaders(t *testing.T) { diff --git a/polygon/p2p/fetcher_errors.go b/polygon/p2p/fetcher_errors.go index 168d446f4f8..d9ec918b876 100644 --- a/polygon/p2p/fetcher_errors.go +++ b/polygon/p2p/fetcher_errors.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) type ErrInvalidFetchHeadersRange struct { diff --git a/polygon/p2p/fetcher_penalizing.go b/polygon/p2p/fetcher_penalizing.go index 9b306be959e..4a7fd4d2bc7 100644 --- a/polygon/p2p/fetcher_penalizing.go +++ b/polygon/p2p/fetcher_penalizing.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) func NewPenalizingFetcher(logger log.Logger, fetcher Fetcher, peerPenalizer PeerPenalizer) Fetcher { diff --git a/polygon/p2p/fetcher_penalizing_test.go b/polygon/p2p/fetcher_penalizing_test.go index ff021dc544b..ad8a897dd85 100644 --- a/polygon/p2p/fetcher_penalizing_test.go +++ b/polygon/p2p/fetcher_penalizing_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/core/types" ) func TestPenalizingFetcherFetchHeadersShouldPenalizePeerWhenErrTooManyHeaders(t *testing.T) { diff --git a/polygon/p2p/fetcher_tracking.go b/polygon/p2p/fetcher_tracking.go index b153350be24..bdf021e7d50 100644 --- a/polygon/p2p/fetcher_tracking.go +++ b/polygon/p2p/fetcher_tracking.go @@ -20,7 +20,7 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) func NewTrackingFetcher(fetcher Fetcher, peerTracker PeerTracker) Fetcher { diff --git a/polygon/p2p/fetcher_tracking_test.go b/polygon/p2p/fetcher_tracking_test.go index 5dff9fdcc47..c0bfb84a290 100644 --- a/polygon/p2p/fetcher_tracking_test.go +++ b/polygon/p2p/fetcher_tracking_test.go @@ -24,9 +24,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/core/types" ) func TestTrackingFetcherFetchHeadersUpdatesPeerTracker(t *testing.T) { diff --git a/polygon/p2p/message_listener.go b/polygon/p2p/message_listener.go index 4bfd34bf339..0d928dba223 100644 --- a/polygon/p2p/message_listener.go +++ b/polygon/p2p/message_listener.go @@ -23,14 +23,14 @@ import ( "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - sentrymulticlient "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/eth/protocols/eth" + sentrymulticlient "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon/polygon/polygoncommon" + "github.com/erigontech/erigon/rlp" ) type DecodedInboundMessage[TPacket any] struct { diff --git a/polygon/p2p/message_listener_test.go b/polygon/p2p/message_listener_test.go index d48925da360..a6c06907a48 100644 --- a/polygon/p2p/message_listener_test.go +++ b/polygon/p2p/message_listener_test.go @@ -30,16 +30,16 @@ import ( "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - sentrymulticlient "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + sentrymulticlient "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/testlog" ) func TestMessageListenerRegisterBlockHeadersObserver(t *testing.T) { diff --git a/polygon/p2p/message_sender.go b/polygon/p2p/message_sender.go index c80c6a576cd..a4b4b372f4c 100644 --- a/polygon/p2p/message_sender.go +++ b/polygon/p2p/message_sender.go @@ -20,10 +20,10 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/rlp" ) var ErrPeerNotFound = errors.New("peer not found") diff --git a/polygon/p2p/message_sender_test.go b/polygon/p2p/message_sender_test.go index e3e4b6fd75a..54ca6c5daa3 100644 --- a/polygon/p2p/message_sender_test.go +++ b/polygon/p2p/message_sender_test.go @@ -24,12 +24,12 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + erigonlibtypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/rlp" ) func TestMessageSenderSendGetBlockHeaders(t *testing.T) { diff --git a/polygon/p2p/peer_id.go b/polygon/p2p/peer_id.go index a8b04ee0e0c..a740f55823f 100644 --- a/polygon/p2p/peer_id.go +++ b/polygon/p2p/peer_id.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "encoding/hex" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/gointerfaces" + erigonlibtypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" ) func PeerIdFromH512(h512 *erigonlibtypes.H512) *PeerId { diff --git a/polygon/p2p/peer_penalizer.go b/polygon/p2p/peer_penalizer.go index e8cfdc6e32b..e0a696a1797 100644 --- a/polygon/p2p/peer_penalizer.go +++ b/polygon/p2p/peer_penalizer.go @@ -19,8 +19,8 @@ package p2p import ( "context" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" ) type PeerPenalizer interface { diff --git a/polygon/p2p/peer_shuffle.go b/polygon/p2p/peer_shuffle.go index c7c1dec5c87..50dbe55fe60 100644 --- a/polygon/p2p/peer_shuffle.go +++ b/polygon/p2p/peer_shuffle.go @@ -16,7 +16,7 @@ package p2p -import "github.com/ledgerwatch/erigon-lib/common" +import "github.com/erigontech/erigon-lib/common" type PeerShuffle func(peerIds []*PeerId) diff --git a/polygon/p2p/peer_tracker.go b/polygon/p2p/peer_tracker.go index e0e9d3dfe69..2eb5932c46f 100644 --- a/polygon/p2p/peer_tracker.go +++ b/polygon/p2p/peer_tracker.go @@ -19,10 +19,10 @@ package p2p import ( "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/polygon/polygoncommon" ) type PeerTracker interface { diff --git a/polygon/p2p/peer_tracker_test.go b/polygon/p2p/peer_tracker_test.go index c31779436ab..7e1a8085778 100644 --- a/polygon/p2p/peer_tracker_test.go +++ b/polygon/p2p/peer_tracker_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/turbo/testlog" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/turbo/testlog" ) func TestPeerTracker(t *testing.T) { diff --git a/polygon/p2p/service.go b/polygon/p2p/service.go index aeb4e036d19..aacc07228d8 100644 --- a/polygon/p2p/service.go +++ b/polygon/p2p/service.go @@ -20,10 +20,10 @@ import ( "math/rand" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/direct" - sentrymulticlient "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon-lib/direct" + sentrymulticlient "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" ) //go:generate mockgen -typed=true -source=./service.go -destination=./service_mock.go -package=p2p . Service diff --git a/polygon/p2p/service_mock.go b/polygon/p2p/service_mock.go index 7cd943b3a33..f360a50956f 100644 --- a/polygon/p2p/service_mock.go +++ b/polygon/p2p/service_mock.go @@ -13,10 +13,10 @@ import ( context "context" reflect "reflect" - sentryproto "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - types "github.com/ledgerwatch/erigon/core/types" - eth "github.com/ledgerwatch/erigon/eth/protocols/eth" - polygoncommon "github.com/ledgerwatch/erigon/polygon/polygoncommon" + sentryproto "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + types "github.com/erigontech/erigon/core/types" + eth "github.com/erigontech/erigon/eth/protocols/eth" + polygoncommon "github.com/erigontech/erigon/polygon/polygoncommon" gomock "go.uber.org/mock/gomock" ) diff --git a/polygon/polygoncommon/database.go b/polygon/polygoncommon/database.go index 10612f168a3..0c0403147cc 100644 --- a/polygon/polygoncommon/database.go +++ b/polygon/polygoncommon/database.go @@ -23,10 +23,10 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" ) type Database struct { diff --git a/polygon/sync/block_downloader.go b/polygon/sync/block_downloader.go index 020fbe6fcf0..456e8dbc00d 100644 --- a/polygon/sync/block_downloader.go +++ b/polygon/sync/block_downloader.go @@ -28,12 +28,12 @@ import ( "github.com/c2h5oh/datasize" lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/p2p" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" ) const ( diff --git a/polygon/sync/block_downloader_test.go b/polygon/sync/block_downloader_test.go index f4f21773afa..646362b14e4 100644 --- a/polygon/sync/block_downloader_test.go +++ b/polygon/sync/block_downloader_test.go @@ -29,13 +29,13 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/p2p" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" + "github.com/erigontech/erigon/turbo/testlog" ) func newBlockDownloaderTest(t *testing.T) *blockDownloaderTest { diff --git a/polygon/sync/blocks_verifier.go b/polygon/sync/blocks_verifier.go index e7733f19144..9d8aee5c86f 100644 --- a/polygon/sync/blocks_verifier.go +++ b/polygon/sync/blocks_verifier.go @@ -17,8 +17,8 @@ package sync import ( - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" ) type BlocksVerifier func(blocks []*types.Block) error diff --git a/polygon/sync/canonical_chain_builder.go b/polygon/sync/canonical_chain_builder.go index 56f5462bcce..1281b83730a 100644 --- a/polygon/sync/canonical_chain_builder.go +++ b/polygon/sync/canonical_chain_builder.go @@ -22,9 +22,9 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" ) //go:generate mockgen -typed=true -destination=./canonical_chain_builder_mock.go -package=sync . CanonicalChainBuilder diff --git a/polygon/sync/canonical_chain_builder_factory.go b/polygon/sync/canonical_chain_builder_factory.go index 24ebca2c5b9..2741b569965 100644 --- a/polygon/sync/canonical_chain_builder_factory.go +++ b/polygon/sync/canonical_chain_builder_factory.go @@ -19,10 +19,10 @@ package sync import ( lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) const InMemorySignatures = 4096 // Number of recent block signatures to keep in memory diff --git a/polygon/sync/canonical_chain_builder_mock.go b/polygon/sync/canonical_chain_builder_mock.go index b5f5d3a705c..9ebaf9e5c75 100644 --- a/polygon/sync/canonical_chain_builder_mock.go +++ b/polygon/sync/canonical_chain_builder_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/sync (interfaces: CanonicalChainBuilder) +// Source: github.com/erigontech/erigon/polygon/sync (interfaces: CanonicalChainBuilder) // // Generated by this command: // @@ -12,8 +12,8 @@ package sync import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - types "github.com/ledgerwatch/erigon/core/types" + common "github.com/erigontech/erigon-lib/common" + types "github.com/erigontech/erigon/core/types" gomock "go.uber.org/mock/gomock" ) diff --git a/polygon/sync/canonical_chain_builder_test.go b/polygon/sync/canonical_chain_builder_test.go index 61ca3f3d339..a7d18b702eb 100644 --- a/polygon/sync/canonical_chain_builder_test.go +++ b/polygon/sync/canonical_chain_builder_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/heimdall" ) type testDifficultyCalculator struct { diff --git a/polygon/sync/difficulty.go b/polygon/sync/difficulty.go index 0ec21b1eb39..4f087009913 100644 --- a/polygon/sync/difficulty.go +++ b/polygon/sync/difficulty.go @@ -21,11 +21,11 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/valset" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/valset" ) type DifficultyCalculator interface { diff --git a/polygon/sync/difficulty_test.go b/polygon/sync/difficulty_test.go index 486edee95f3..4c1ba13a50f 100644 --- a/polygon/sync/difficulty_test.go +++ b/polygon/sync/difficulty_test.go @@ -23,9 +23,9 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) type testValidatorSetInterface struct { diff --git a/polygon/sync/execution_client.go b/polygon/sync/execution_client.go index f5604909f83..5194f3f52c9 100644 --- a/polygon/sync/execution_client.go +++ b/polygon/sync/execution_client.go @@ -24,11 +24,11 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - executionproto "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" + "github.com/erigontech/erigon-lib/gointerfaces" + executionproto "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_utils" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) type ExecutionClient interface { diff --git a/polygon/sync/header_time_validator.go b/polygon/sync/header_time_validator.go index d48948d70fb..1721df8ba1c 100644 --- a/polygon/sync/header_time_validator.go +++ b/polygon/sync/header_time_validator.go @@ -22,11 +22,11 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bor/valset" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/valset" ) type HeaderTimeValidator interface { diff --git a/polygon/sync/header_validator.go b/polygon/sync/header_validator.go index 83f3086c186..9935bd75f72 100644 --- a/polygon/sync/header_validator.go +++ b/polygon/sync/header_validator.go @@ -19,10 +19,10 @@ package sync import ( "time" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/borcfg" ) type HeaderValidator interface { diff --git a/polygon/sync/heimdall_waypoints_fetcher.go b/polygon/sync/heimdall_waypoints_fetcher.go index 38df4bc5c7f..dabab322c48 100644 --- a/polygon/sync/heimdall_waypoints_fetcher.go +++ b/polygon/sync/heimdall_waypoints_fetcher.go @@ -19,7 +19,7 @@ package sync import ( "context" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/heimdall" ) //go:generate mockgen -typed=true -source=./heimdall_waypoints_fetcher.go -destination=./heimdall_waypoints_fetcher_mock.go -package=sync diff --git a/polygon/sync/heimdall_waypoints_fetcher_mock.go b/polygon/sync/heimdall_waypoints_fetcher_mock.go index a021a6bb479..8b878652110 100644 --- a/polygon/sync/heimdall_waypoints_fetcher_mock.go +++ b/polygon/sync/heimdall_waypoints_fetcher_mock.go @@ -12,9 +12,10 @@ package sync import ( context "context" reflect "reflect" - - heimdall "github.com/ledgerwatch/erigon/polygon/heimdall" + gomock "go.uber.org/mock/gomock" + + heimdall "github.com/erigontech/erigon/polygon/heimdall" ) // MockheimdallWaypointsFetcher is a mock of heimdallWaypointsFetcher interface. diff --git a/polygon/sync/service.go b/polygon/sync/service.go index efd84079d13..874572d2d63 100644 --- a/polygon/sync/service.go +++ b/polygon/sync/service.go @@ -21,15 +21,15 @@ import ( "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - "github.com/ledgerwatch/erigon/polygon/bridge" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/p2p" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bridge" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" ) type Service interface { diff --git a/polygon/sync/spans_cache.go b/polygon/sync/spans_cache.go index b41dea4beac..3deab2e6d89 100644 --- a/polygon/sync/spans_cache.go +++ b/polygon/sync/spans_cache.go @@ -16,7 +16,7 @@ package sync -import "github.com/ledgerwatch/erigon/polygon/heimdall" +import "github.com/erigontech/erigon/polygon/heimdall" type SpansCache struct { spans map[uint64]*heimdall.Span diff --git a/polygon/sync/store.go b/polygon/sync/store.go index 3ccf42510f4..0c6edb58c9a 100644 --- a/polygon/sync/store.go +++ b/polygon/sync/store.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bridge" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bridge" ) //go:generate mockgen -typed=true -destination=./store_mock.go -package=sync . Store diff --git a/polygon/sync/store_mock.go b/polygon/sync/store_mock.go index 4873dd9af5f..7289491e568 100644 --- a/polygon/sync/store_mock.go +++ b/polygon/sync/store_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/sync (interfaces: Store) +// Source: github.com/erigontech/erigon/polygon/sync (interfaces: Store) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - types "github.com/ledgerwatch/erigon/core/types" + types "github.com/erigontech/erigon/core/types" gomock "go.uber.org/mock/gomock" ) diff --git a/polygon/sync/sync.go b/polygon/sync/sync.go index 5eff8631063..26d704d65e2 100644 --- a/polygon/sync/sync.go +++ b/polygon/sync/sync.go @@ -20,11 +20,11 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/p2p" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" ) type latestSpanFetcher func(ctx context.Context, count uint) ([]*heimdall.Span, error) diff --git a/polygon/sync/tip_events.go b/polygon/sync/tip_events.go index a41a12aebb4..e593db812d0 100644 --- a/polygon/sync/tip_events.go +++ b/polygon/sync/tip_events.go @@ -19,12 +19,12 @@ package sync import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/p2p" - "github.com/ledgerwatch/erigon/polygon/polygoncommon" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" + "github.com/erigontech/erigon/polygon/polygoncommon" ) const EventTypeNewBlock = "new-block" diff --git a/polygon/sync/validator_set_interface.go b/polygon/sync/validator_set_interface.go index 29b5b77a23a..5ae820766c5 100644 --- a/polygon/sync/validator_set_interface.go +++ b/polygon/sync/validator_set_interface.go @@ -17,8 +17,8 @@ package sync import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/polygon/bor" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/polygon/bor" ) // valset.ValidatorSet abstraction for unit tests diff --git a/polygon/sync/waypoint_headers_verifier.go b/polygon/sync/waypoint_headers_verifier.go index ea47fb6d67f..ef999ea8af0 100644 --- a/polygon/sync/waypoint_headers_verifier.go +++ b/polygon/sync/waypoint_headers_verifier.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/heimdall" ) var ( diff --git a/polygon/sync/waypoint_headers_verifier_test.go b/polygon/sync/waypoint_headers_verifier_test.go index 66e533e02b1..d6599464b88 100644 --- a/polygon/sync/waypoint_headers_verifier_test.go +++ b/polygon/sync/waypoint_headers_verifier_test.go @@ -22,10 +22,10 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/heimdall" ) func TestVerifyCheckpointHeaders(t *testing.T) { diff --git a/polygon/tracer/bor_state_sync_txn_tracer.go b/polygon/tracer/bor_state_sync_txn_tracer.go index 078d8603c14..e85dd96f2b1 100644 --- a/polygon/tracer/bor_state_sync_txn_tracer.go +++ b/polygon/tracer/bor_state_sync_txn_tracer.go @@ -21,10 +21,10 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers" ) func NewBorStateSyncTxnTracer( diff --git a/polygon/tracer/trace_bor_state_sync_txn.go b/polygon/tracer/trace_bor_state_sync_txn.go index afd3a0f6421..c6cfe7525a9 100644 --- a/polygon/tracer/trace_bor_state_sync_txn.go +++ b/polygon/tracer/trace_bor_state_sync_txn.go @@ -23,22 +23,22 @@ import ( "github.com/holiman/uint256" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core" - "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" - tracersConfig "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + tracersConfig "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/polygon/bor/borcfg" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/transactions" ) func TraceBorStateSyncTxnDebugAPI( diff --git a/rlp/decode.go b/rlp/decode.go index ce10b6065c4..775cb875178 100644 --- a/rlp/decode.go +++ b/rlp/decode.go @@ -31,7 +31,7 @@ import ( "strings" "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" ) diff --git a/rlp/encode.go b/rlp/encode.go index 6c8e5e28385..3a817eefd2c 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -30,7 +30,7 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // https://github.com/ethereum/wiki/wiki/RLP diff --git a/rlp/encode_test.go b/rlp/encode_test.go index 89066b846f6..d5aa42e1e6f 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -28,7 +28,7 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common/math" "github.com/holiman/uint256" ) diff --git a/rlp/iterator_test.go b/rlp/iterator_test.go index 48016eadce2..a48a42421f7 100644 --- a/rlp/iterator_test.go +++ b/rlp/iterator_test.go @@ -22,7 +22,7 @@ package rlp import ( "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" ) // TestIterator tests some basic things about the ListIterator. A more diff --git a/rpc/client.go b/rpc/client.go index cb492935328..98b1d598c31 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -31,7 +31,7 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index aa5cce3e3d4..9c232801e78 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -24,10 +24,10 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_test.go b/rpc/client_test.go index e597cba7a78..6af327275d0 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -34,8 +34,8 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" ) func TestClientRequest(t *testing.T) { @@ -356,7 +356,7 @@ func TestClientSubscribeClose(t *testing.T) { } } -// This test reproduces https://github.com/ledgerwatch/erigon/issues/17837 where the +// This test reproduces https://github.com/erigontech/erigon/issues/17837 where the // client hangs during shutdown when Unsubscribe races with Client.Close. func TestClientCloseUnsubscribeRace(t *testing.T) { logger := log.New() diff --git a/rpc/doc.go b/rpc/doc.go index 700e778d5c7..213341e609a 100644 --- a/rpc/doc.go +++ b/rpc/doc.go @@ -101,7 +101,7 @@ Subscriptions are deleted when the user sends an unsubscribe request or when the connection which was used to create the subscription is closed. This can be initiated by the client and server. The server will close the connection for any write error. -For more information about subscriptions, see https://github.com/ledgerwatch/erigon/wiki/RPC-PUB-SUB. +For more information about subscriptions, see https://github.com/erigontech/erigon/wiki/RPC-PUB-SUB. # Reverse Calls diff --git a/rpc/handler.go b/rpc/handler.go index 5ad260e04ce..0073bfee00d 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -31,9 +31,9 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/rpc/rpccfg" ) // handler handles JSON-RPC messages. There is one handler per connection. Note that diff --git a/rpc/http.go b/rpc/http.go index f2008d0b3bc..3be9700fe13 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -37,10 +37,10 @@ import ( "github.com/golang-jwt/jwt/v4" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" ) const ( diff --git a/rpc/http_test.go b/rpc/http_test.go index 67ef2f4b20d..80234beb02b 100644 --- a/rpc/http_test.go +++ b/rpc/http_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func confirmStatusCode(t *testing.T, got, want int) { diff --git a/rpc/inproc.go b/rpc/inproc.go index 84c29254c4b..29425c7c599 100644 --- a/rpc/inproc.go +++ b/rpc/inproc.go @@ -23,7 +23,7 @@ import ( "context" "net" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // DialInProc attaches an in-process connection to the given RPC server. diff --git a/rpc/ipc.go b/rpc/ipc.go index 88eee6103a6..c35d6ead73a 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -22,8 +22,8 @@ package rpc import ( "net" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/p2p/netutil" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/metrics.go b/rpc/metrics.go index cb1add82333..27024a1a27a 100644 --- a/rpc/metrics.go +++ b/rpc/metrics.go @@ -24,7 +24,7 @@ import ( "reflect" "strings" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) var ( diff --git a/rpc/server.go b/rpc/server.go index f65519206a7..d023802c636 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -29,7 +29,7 @@ import ( mapset "github.com/deckarep/golang-set" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) const MetadataApi = "rpc" diff --git a/rpc/server_test.go b/rpc/server_test.go index 14778624f17..7a95e97ff4c 100644 --- a/rpc/server_test.go +++ b/rpc/server_test.go @@ -32,8 +32,8 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/log/v3" ) func TestServerRegisterName(t *testing.T) { diff --git a/rpc/service.go b/rpc/service.go index f9ccca20b5f..0fe7e8d4d21 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -30,8 +30,8 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/rpc/stdio.go b/rpc/stdio.go index d4ced13362d..a1d9b43c084 100644 --- a/rpc/stdio.go +++ b/rpc/stdio.go @@ -27,7 +27,7 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // DialStdIO creates a client on stdin/stdout. diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go index 1783ce60721..696777edcbe 100644 --- a/rpc/subscription_test.go +++ b/rpc/subscription_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestNewID(t *testing.T) { diff --git a/rpc/testservice_test.go b/rpc/testservice_test.go index 6c2ce3b2576..84aedde7278 100644 --- a/rpc/testservice_test.go +++ b/rpc/testservice_test.go @@ -27,7 +27,7 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func newTestServer(logger log.Logger) *Server { diff --git a/rpc/types.go b/rpc/types.go index 0cd38c544e8..334b827ee7a 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -28,8 +28,8 @@ import ( "strconv" "strings" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 214d2999e2d..8ce1e904792 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -23,9 +23,9 @@ import ( "encoding/json" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 2bca95614e0..dc6eae0c272 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -33,7 +33,7 @@ import ( mapset "github.com/deckarep/golang-set/v2" "github.com/gorilla/websocket" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) const ( diff --git a/rpc/websocket_bench_test.go b/rpc/websocket_bench_test.go index 0bd0616fc46..4bf9a6b9d34 100644 --- a/rpc/websocket_bench_test.go +++ b/rpc/websocket_bench_test.go @@ -22,7 +22,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // This test checks whether calls exceeding the request size limit are rejected. diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go index ba3601fb0b4..a54c5f9bba9 100644 --- a/rpc/websocket_test.go +++ b/rpc/websocket_test.go @@ -31,7 +31,7 @@ import ( "github.com/gorilla/websocket" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestWebsocketClientHeaders(t *testing.T) { diff --git a/sonar-project.properties b/sonar-project.properties index 8daa603d847..3754d08f3f8 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,5 +1,5 @@ -sonar.projectKey=ledgerwatch_erigon -sonar.organization=ledgerwatch +sonar.projectKey=erigontech_erigon +sonar.organization=erigontech sonar.projectName=erigon sonar.sources=. diff --git a/spectest/case.go b/spectest/case.go index 57a1ccc8726..3efb4872ab2 100644 --- a/spectest/case.go +++ b/spectest/case.go @@ -5,8 +5,8 @@ import ( "os" "strings" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/transition/machine" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/transition/machine" "gfx.cafe/util/go/generic" ) diff --git a/spectest/suite.go b/spectest/suite.go index fe10c65f3cb..0922e35dc1d 100644 --- a/spectest/suite.go +++ b/spectest/suite.go @@ -1,7 +1,7 @@ package spectest import ( - "github.com/ledgerwatch/erigon/cl/transition/machine" + "github.com/erigontech/erigon/cl/transition/machine" "io/fs" "path/filepath" "testing" diff --git a/spectest/util.go b/spectest/util.go index 220a9a2ee09..4d5edaea3ed 100644 --- a/spectest/util.go +++ b/spectest/util.go @@ -5,14 +5,14 @@ import ( "io/fs" "os" - clparams2 "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" - "github.com/ledgerwatch/erigon/cl/utils" + clparams2 "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" "gopkg.in/yaml.v3" - "github.com/ledgerwatch/erigon-lib/types/ssz" + "github.com/erigontech/erigon-lib/types/ssz" ) func ReadMeta(root fs.FS, name string, obj any) error { diff --git a/tests/block_test.go b/tests/block_test.go index cc4e10c77fe..3adc20bf4f1 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -25,7 +25,7 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestBlockchain(t *testing.T) { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 80230f31b52..ae056b86913 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -30,27 +30,27 @@ import ( "reflect" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "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/eth/ethconsensusconfig" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconsensusconfig" + "github.com/erigontech/erigon/rlp" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/bor/helper/miner.go b/tests/bor/helper/miner.go index eba526b9eba..eac225c4938 100644 --- a/tests/bor/helper/miner.go +++ b/tests/bor/helper/miner.go @@ -9,25 +9,25 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/borcfg" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/nat" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/nat" + "github.com/erigontech/erigon/params" ) // InitGenesis initializes genesis file from json with sprint size and chain name as configurable inputs diff --git a/tests/bor/mining_test.go b/tests/bor/mining_test.go index 66e73e71115..8a43b96b057 100644 --- a/tests/bor/mining_test.go +++ b/tests/bor/mining_test.go @@ -12,23 +12,23 @@ import ( "time" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/fdlimit" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/tests/bor/helper" - - "github.com/ledgerwatch/erigon-lib/gointerfaces" - - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" + + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/fdlimit" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/tests/bor/helper" ) const ( @@ -53,7 +53,7 @@ var ( ) // CGO_CFLAGS="-D__BLST_PORTABLE__" : flag required for go test. -// Example : CGO_CFLAGS="-D__BLST_PORTABLE__" go test -run ^TestMiningBenchmark$ github.com/ledgerwatch/erigon/tests/bor -v -count=1 +// Example : CGO_CFLAGS="-D__BLST_PORTABLE__" go test -run ^TestMiningBenchmark$ github.com/erigontech/erigon/tests/bor -v -count=1 // In TestMiningBenchmark, we will test the mining performance. We will initialize a single node devnet and fire 5000 txs. We will measure the time it takes to include all the txs. This can be made more advcanced by increasing blockLimit and txsInTxpool. func TestMiningBenchmark(t *testing.T) { if config3.EnableHistoryV4InTest { diff --git a/tests/contracts/gen_selfDestructor.go b/tests/contracts/gen_selfDestructor.go index 77149f59f12..7eef45cbc8a 100644 --- a/tests/contracts/gen_selfDestructor.go +++ b/tests/contracts/gen_selfDestructor.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/tests/contracts/gen_testcontract.go b/tests/contracts/gen_testcontract.go index ac88800a0ff..c27258491f4 100644 --- a/tests/contracts/gen_testcontract.go +++ b/tests/contracts/gen_testcontract.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index e45476e7b32..13e52074bba 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -23,12 +23,12 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/types" ) //go:generate gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/erigon-ext-test/go.mod.template b/tests/erigon-ext-test/go.mod.template index 515b3b14281..3f6847a9902 100644 --- a/tests/erigon-ext-test/go.mod.template +++ b/tests/erigon-ext-test/go.mod.template @@ -2,8 +2,8 @@ module example.com/erigon-ext-test go 1.20 -require github.com/ledgerwatch/erigon $COMMIT_SHA +require github.com/erigontech/erigon $COMMIT_SHA -replace github.com/ledgerwatch/erigon-lib => github.com/ledgerwatch/erigon/erigon-lib $COMMIT_SHA +replace github.com/erigontech/erigon-lib => github.com/erigontech/erigon/erigon-lib $COMMIT_SHA require github.com/ethereum/go-ethereum v1.13.3 diff --git a/tests/erigon-ext-test/main.go b/tests/erigon-ext-test/main.go index b8322f5973e..c7298f8afac 100644 --- a/tests/erigon-ext-test/main.go +++ b/tests/erigon-ext-test/main.go @@ -3,9 +3,9 @@ package main import ( geth_params "github.com/ethereum/go-ethereum/params" // geth_crypto "github.com/ethereum/go-ethereum/crypto" - erigon_lib_common "github.com/ledgerwatch/erigon-lib/common" - erigon_crypto "github.com/ledgerwatch/erigon/crypto" - erigon_params "github.com/ledgerwatch/erigon/params" + erigon_lib_common "github.com/erigontech/erigon-lib/common" + erigon_crypto "github.com/erigontech/erigon/crypto" + erigon_params "github.com/erigontech/erigon/params" ) func main() { diff --git a/tests/exec_spec_test.go b/tests/exec_spec_test.go index e8bf9c215a8..d5fa15295be 100644 --- a/tests/exec_spec_test.go +++ b/tests/exec_spec_test.go @@ -22,7 +22,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func TestExecutionSpec(t *testing.T) { diff --git a/tests/fuzzers/abi/abifuzzer.go b/tests/fuzzers/abi/abifuzzer.go index 595520f8180..97dc02a573a 100644 --- a/tests/fuzzers/abi/abifuzzer.go +++ b/tests/fuzzers/abi/abifuzzer.go @@ -25,7 +25,8 @@ import ( "strings" fuzz "github.com/google/gofuzz" - "github.com/ledgerwatch/erigon/accounts/abi" + + "github.com/erigontech/erigon/accounts/abi" ) var ( diff --git a/tests/fuzzers/bitutil/compress_fuzz.go b/tests/fuzzers/bitutil/compress_fuzz.go index 7bbb01429b3..ed2105e1907 100644 --- a/tests/fuzzers/bitutil/compress_fuzz.go +++ b/tests/fuzzers/bitutil/compress_fuzz.go @@ -22,7 +22,7 @@ package bitutil import ( "bytes" - "github.com/ledgerwatch/erigon/common/bitutil" + "github.com/erigontech/erigon/common/bitutil" ) // Fuzz implements a go-fuzz fuzzer method to test various encoding method diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go index 5975a8a4bda..192adb67d55 100644 --- a/tests/fuzzers/bls12381/precompile_fuzzer.go +++ b/tests/fuzzers/bls12381/precompile_fuzzer.go @@ -23,9 +23,9 @@ import ( "bytes" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/core/vm" ) const ( diff --git a/tests/fuzzers/bn256/bn256_fuzz.go b/tests/fuzzers/bn256/bn256_fuzz.go index e0b0a865ad8..268609122ef 100644 --- a/tests/fuzzers/bn256/bn256_fuzz.go +++ b/tests/fuzzers/bn256/bn256_fuzz.go @@ -14,8 +14,8 @@ import ( "math/big" "github.com/consensys/gnark-crypto/ecc/bn254" - cloudflare "github.com/ledgerwatch/erigon/crypto/bn256/cloudflare" - google "github.com/ledgerwatch/erigon/crypto/bn256/google" + cloudflare "github.com/erigontech/erigon/crypto/bn256/cloudflare" + google "github.com/erigontech/erigon/crypto/bn256/google" ) func getG1Points(input io.Reader) (*cloudflare.G1, *google.G1, *bn254.G1Affine) { diff --git a/tests/fuzzers/difficulty/debug/main.go b/tests/fuzzers/difficulty/debug/main.go index a80c80d7036..5aa17bf76c7 100644 --- a/tests/fuzzers/difficulty/debug/main.go +++ b/tests/fuzzers/difficulty/debug/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon/tests/fuzzers/difficulty" + "github.com/erigontech/erigon/tests/fuzzers/difficulty" ) func main() { diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go index 70775cf45a8..360d8581bd6 100644 --- a/tests/fuzzers/difficulty/difficulty-fuzz.go +++ b/tests/fuzzers/difficulty/difficulty-fuzz.go @@ -26,10 +26,10 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/types" ) type fuzzer struct { diff --git a/tests/fuzzers/rlp/rlp_fuzzer.go b/tests/fuzzers/rlp/rlp_fuzzer.go index 9ce24188d2b..7e1691a7cb8 100644 --- a/tests/fuzzers/rlp/rlp_fuzzer.go +++ b/tests/fuzzers/rlp/rlp_fuzzer.go @@ -23,8 +23,8 @@ import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" ) func decodeEncode(input []byte, val interface{}, i int) { diff --git a/tests/fuzzers/runtime/runtime_fuzz.go b/tests/fuzzers/runtime/runtime_fuzz.go index 2fc475fadc2..8d27f116075 100644 --- a/tests/fuzzers/runtime/runtime_fuzz.go +++ b/tests/fuzzers/runtime/runtime_fuzz.go @@ -22,7 +22,7 @@ package runtime import ( "os" - "github.com/ledgerwatch/erigon/core/vm/runtime" + "github.com/erigontech/erigon/core/vm/runtime" ) // Fuzz is the basic entry point for the go-fuzz tool diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 7d0a802b22b..385526f8505 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index 33e3a41bba2..8b9732b4f0e 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,7 +6,7 @@ import ( "encoding/json" "math/big" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index d23fd575785..8909970eb30 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - common0 "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon-lib/common" + common0 "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 7a6066ddc74..91741430471 100644 --- a/tests/init.go +++ b/tests/init.go @@ -24,8 +24,8 @@ import ( "math/big" "sort" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" ) // Forks table defines supported forks and their chain config. diff --git a/tests/init_test.go b/tests/init_test.go index 89eeafc9581..f919d195397 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -32,7 +32,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index 66fbfb3723a..e28094c3b04 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -27,7 +27,7 @@ import ( "math/big" "strings" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index dbc3a5f28f3..5a1cc735e67 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -30,12 +30,12 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers/logger" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index fb61738f26e..5b8079692f9 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -32,27 +32,27 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/config3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - state2 "github.com/ledgerwatch/erigon-lib/state" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon-lib/wrap" - - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/config3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + state2 "github.com/erigontech/erigon-lib/state" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon-lib/wrap" + + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/rpchelper" ) // StateTest checks transaction processing without block context. diff --git a/tests/statedb_chain_test.go b/tests/statedb_chain_test.go index 5c843e5e814..8805c74e1c8 100644 --- a/tests/statedb_chain_test.go +++ b/tests/statedb_chain_test.go @@ -25,19 +25,20 @@ import ( "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/tests/contracts" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/tests/contracts" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestSelfDestructReceive(t *testing.T) { diff --git a/tests/statedb_insert_chain_transaction_test.go b/tests/statedb_insert_chain_transaction_test.go index dc23999dd1c..bfa7a62298c 100644 --- a/tests/statedb_insert_chain_transaction_test.go +++ b/tests/statedb_insert_chain_transaction_test.go @@ -26,18 +26,18 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/tests/contracts" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/turbo/stages/mock" + + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/tests/contracts" ) func TestInsertIncorrectStateRootDifferentAccounts(t *testing.T) { diff --git a/tests/transaction_test.go b/tests/transaction_test.go index 5cae0616317..1b3ffd32837 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -24,7 +24,7 @@ package tests import ( "testing" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index faafe4e32a9..00351fba812 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -26,13 +26,13 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/turbo/adapter/block_propagator.go b/turbo/adapter/block_propagator.go index d7461841819..d12d69fd67d 100644 --- a/turbo/adapter/block_propagator.go +++ b/turbo/adapter/block_propagator.go @@ -20,7 +20,7 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) type BlockPropagator func(ctx context.Context, header *types.Header, body *types.RawBody, td *big.Int) diff --git a/turbo/adapter/ethapi/api.go b/turbo/adapter/ethapi/api.go index cad98fd1d47..0ae15a8366f 100644 --- a/turbo/adapter/ethapi/api.go +++ b/turbo/adapter/ethapi/api.go @@ -26,17 +26,17 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/log/v3" - types2 "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/tracers/logger" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/log/v3" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/tracers/logger" ) // CallArgs represents the arguments for a call. diff --git a/turbo/adapter/ethapi/get_proof.go b/turbo/adapter/ethapi/get_proof.go index 36a2b647855..3bc2f606fe9 100644 --- a/turbo/adapter/ethapi/get_proof.go +++ b/turbo/adapter/ethapi/get_proof.go @@ -19,13 +19,13 @@ package ethapi import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/trie" ) // Result structs for GetProof diff --git a/turbo/adapter/ethapi/internal.go b/turbo/adapter/ethapi/internal.go index 439993e5a89..ef2cb0ef5df 100644 --- a/turbo/adapter/ethapi/internal.go +++ b/turbo/adapter/ethapi/internal.go @@ -18,9 +18,9 @@ package ethapi // This file stores proxy-objects for `internal` package import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // nolint diff --git a/turbo/adapter/ethapi/state_overrides.go b/turbo/adapter/ethapi/state_overrides.go index cc97ff137aa..7fed8647623 100644 --- a/turbo/adapter/ethapi/state_overrides.go +++ b/turbo/adapter/ethapi/state_overrides.go @@ -21,10 +21,11 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/tracing" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/tracing" ) type StateOverrides map[libcommon.Address]Account diff --git a/turbo/app/README.md b/turbo/app/README.md index d7df035941c..68f6caecfbc 100644 --- a/turbo/app/README.md +++ b/turbo/app/README.md @@ -17,9 +17,9 @@ In order to conect diagnostics run | | | |---|---| -|diagnostics.addr|Address of the diagnostics system provided by the support team, include unique session PIN. [Instructions how to get proper adderess](https://github.com/ledgerwatch/diagnostics?tab=readme-ov-file#step-4)| +|diagnostics.addr|Address of the diagnostics system provided by the support team, include unique session PIN. [Instructions how to get proper adderess](https://github.com/erigontech/diagnostics?tab=readme-ov-file#step-4)| |debug.addrs|Comma separated list of URLs to the debug endpoints thats are being diagnosed. This endpoints must mutch values of `diagnostics.endpoint.addr:diagnostics.endpoint.port` by default its `localhost:6060`| -|diagnostics.sessions|Comma separated list of session PINs to connect to [Instructions how to obtain PIN](https://github.com/ledgerwatch/diagnostics?tab=readme-ov-file#step-2)| +|diagnostics.sessions|Comma separated list of session PINs to connect to [Instructions how to obtain PIN](https://github.com/erigontech/diagnostics?tab=readme-ov-file#step-2)| ||| diff --git a/turbo/app/backup_cmd.go b/turbo/app/backup_cmd.go index 599576ad25c..b239dd27f1c 100644 --- a/turbo/app/backup_cmd.go +++ b/turbo/app/backup_cmd.go @@ -21,16 +21,16 @@ import ( "os" "path/filepath" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/backup" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/backup" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/cmd/utils/flags" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils/flags" + "github.com/erigontech/erigon/turbo/debug" "github.com/urfave/cli/v2" ) diff --git a/turbo/app/import_cmd.go b/turbo/app/import_cmd.go index ab9598c916d..453cabf8727 100644 --- a/turbo/app/import_cmd.go +++ b/turbo/app/import_cmd.go @@ -30,25 +30,25 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/direct" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" - "github.com/ledgerwatch/erigon/turbo/services" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/debug" - turboNode "github.com/ledgerwatch/erigon/turbo/node" - "github.com/ledgerwatch/erigon/turbo/stages" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/direct" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_chain_reader.go" + "github.com/erigontech/erigon/turbo/services" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/debug" + turboNode "github.com/erigontech/erigon/turbo/node" + "github.com/erigontech/erigon/turbo/stages" ) const ( diff --git a/turbo/app/init_cmd.go b/turbo/app/init_cmd.go index 0fb7805004e..e329b08ac6c 100644 --- a/turbo/app/init_cmd.go +++ b/turbo/app/init_cmd.go @@ -22,14 +22,14 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/debug" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/node" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/node" ) var initCommand = cli.Command{ diff --git a/turbo/app/make_app.go b/turbo/app/make_app.go index 0e0c675363e..1e0b76032ad 100644 --- a/turbo/app/make_app.go +++ b/turbo/app/make_app.go @@ -24,18 +24,18 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon/turbo/logging" - enode "github.com/ledgerwatch/erigon/turbo/node" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - cli2 "github.com/ledgerwatch/erigon/turbo/cli" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon/turbo/logging" + enode "github.com/erigontech/erigon/turbo/node" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + cli2 "github.com/erigontech/erigon/turbo/cli" + "github.com/erigontech/erigon/turbo/debug" ) // MakeApp creates a cli application (based on `github.com/urlfave/cli` package). diff --git a/turbo/app/snapshots_cmd.go b/turbo/app/snapshots_cmd.go index 2e448868c88..d06d4ec7243 100644 --- a/turbo/app/snapshots_cmd.go +++ b/turbo/app/snapshots_cmd.go @@ -38,41 +38,41 @@ import ( "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon-lib/seg" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/diagnostics" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/eth/integrity" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/params" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/logging" - "github.com/ledgerwatch/erigon/turbo/node" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/seg" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cmd/hack/tool/fromdb" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/diagnostics" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/integrity" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/params" + erigoncli "github.com/erigontech/erigon/turbo/cli" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/node" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) func joinFlags(lists ...[]cli.Flag) (res []cli.Flag) { diff --git a/turbo/app/support_cmd.go b/turbo/app/support_cmd.go index be26f492843..475ae88f53e 100644 --- a/turbo/app/support_cmd.go +++ b/turbo/app/support_cmd.go @@ -34,11 +34,11 @@ import ( "github.com/gorilla/websocket" "github.com/urfave/cli/v2" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/debug" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/debug" ) const ( diff --git a/turbo/builder/block_builder.go b/turbo/builder/block_builder.go index ab7d8ed56e7..a6a2f642640 100644 --- a/turbo/builder/block_builder.go +++ b/turbo/builder/block_builder.go @@ -21,10 +21,10 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" ) type BlockBuilderFunc func(param *core.BlockBuilderParameters, interrupt *int32) (*types.BlockWithReceipts, error) diff --git a/turbo/builder/latest_block_built.go b/turbo/builder/latest_block_built.go index 42f6dafbac3..47289bff95a 100644 --- a/turbo/builder/latest_block_built.go +++ b/turbo/builder/latest_block_built.go @@ -19,7 +19,7 @@ package builder import ( "sync" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) type LatestBlockBuiltStore struct { diff --git a/turbo/builder/latest_block_built_test.go b/turbo/builder/latest_block_built_test.go index ace3feaae66..3aa2380159c 100644 --- a/turbo/builder/latest_block_built_test.go +++ b/turbo/builder/latest_block_built_test.go @@ -19,7 +19,7 @@ package builder import ( "testing" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" "github.com/stretchr/testify/assert" ) diff --git a/turbo/cli/default_flags.go b/turbo/cli/default_flags.go index 9e20cadd900..adc992e752f 100644 --- a/turbo/cli/default_flags.go +++ b/turbo/cli/default_flags.go @@ -19,7 +19,7 @@ package cli import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/cmd/utils" + "github.com/erigontech/erigon/cmd/utils" ) // DefaultFlags contains all flags that are used and supported by Erigon binary. diff --git a/turbo/cli/flags.go b/turbo/cli/flags.go index 46e137682af..fa81781ff40 100644 --- a/turbo/cli/flags.go +++ b/turbo/cli/flags.go @@ -21,31 +21,31 @@ import ( "math" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" "github.com/c2h5oh/datasize" "github.com/spf13/pflag" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/turbo/rpchelper" ) var ( diff --git a/turbo/cli/helpers.go b/turbo/cli/helpers.go index 52d228c23e3..dbe0885986e 100644 --- a/turbo/cli/helpers.go +++ b/turbo/cli/helpers.go @@ -25,7 +25,7 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/params" ) // HelpData is a one shot struct to pass to the usage template diff --git a/turbo/cmdtest/test_cmd.go b/turbo/cmdtest/test_cmd.go index 914aad54ace..62e1205c297 100644 --- a/turbo/cmdtest/test_cmd.go +++ b/turbo/cmdtest/test_cmd.go @@ -35,7 +35,7 @@ import ( "text/template" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/docker/docker/pkg/reexec" ) diff --git a/turbo/debug/api.go b/turbo/debug/api.go index 65324eb6801..92c49e5f08f 100644 --- a/turbo/debug/api.go +++ b/turbo/debug/api.go @@ -37,8 +37,8 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" ) // Handler is the global debugging handler. diff --git a/turbo/debug/flags.go b/turbo/debug/flags.go index 7780151c12a..80c4537defd 100644 --- a/turbo/debug/flags.go +++ b/turbo/debug/flags.go @@ -27,19 +27,19 @@ import ( "os" "path/filepath" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon-lib/metrics" "github.com/pelletier/go-toml" "github.com/spf13/cobra" "github.com/urfave/cli/v2" "gopkg.in/yaml.v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/fdlimit" - "github.com/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon/common/fdlimit" + "github.com/erigontech/erigon/turbo/logging" ) var ( diff --git a/turbo/debug/signal.go b/turbo/debug/signal.go index ad3eafc61a7..92d1f8b66b2 100644 --- a/turbo/debug/signal.go +++ b/turbo/debug/signal.go @@ -26,8 +26,8 @@ import ( "golang.org/x/sys/unix" - "github.com/ledgerwatch/erigon-lib/log/v3" - _debug "github.com/ledgerwatch/erigon/common/debug" + "github.com/erigontech/erigon-lib/log/v3" + _debug "github.com/erigontech/erigon/common/debug" ) func ListenSignals(stack io.Closer, logger log.Logger) { diff --git a/turbo/debug/signal_windows.go b/turbo/debug/signal_windows.go index 33966ee7590..28a6c10f886 100644 --- a/turbo/debug/signal_windows.go +++ b/turbo/debug/signal_windows.go @@ -23,8 +23,8 @@ import ( "os" "os/signal" - "github.com/ledgerwatch/erigon-lib/log/v3" - _debug "github.com/ledgerwatch/erigon/common/debug" + "github.com/erigontech/erigon-lib/log/v3" + _debug "github.com/erigontech/erigon/common/debug" ) func ListenSignals(stack io.Closer, logger log.Logger) { diff --git a/turbo/debug/trace.go b/turbo/debug/trace.go index 8e6dcbad9b0..8c3ebb4b998 100644 --- a/turbo/debug/trace.go +++ b/turbo/debug/trace.go @@ -26,7 +26,7 @@ import ( "os" "runtime/trace" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/turbo/engineapi/engine_block_downloader/block_downloader.go b/turbo/engineapi/engine_block_downloader/block_downloader.go index ed1ed29179a..db2b2e29f37 100644 --- a/turbo/engineapi/engine_block_downloader/block_downloader.go +++ b/turbo/engineapi/engine_block_downloader/block_downloader.go @@ -26,25 +26,25 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon/eth/ethconfig" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/adapter" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon/eth/ethconfig" + + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/adapter" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_chain_reader.go" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) const ( diff --git a/turbo/engineapi/engine_block_downloader/body.go b/turbo/engineapi/engine_block_downloader/body.go index 7ac5405be81..645d4a3651e 100644 --- a/turbo/engineapi/engine_block_downloader/body.go +++ b/turbo/engineapi/engine_block_downloader/body.go @@ -22,15 +22,15 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/dataflow" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/dataflow" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/stages/bodydownload" ) // downloadBodies executes bodies download. diff --git a/turbo/engineapi/engine_block_downloader/core.go b/turbo/engineapi/engine_block_downloader/core.go index 0eb98bd9d30..f609cfee046 100644 --- a/turbo/engineapi/engine_block_downloader/core.go +++ b/turbo/engineapi/engine_block_downloader/core.go @@ -19,12 +19,12 @@ package engine_block_downloader import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + libcommon "github.com/erigontech/erigon-lib/common" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) // download is the process that reverse download a specific block hash. diff --git a/turbo/engineapi/engine_helpers/constants.go b/turbo/engineapi/engine_helpers/constants.go index bbbab80f34e..29b2c882335 100644 --- a/turbo/engineapi/engine_helpers/constants.go +++ b/turbo/engineapi/engine_helpers/constants.go @@ -16,7 +16,7 @@ package engine_helpers -import "github.com/ledgerwatch/erigon/rpc" +import "github.com/erigontech/erigon/rpc" const MaxBuilders = 128 diff --git a/turbo/engineapi/engine_helpers/fork_validator.go b/turbo/engineapi/engine_helpers/fork_validator.go index b55b09a282b..bc1cfa73d71 100644 --- a/turbo/engineapi/engine_helpers/fork_validator.go +++ b/turbo/engineapi/engine_helpers/fork_validator.go @@ -23,22 +23,22 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" ) const timingsCacheSize = 16 diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index 63249cfae9e..39788d262e8 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -25,36 +25,36 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/log/v3" - libstate "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/merge" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_block_downloader" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/log/v3" + libstate "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/merge" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/engineapi/engine_block_downloader" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_chain_reader.go" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) var caplinEnabledLog = "Caplin is enabled, so the engine API cannot be used. for external CL use --externalcl" diff --git a/turbo/engineapi/engine_types/jsonrpc.go b/turbo/engineapi/engine_types/jsonrpc.go index 6211c095928..eb6d767731c 100644 --- a/turbo/engineapi/engine_types/jsonrpc.go +++ b/turbo/engineapi/engine_types/jsonrpc.go @@ -21,14 +21,14 @@ import ( "encoding/json" "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon/core/types" ) // ExecutionPayload represents an execution payload (aka block) diff --git a/turbo/engineapi/interface.go b/turbo/engineapi/interface.go index dcea2920cb4..6e8d326ed43 100644 --- a/turbo/engineapi/interface.go +++ b/turbo/engineapi/interface.go @@ -19,10 +19,10 @@ package engineapi import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" ) // EngineAPI Beacon chain communication endpoint diff --git a/turbo/execution/eth1/block_building.go b/turbo/execution/eth1/block_building.go index 88343a4ba3e..e5d9860e5c6 100644 --- a/turbo/execution/eth1/block_building.go +++ b/turbo/execution/eth1/block_building.go @@ -23,17 +23,17 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_utils" ) func (e *EthereumExecutionModule) checkWithdrawalsPresence(time uint64, withdrawals []*types.Withdrawal) error { diff --git a/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go b/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go index 04a5b197c83..43104b7fc1f 100644 --- a/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go +++ b/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go @@ -24,20 +24,20 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_utils" ) type ChainReaderWriterEth1 struct { diff --git a/turbo/execution/eth1/eth1_utils/grpc.go b/turbo/execution/eth1/eth1_utils/grpc.go index e82f055b95f..a4479faa918 100644 --- a/turbo/execution/eth1/eth1_utils/grpc.go +++ b/turbo/execution/eth1/eth1_utils/grpc.go @@ -22,11 +22,12 @@ import ( "math/big" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/core/types" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon/core/types" ) func HeaderToHeaderRPC(header *types.Header) *execution.Header { diff --git a/turbo/execution/eth1/eth1_utils/grpc_test.go b/turbo/execution/eth1/eth1_utils/grpc_test.go index 95f967131a2..2d4edbba944 100644 --- a/turbo/execution/eth1/eth1_utils/grpc_test.go +++ b/turbo/execution/eth1/eth1_utils/grpc_test.go @@ -20,12 +20,13 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" "github.com/stretchr/testify/require" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" ) func makeBlock(txCount, uncleCount, withdrawalCount int) *types.Block { diff --git a/turbo/execution/eth1/ethereum_execution.go b/turbo/execution/eth1/ethereum_execution.go index e3c3dcb7a34..26997319e2b 100644 --- a/turbo/execution/eth1/ethereum_execution.go +++ b/turbo/execution/eth1/ethereum_execution.go @@ -26,29 +26,29 @@ import ( "golang.org/x/sync/semaphore" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/eth/ethconfig" - - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_types" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/stages" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/eth/ethconfig" + + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/stages" ) const maxBlocksLookBehind = 32 diff --git a/turbo/execution/eth1/forkchoice.go b/turbo/execution/eth1/forkchoice.go index 5baa77c71cb..44fd585ef03 100644 --- a/turbo/execution/eth1/forkchoice.go +++ b/turbo/execution/eth1/forkchoice.go @@ -24,19 +24,19 @@ import ( "slices" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/eth/consensuschain" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/gointerfaces" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/eth/consensuschain" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) const startPruneFrom = 1024 diff --git a/turbo/execution/eth1/getters.go b/turbo/execution/eth1/getters.go index ce0428c523d..a0e5964c2f8 100644 --- a/turbo/execution/eth1/getters.go +++ b/turbo/execution/eth1/getters.go @@ -23,16 +23,16 @@ import ( "google.golang.org/protobuf/types/known/emptypb" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/kv" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_utils" ) var errNotFound = errors.New("notfound") diff --git a/turbo/execution/eth1/inserters.go b/turbo/execution/eth1/inserters.go index 45f6060665d..403b4cada6c 100644 --- a/turbo/execution/eth1/inserters.go +++ b/turbo/execution/eth1/inserters.go @@ -22,13 +22,13 @@ import ( "math/big" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/metrics" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_utils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/metrics" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_utils" ) func (s *EthereumExecutionModule) validatePayloadBlobs(expectedBlobHashes []libcommon.Hash, transactions []types.Transaction, blobGasUsed uint64) error { diff --git a/turbo/jsonrpc/admin_api.go b/turbo/jsonrpc/admin_api.go index 3ec930cf8e3..508106134a2 100644 --- a/turbo/jsonrpc/admin_api.go +++ b/turbo/jsonrpc/admin_api.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon/p2p" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon/p2p" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/rpchelper" ) // AdminAPI the interface for the admin_* RPC commands. diff --git a/turbo/jsonrpc/bor_api.go b/turbo/jsonrpc/bor_api.go index 29e27ba06ce..9ee61ce79cb 100644 --- a/turbo/jsonrpc/bor_api.go +++ b/turbo/jsonrpc/bor_api.go @@ -19,13 +19,13 @@ package jsonrpc import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/rpc" ) // BorAPI Bor specific routines diff --git a/turbo/jsonrpc/bor_helper.go b/turbo/jsonrpc/bor_helper.go index 60eed9475ea..abb15ad11b2 100644 --- a/turbo/jsonrpc/bor_helper.go +++ b/turbo/jsonrpc/bor_helper.go @@ -23,16 +23,16 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/polygon/bor/borcfg" + + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) const ( diff --git a/turbo/jsonrpc/bor_snapshot.go b/turbo/jsonrpc/bor_snapshot.go index f70673d2b26..62ae02fca59 100644 --- a/turbo/jsonrpc/bor_snapshot.go +++ b/turbo/jsonrpc/bor_snapshot.go @@ -22,19 +22,19 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/polygon/bor/borcfg" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon/polygon/bor/valset" + "github.com/erigontech/erigon/rpc" ) type Snapshot struct { diff --git a/turbo/jsonrpc/call_traces_test.go b/turbo/jsonrpc/call_traces_test.go index 60e47ff0cb0..91529fe7051 100644 --- a/turbo/jsonrpc/call_traces_test.go +++ b/turbo/jsonrpc/call_traces_test.go @@ -27,12 +27,12 @@ import ( "github.com/stretchr/testify/require" "github.com/valyala/fastjson" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/stages/mock" ) func blockNumbersFromTraces(t *testing.T, b []byte) []int { diff --git a/turbo/jsonrpc/contracts/gen_poly.go b/turbo/jsonrpc/contracts/gen_poly.go index f2749850fa9..185e7624542 100644 --- a/turbo/jsonrpc/contracts/gen_poly.go +++ b/turbo/jsonrpc/contracts/gen_poly.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/turbo/jsonrpc/contracts/gen_token.go b/turbo/jsonrpc/contracts/gen_token.go index 3973e6d0e62..a0da6eff9be 100644 --- a/turbo/jsonrpc/contracts/gen_token.go +++ b/turbo/jsonrpc/contracts/gen_token.go @@ -7,14 +7,14 @@ import ( "math/big" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - - ethereum "github.com/ledgerwatch/erigon" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + libcommon "github.com/erigontech/erigon-lib/common" + + ethereum "github.com/erigontech/erigon" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // Reference imports to suppress errors if they are not otherwise used. diff --git a/turbo/jsonrpc/corner_cases_support_test.go b/turbo/jsonrpc/corner_cases_support_test.go index 5527318c27f..e3dc5828732 100644 --- a/turbo/jsonrpc/corner_cases_support_test.go +++ b/turbo/jsonrpc/corner_cases_support_test.go @@ -22,16 +22,16 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/rpc" ) // TestNotFoundMustReturnNil - next methods - when record not found in db - must return nil instead of error -// see https://github.com/ledgerwatch/erigon/issues/1645 +// see https://github.com/erigontech/erigon/issues/1645 func TestNotFoundMustReturnNil(t *testing.T) { require := require.New(t) m, _, _ := rpcdaemontest.CreateTestSentry(t) diff --git a/turbo/jsonrpc/daemon.go b/turbo/jsonrpc/daemon.go index dc2fad727ba..d5dab24c086 100644 --- a/turbo/jsonrpc/daemon.go +++ b/turbo/jsonrpc/daemon.go @@ -17,18 +17,18 @@ package jsonrpc import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/clique" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/clique" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" ) // APIList describes the list of available RPC apis diff --git a/turbo/jsonrpc/db_api_deprecated.go b/turbo/jsonrpc/db_api_deprecated.go index c61afcac22f..d5ab514897e 100644 --- a/turbo/jsonrpc/db_api_deprecated.go +++ b/turbo/jsonrpc/db_api_deprecated.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" ) // DBAPI the interface for the db_ RPC commands (deprecated) diff --git a/turbo/jsonrpc/debug_api.go b/turbo/jsonrpc/debug_api.go index cf5a54eed4a..ee2ee32d5b3 100644 --- a/turbo/jsonrpc/debug_api.go +++ b/turbo/jsonrpc/debug_api.go @@ -20,24 +20,24 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - tracersConfig "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/eth/stagedsync/stages" + tracersConfig "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" ) // AccountRangeMaxResults is the maximum number of results to be returned diff --git a/turbo/jsonrpc/debug_api_test.go b/turbo/jsonrpc/debug_api_test.go index 5b841406bfd..d54b9d4c915 100644 --- a/turbo/jsonrpc/debug_api_test.go +++ b/turbo/jsonrpc/debug_api_test.go @@ -26,20 +26,20 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/core/types" - tracersConfig "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/core/types" + tracersConfig "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/adapter/ethapi" ) var dumper = spew.ConfigState{Indent: " "} diff --git a/turbo/jsonrpc/erigon_api.go b/turbo/jsonrpc/erigon_api.go index 034aa082a61..3438248e087 100644 --- a/turbo/jsonrpc/erigon_api.go +++ b/turbo/jsonrpc/erigon_api.go @@ -19,18 +19,18 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/eth/filters" + "github.com/erigontech/erigon/eth/filters" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // ErigonAPI Erigon specific routines diff --git a/turbo/jsonrpc/erigon_block.go b/turbo/jsonrpc/erigon_block.go index 12af8b51d86..c27c031d1ae 100644 --- a/turbo/jsonrpc/erigon_block.go +++ b/turbo/jsonrpc/erigon_block.go @@ -22,21 +22,21 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/turbo/services" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon/turbo/services" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" ) // GetHeaderByNumber implements erigon_getHeaderByNumber. Returns a block's header given a block number ignoring the block's transaction and uncle list (may be faster). diff --git a/turbo/jsonrpc/erigon_cache_check.go b/turbo/jsonrpc/erigon_cache_check.go index db7cc8a749a..6e58d83038c 100644 --- a/turbo/jsonrpc/erigon_cache_check.go +++ b/turbo/jsonrpc/erigon_cache_check.go @@ -19,7 +19,7 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/kvcache" ) func (api *ErigonImpl) CacheCheck() (*kvcache.CacheValidationResult, error) { diff --git a/turbo/jsonrpc/erigon_nodeInfo.go b/turbo/jsonrpc/erigon_nodeInfo.go index c7cfd56766b..35d61a32829 100644 --- a/turbo/jsonrpc/erigon_nodeInfo.go +++ b/turbo/jsonrpc/erigon_nodeInfo.go @@ -19,7 +19,7 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon/p2p" ) const ( diff --git a/turbo/jsonrpc/erigon_receipts.go b/turbo/jsonrpc/erigon_receipts.go index 150a4fba60e..5ac94682a7f 100644 --- a/turbo/jsonrpc/erigon_receipts.go +++ b/turbo/jsonrpc/erigon_receipts.go @@ -23,19 +23,19 @@ import ( "fmt" "github.com/RoaringBitmap/roaring" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/ethdb/cbor" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/ethdb/cbor" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // GetLogsByHash implements erigon_getLogsByHash. Returns an array of arrays of logs generated by the transactions in the block given by the block's hash. diff --git a/turbo/jsonrpc/erigon_receipts_test.go b/turbo/jsonrpc/erigon_receipts_test.go index 27f2e840fbf..912e666d347 100644 --- a/turbo/jsonrpc/erigon_receipts_test.go +++ b/turbo/jsonrpc/erigon_receipts_test.go @@ -26,21 +26,21 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestGetLogs(t *testing.T) { diff --git a/turbo/jsonrpc/erigon_system.go b/turbo/jsonrpc/erigon_system.go index f32aa56e3aa..1407ecee407 100644 --- a/turbo/jsonrpc/erigon_system.go +++ b/turbo/jsonrpc/erigon_system.go @@ -20,15 +20,15 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/forkid" - borfinality "github.com/ledgerwatch/erigon/polygon/bor/finality" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/core/forkid" + borfinality "github.com/erigontech/erigon/polygon/bor/finality" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // Forks is a data type to record a list of forks passed by this node diff --git a/turbo/jsonrpc/eth_accounts.go b/turbo/jsonrpc/eth_accounts.go index 66bc552e210..84ecfe48810 100644 --- a/turbo/jsonrpc/eth_accounts.go +++ b/turbo/jsonrpc/eth_accounts.go @@ -21,19 +21,19 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/rpchelper" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/rpc" ) // GetBalance implements eth_getBalance. Returns the balance of an account for a given address. diff --git a/turbo/jsonrpc/eth_api.go b/turbo/jsonrpc/eth_api.go index 89238ae8e94..02276b7d310 100644 --- a/turbo/jsonrpc/eth_api.go +++ b/turbo/jsonrpc/eth_api.go @@ -20,39 +20,39 @@ import ( "bytes" "context" "fmt" - "github.com/ledgerwatch/erigon/turbo/jsonrpc/receipts" + "github.com/erigontech/erigon/turbo/jsonrpc/receipts" "math/big" "sync" "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" lru "github.com/hashicorp/golang-lru/v2" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - types2 "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - ethFilters "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/rpc" - ethapi2 "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + ethFilters "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/rpc" + ethapi2 "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" ) // EthAPI is a collection of functions that are exposed in the diff --git a/turbo/jsonrpc/eth_api_test.go b/turbo/jsonrpc/eth_api_test.go index fb558773bd2..5b6dddbc242 100644 --- a/turbo/jsonrpc/eth_api_test.go +++ b/turbo/jsonrpc/eth_api_test.go @@ -21,23 +21,23 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" ) func newBaseApiForTest(m *mock.MockSentry) *BaseAPI { diff --git a/turbo/jsonrpc/eth_block.go b/turbo/jsonrpc/eth_block.go index 4a10d5bb1b7..fbab1391182 100644 --- a/turbo/jsonrpc/eth_block.go +++ b/turbo/jsonrpc/eth_block.go @@ -22,26 +22,26 @@ import ( "math/big" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/common/math" - "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/crypto/cryptopool" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto/cryptopool" + "github.com/erigontech/erigon/polygon/bor/borcfg" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) func (api *APIImpl) CallBundle(ctx context.Context, txHashes []common.Hash, stateBlockNumberOrHash rpc.BlockNumberOrHash, timeoutMilliSecondsPtr *int64) (map[string]interface{}, error) { @@ -86,7 +86,7 @@ func (api *APIImpl) CallBundle(ctx context.Context, txHashes []common.Hash, stat } } if txn == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/turbo-geth/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } txs = append(txs, txn) } @@ -264,7 +264,7 @@ func (api *APIImpl) GetBlockByHash(ctx context.Context, numberOrHash rpc.BlockNu // eth_getBlockByHash with a block number as a parameter // so no matter how weird that is, we would love to support that. if numberOrHash.BlockNumber == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } return api.GetBlockByNumber(ctx, *numberOrHash.BlockNumber, fullTx) } @@ -283,7 +283,7 @@ func (api *APIImpl) GetBlockByHash(ctx context.Context, numberOrHash rpc.BlockNu return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } number := block.NumberU64() diff --git a/turbo/jsonrpc/eth_block_test.go b/turbo/jsonrpc/eth_block_test.go index 8962d0399fa..70cbf9c7bcc 100644 --- a/turbo/jsonrpc/eth_block_test.go +++ b/turbo/jsonrpc/eth_block_test.go @@ -21,24 +21,24 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/common" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages/mock" ) // Gets the latest block number with the latest tag diff --git a/turbo/jsonrpc/eth_call.go b/turbo/jsonrpc/eth_call.go index 5d88d322a5a..e638eae19b8 100644 --- a/turbo/jsonrpc/eth_call.go +++ b/turbo/jsonrpc/eth_call.go @@ -25,28 +25,28 @@ import ( "github.com/holiman/uint256" "google.golang.org/grpc" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - types2 "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" - ethapi2 "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/transactions" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" + ethapi2 "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) var latestNumOrHash = rpc.BlockNumberOrHashWithNumber(rpc.LatestBlockNumber) diff --git a/turbo/jsonrpc/eth_callMany.go b/turbo/jsonrpc/eth_callMany.go index e8a4bc02e02..9b2bab097ec 100644 --- a/turbo/jsonrpc/eth_callMany.go +++ b/turbo/jsonrpc/eth_callMany.go @@ -25,20 +25,20 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "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/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" ) type BlockOverrides struct { diff --git a/turbo/jsonrpc/eth_callMany_test.go b/turbo/jsonrpc/eth_callMany_test.go index c73118370fc..32c3e33b03f 100644 --- a/turbo/jsonrpc/eth_callMany_test.go +++ b/turbo/jsonrpc/eth_callMany_test.go @@ -24,22 +24,22 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/accounts/abi/bind" - "github.com/ledgerwatch/erigon/accounts/abi/bind/backends" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/jsonrpc/contracts" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv/kvcache" + + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/accounts/abi/bind" + "github.com/erigontech/erigon/accounts/abi/bind/backends" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/jsonrpc/contracts" ) // block 1 contains 3 Transactions diff --git a/turbo/jsonrpc/eth_call_test.go b/turbo/jsonrpc/eth_call_test.go index 405c24b63fa..017bee2ce0c 100644 --- a/turbo/jsonrpc/eth_call_test.go +++ b/turbo/jsonrpc/eth_call_test.go @@ -23,34 +23,34 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/common/math" - "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/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/trie" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/trie" ) func TestEstimateGas(t *testing.T) { diff --git a/turbo/jsonrpc/eth_deprecated.go b/turbo/jsonrpc/eth_deprecated.go index 8be8748b876..6d816428bd3 100644 --- a/turbo/jsonrpc/eth_deprecated.go +++ b/turbo/jsonrpc/eth_deprecated.go @@ -20,8 +20,8 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) // Accounts implements eth_accounts. Returns a list of addresses owned by the client. diff --git a/turbo/jsonrpc/eth_filters.go b/turbo/jsonrpc/eth_filters.go index 634cd4ed632..5852d1015e0 100644 --- a/turbo/jsonrpc/eth_filters.go +++ b/turbo/jsonrpc/eth_filters.go @@ -20,13 +20,13 @@ import ( "context" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // NewPendingTransactionFilter new transaction filter diff --git a/turbo/jsonrpc/eth_filters_test.go b/turbo/jsonrpc/eth_filters_test.go index 98ce50899ad..349b85e37da 100644 --- a/turbo/jsonrpc/eth_filters_test.go +++ b/turbo/jsonrpc/eth_filters_test.go @@ -22,22 +22,22 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/rpc/rpccfg" "github.com/stretchr/testify/assert" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestNewFilters(t *testing.T) { diff --git a/turbo/jsonrpc/eth_mining.go b/turbo/jsonrpc/eth_mining.go index 1192d6946d1..3b9b9ca968a 100644 --- a/turbo/jsonrpc/eth_mining.go +++ b/turbo/jsonrpc/eth_mining.go @@ -20,13 +20,13 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" + libcommon "github.com/erigontech/erigon-lib/common" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" "google.golang.org/grpc/status" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // Coinbase implements eth_coinbase. Returns the current client coinbase address. diff --git a/turbo/jsonrpc/eth_mining_test.go b/turbo/jsonrpc/eth_mining_test.go index 4142d0abbd5..69526bfa793 100644 --- a/turbo/jsonrpc/eth_mining_test.go +++ b/turbo/jsonrpc/eth_mining_test.go @@ -21,20 +21,20 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/rpc/rpccfg" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestPendingBlock(t *testing.T) { diff --git a/turbo/jsonrpc/eth_receipts.go b/turbo/jsonrpc/eth_receipts.go index 6fd32143f7a..cfc11f29960 100644 --- a/turbo/jsonrpc/eth_receipts.go +++ b/turbo/jsonrpc/eth_receipts.go @@ -22,23 +22,23 @@ import ( "github.com/RoaringBitmap/roaring" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/stream" - - "github.com/ledgerwatch/erigon/cmd/state/exec3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/eth/filters" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/stream" + + "github.com/erigontech/erigon/cmd/state/exec3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/eth/filters" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // getReceipts - checking in-mem cache, or else fallback to db, or else fallback to re-exec of block to re-gen receipts @@ -406,7 +406,7 @@ func (api *APIImpl) GetTransactionReceipt(ctx context.Context, txnHash common.Ha return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } var txnIndex uint64 diff --git a/turbo/jsonrpc/eth_subscribe_test.go b/turbo/jsonrpc/eth_subscribe_test.go index cdcdc103551..c4024683453 100644 --- a/turbo/jsonrpc/eth_subscribe_test.go +++ b/turbo/jsonrpc/eth_subscribe_test.go @@ -23,22 +23,22 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/wrap" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/wrap" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcservices" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/ethdb/privateapi" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcservices" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/ethdb/privateapi" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestEthSubscribe(t *testing.T) { diff --git a/turbo/jsonrpc/eth_system.go b/turbo/jsonrpc/eth_system.go index 917354caf13..30c0a4b9873 100644 --- a/turbo/jsonrpc/eth_system.go +++ b/turbo/jsonrpc/eth_system.go @@ -21,18 +21,18 @@ import ( "math" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/gasprice" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/gasprice" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // BlockNumber implements eth_blockNumber. Returns the block number of most recent block. diff --git a/turbo/jsonrpc/eth_system_test.go b/turbo/jsonrpc/eth_system_test.go index 542594cd2ef..d95df57615d 100644 --- a/turbo/jsonrpc/eth_system_test.go +++ b/turbo/jsonrpc/eth_system_test.go @@ -24,15 +24,15 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestGasPrice(t *testing.T) { diff --git a/turbo/jsonrpc/eth_txs.go b/turbo/jsonrpc/eth_txs.go index 5c5a237361f..c8dab63955d 100644 --- a/turbo/jsonrpc/eth_txs.go +++ b/turbo/jsonrpc/eth_txs.go @@ -21,19 +21,19 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - - "github.com/ledgerwatch/erigon/core/rawdb" - types2 "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + types "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + + "github.com/erigontech/erigon/core/rawdb" + types2 "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) // GetTransactionByHash implements eth_getTransactionByHash. Returns information about a transaction given the transaction's hash. @@ -191,7 +191,7 @@ func (api *APIImpl) GetTransactionByBlockHashAndIndex(ctx context.Context, block return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } txs := block.Transactions() @@ -226,7 +226,7 @@ func (api *APIImpl) GetRawTransactionByBlockHashAndIndex(ctx context.Context, bl return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } return newRPCRawTransactionFromBlockIndex(block, uint64(index)) @@ -255,7 +255,7 @@ func (api *APIImpl) GetTransactionByBlockNumberAndIndex(ctx context.Context, blo return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } txs := block.Transactions() @@ -290,7 +290,7 @@ func (api *APIImpl) GetRawTransactionByBlockNumberAndIndex(ctx context.Context, return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } return newRPCRawTransactionFromBlockIndex(block, uint64(index)) diff --git a/turbo/jsonrpc/eth_uncles.go b/turbo/jsonrpc/eth_uncles.go index d4c5a9105e3..055edfb9dae 100644 --- a/turbo/jsonrpc/eth_uncles.go +++ b/turbo/jsonrpc/eth_uncles.go @@ -19,16 +19,16 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" ) // GetUncleByBlockNumberAndIndex implements eth_getUncleByBlockNumberAndIndex. Returns information about an uncle given a block's number and the index of the uncle. @@ -48,7 +48,7 @@ func (api *APIImpl) GetUncleByBlockNumberAndIndex(ctx context.Context, number rp return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } additionalFields := make(map[string]interface{}) td, err := rawdb.ReadTd(tx, block.Hash(), blockNum) @@ -79,7 +79,7 @@ func (api *APIImpl) GetUncleByBlockHashAndIndex(ctx context.Context, hash common return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } number := block.NumberU64() additionalFields := make(map[string]interface{}) @@ -119,7 +119,7 @@ func (api *APIImpl) GetUncleCountByBlockNumber(ctx context.Context, number rpc.B return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } n = hexutil.Uint(len(block.Uncles())) return &n, nil @@ -136,7 +136,7 @@ func (api *APIImpl) GetUncleCountByBlockHash(ctx context.Context, hash common.Ha number := rawdb.ReadHeaderNumber(tx, hash) if number == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } block, err := api.blockWithSenders(ctx, tx, hash, *number) @@ -144,7 +144,7 @@ func (api *APIImpl) GetUncleCountByBlockHash(ctx context.Context, hash common.Ha return nil, err } if block == nil { - return nil, nil // not error, see https://github.com/ledgerwatch/erigon/issues/1645 + return nil, nil // not error, see https://github.com/erigontech/erigon/issues/1645 } n = hexutil.Uint(len(block.Uncles())) return &n, nil diff --git a/turbo/jsonrpc/gen_traces_test.go b/turbo/jsonrpc/gen_traces_test.go index 2ac2c115e56..d2b2f8b7a24 100644 --- a/turbo/jsonrpc/gen_traces_test.go +++ b/turbo/jsonrpc/gen_traces_test.go @@ -25,17 +25,17 @@ import ( jsoniter "github.com/json-iterator/go" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - tracersConfig "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + tracersConfig "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/rpc/rpccfg" // Force-load native and js packages, to trigger registration - _ "github.com/ledgerwatch/erigon/eth/tracers/js" - _ "github.com/ledgerwatch/erigon/eth/tracers/native" + _ "github.com/erigontech/erigon/eth/tracers/js" + _ "github.com/erigontech/erigon/eth/tracers/native" ) /* diff --git a/turbo/jsonrpc/get_chain_config_test.go b/turbo/jsonrpc/get_chain_config_test.go index d636856b67d..e8c226ce41e 100644 --- a/turbo/jsonrpc/get_chain_config_test.go +++ b/turbo/jsonrpc/get_chain_config_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" ) func TestGetChainConfig(t *testing.T) { diff --git a/turbo/jsonrpc/graphql_api.go b/turbo/jsonrpc/graphql_api.go index 5fcbba269b1..5d51cd74938 100644 --- a/turbo/jsonrpc/graphql_api.go +++ b/turbo/jsonrpc/graphql_api.go @@ -21,16 +21,16 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" ) type GraphQLAPI interface { @@ -156,7 +156,7 @@ func (api *GraphQLAPIImpl) delegateGetBlockByNumber(tx kv.Tx, b *types.Block, nu additionalFields := make(map[string]interface{}) response, err := ethapi.RPCMarshalBlock(b, inclTx, inclTx, additionalFields) if !inclTx { - delete(response, "transactions") // workaround for https://github.com/ledgerwatch/erigon/issues/4989#issuecomment-1218415666 + delete(response, "transactions") // workaround for https://github.com/erigontech/erigon/issues/4989#issuecomment-1218415666 } response["totalDifficulty"] = (*hexutil.Big)(td) response["transactionCount"] = b.Transactions().Len() diff --git a/turbo/jsonrpc/net_api.go b/turbo/jsonrpc/net_api.go index 6624b054297..45784b2156a 100644 --- a/turbo/jsonrpc/net_api.go +++ b/turbo/jsonrpc/net_api.go @@ -21,9 +21,9 @@ import ( "fmt" "strconv" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/rpchelper" ) // NetAPI the interface for the net_ RPC commands diff --git a/turbo/jsonrpc/otterscan_api.go b/turbo/jsonrpc/otterscan_api.go index 5d46acb46f9..7c1960fa5ef 100644 --- a/turbo/jsonrpc/otterscan_api.go +++ b/turbo/jsonrpc/otterscan_api.go @@ -24,23 +24,23 @@ import ( "github.com/holiman/uint256" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - hexutil2 "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + hexutil2 "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) // API_LEVEL Must be incremented every time new additions are made @@ -273,7 +273,7 @@ func delegateGetBlockByNumber(tx kv.Tx, b *types.Block, number rpc.BlockNumber, additionalFields := make(map[string]interface{}) response, err := ethapi.RPCMarshalBlock(b, inclTx, inclTx, additionalFields) if !inclTx { - delete(response, "transactions") // workaround for https://github.com/ledgerwatch/erigon/issues/4989#issuecomment-1218415666 + delete(response, "transactions") // workaround for https://github.com/erigontech/erigon/issues/4989#issuecomment-1218415666 } response["totalDifficulty"] = (*hexutil2.Big)(td) response["transactionCount"] = b.Transactions().Len() diff --git a/turbo/jsonrpc/otterscan_block_details.go b/turbo/jsonrpc/otterscan_block_details.go index 33100902c64..bd1d16d8011 100644 --- a/turbo/jsonrpc/otterscan_block_details.go +++ b/turbo/jsonrpc/otterscan_block_details.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" ) func (api *OtterscanAPIImpl) GetBlockDetails(ctx context.Context, number rpc.BlockNumber) (map[string]interface{}, error) { diff --git a/turbo/jsonrpc/otterscan_contract_creator.go b/turbo/jsonrpc/otterscan_contract_creator.go index 0f84354d6aa..29fc58c654a 100644 --- a/turbo/jsonrpc/otterscan_contract_creator.go +++ b/turbo/jsonrpc/otterscan_contract_creator.go @@ -21,15 +21,15 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/rpchelper" ) type ContractCreatorData struct { diff --git a/turbo/jsonrpc/otterscan_contract_creator_test.go b/turbo/jsonrpc/otterscan_contract_creator_test.go index 791bfd7cc7d..094fcc8d0e7 100644 --- a/turbo/jsonrpc/otterscan_contract_creator_test.go +++ b/turbo/jsonrpc/otterscan_contract_creator_test.go @@ -19,8 +19,8 @@ package jsonrpc import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_default_tracer.go b/turbo/jsonrpc/otterscan_default_tracer.go index f25f408d6dc..da6dd5c8bb1 100644 --- a/turbo/jsonrpc/otterscan_default_tracer.go +++ b/turbo/jsonrpc/otterscan_default_tracer.go @@ -18,9 +18,10 @@ package jsonrpc import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/vm" ) // Helper implementation of vm.Tracer; since the interface is big and most diff --git a/turbo/jsonrpc/otterscan_generic_tracer.go b/turbo/jsonrpc/otterscan_generic_tracer.go index 89e031e22df..07fc4339207 100644 --- a/turbo/jsonrpc/otterscan_generic_tracer.go +++ b/turbo/jsonrpc/otterscan_generic_tracer.go @@ -19,13 +19,13 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/state/exec3" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/state/exec3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" ) type GenericTracer interface { diff --git a/turbo/jsonrpc/otterscan_has_code.go b/turbo/jsonrpc/otterscan_has_code.go index 1daa84423b8..454031acbd1 100644 --- a/turbo/jsonrpc/otterscan_has_code.go +++ b/turbo/jsonrpc/otterscan_has_code.go @@ -20,10 +20,10 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" ) func (api *OtterscanAPIImpl) HasCode(ctx context.Context, address common.Address, blockNrOrHash rpc.BlockNumberOrHash) (bool, error) { diff --git a/turbo/jsonrpc/otterscan_search_backward.go b/turbo/jsonrpc/otterscan_search_backward.go index 79e318020db..1d2e1542192 100644 --- a/turbo/jsonrpc/otterscan_search_backward.go +++ b/turbo/jsonrpc/otterscan_search_backward.go @@ -20,8 +20,8 @@ import ( "bytes" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) // Given a ChunkLocator, moves back over the chunks and inside each chunk, moves diff --git a/turbo/jsonrpc/otterscan_search_backward_test.go b/turbo/jsonrpc/otterscan_search_backward_test.go index 0fc9845e5b1..d623070d6e3 100644 --- a/turbo/jsonrpc/otterscan_search_backward_test.go +++ b/turbo/jsonrpc/otterscan_search_backward_test.go @@ -20,11 +20,11 @@ import ( "bytes" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/RoaringBitmap/roaring/roaring64" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_search_forward.go b/turbo/jsonrpc/otterscan_search_forward.go index d2030789e8c..169a5d0f2d5 100644 --- a/turbo/jsonrpc/otterscan_search_forward.go +++ b/turbo/jsonrpc/otterscan_search_forward.go @@ -20,8 +20,8 @@ import ( "bytes" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" ) // Given a ChunkLocator, moves forward over the chunks and inside each chunk, moves diff --git a/turbo/jsonrpc/otterscan_search_forward_test.go b/turbo/jsonrpc/otterscan_search_forward_test.go index 14b7ad9fc0d..9a0dd14b5e7 100644 --- a/turbo/jsonrpc/otterscan_search_forward_test.go +++ b/turbo/jsonrpc/otterscan_search_forward_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/RoaringBitmap/roaring/roaring64" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_search_trace.go b/turbo/jsonrpc/otterscan_search_trace.go index 540d8456d92..de6acbbda79 100644 --- a/turbo/jsonrpc/otterscan_search_trace.go +++ b/turbo/jsonrpc/otterscan_search_trace.go @@ -20,17 +20,17 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/ethutils" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/ethutils" + "github.com/erigontech/erigon/turbo/rpchelper" ) func (api *OtterscanAPIImpl) searchTraceBlock(ctx context.Context, addr common.Address, chainConfig *chain.Config, idx int, bNum uint64, results []*TransactionsWithReceipts) { diff --git a/turbo/jsonrpc/otterscan_search_v3.go b/turbo/jsonrpc/otterscan_search_v3.go index f830dae394d..72183c16d4d 100644 --- a/turbo/jsonrpc/otterscan_search_v3.go +++ b/turbo/jsonrpc/otterscan_search_v3.go @@ -20,15 +20,15 @@ import ( "context" "slices" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/state/exec3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethutils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/state/exec3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethutils" ) type txNumsIterFactory func(tx kv.TemporalTx, addr common.Address, fromTxNum int) (*rawdbv3.MapTxNum2BlockNumIter, error) diff --git a/turbo/jsonrpc/otterscan_trace_contract_creator.go b/turbo/jsonrpc/otterscan_trace_contract_creator.go index d3cd705126b..d5bfa03258f 100644 --- a/turbo/jsonrpc/otterscan_trace_contract_creator.go +++ b/turbo/jsonrpc/otterscan_trace_contract_creator.go @@ -20,10 +20,11 @@ import ( "context" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" ) type CreateTracer struct { diff --git a/turbo/jsonrpc/otterscan_trace_operations.go b/turbo/jsonrpc/otterscan_trace_operations.go index b796a54f67f..8484ac6f206 100644 --- a/turbo/jsonrpc/otterscan_trace_operations.go +++ b/turbo/jsonrpc/otterscan_trace_operations.go @@ -19,12 +19,12 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon/core/vm" ) type OperationType int diff --git a/turbo/jsonrpc/otterscan_trace_touch.go b/turbo/jsonrpc/otterscan_trace_touch.go index 9f4857c0b54..6a0c60b8662 100644 --- a/turbo/jsonrpc/otterscan_trace_touch.go +++ b/turbo/jsonrpc/otterscan_trace_touch.go @@ -20,9 +20,10 @@ import ( "bytes" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/vm" ) type TouchTracer struct { diff --git a/turbo/jsonrpc/otterscan_trace_transaction.go b/turbo/jsonrpc/otterscan_trace_transaction.go index c029f2f004e..7ad6d07e9c3 100644 --- a/turbo/jsonrpc/otterscan_trace_transaction.go +++ b/turbo/jsonrpc/otterscan_trace_transaction.go @@ -20,14 +20,14 @@ import ( "context" "math/big" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/vm" + "github.com/erigontech/erigon/core/vm" ) func (api *OtterscanAPIImpl) TraceTransaction(ctx context.Context, hash common.Hash) ([]*TraceEntry, error) { diff --git a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go index 5367e391d6b..ded63042da3 100644 --- a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go +++ b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go @@ -21,14 +21,14 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) func (api *OtterscanAPIImpl) GetTransactionBySenderAndNonce(ctx context.Context, addr common.Address, nonce uint64) (*common.Hash, error) { diff --git a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go index 42ee6dfae6c..8ff931ce37e 100644 --- a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go +++ b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go @@ -19,9 +19,9 @@ package jsonrpc import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/rpc/rpccfg" "github.com/stretchr/testify/require" ) diff --git a/turbo/jsonrpc/otterscan_transaction_error.go b/turbo/jsonrpc/otterscan_transaction_error.go index e9df53fd0cd..bb810b67531 100644 --- a/turbo/jsonrpc/otterscan_transaction_error.go +++ b/turbo/jsonrpc/otterscan_transaction_error.go @@ -19,8 +19,8 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" ) func (api *OtterscanAPIImpl) GetTransactionError(ctx context.Context, hash common.Hash) (hexutility.Bytes, error) { diff --git a/turbo/jsonrpc/otterscan_types.go b/turbo/jsonrpc/otterscan_types.go index f1d9d9b3e81..7ef891f881a 100644 --- a/turbo/jsonrpc/otterscan_types.go +++ b/turbo/jsonrpc/otterscan_types.go @@ -20,9 +20,9 @@ import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" ) // Bootstrap a function able to locate a series of byte chunks containing diff --git a/turbo/jsonrpc/overlay_api.go b/turbo/jsonrpc/overlay_api.go index 102b6ecaf4c..e48579170cb 100644 --- a/turbo/jsonrpc/overlay_api.go +++ b/turbo/jsonrpc/overlay_api.go @@ -26,24 +26,24 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "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/crypto" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" ) type OverlayAPI interface { diff --git a/turbo/jsonrpc/overlay_create_tracer.go b/turbo/jsonrpc/overlay_create_tracer.go index a895e0790b7..29be53228a8 100644 --- a/turbo/jsonrpc/overlay_create_tracer.go +++ b/turbo/jsonrpc/overlay_create_tracer.go @@ -18,8 +18,9 @@ package jsonrpc import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/vm" ) type OverlayCreateTracer struct { diff --git a/turbo/jsonrpc/parity_api.go b/turbo/jsonrpc/parity_api.go index 6680e533766..c47c1be644a 100644 --- a/turbo/jsonrpc/parity_api.go +++ b/turbo/jsonrpc/parity_api.go @@ -20,15 +20,15 @@ import ( "context" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) var latestTag = libcommon.BytesToHash([]byte("latest")) diff --git a/turbo/jsonrpc/parity_api_test.go b/turbo/jsonrpc/parity_api_test.go index b9c5a110e73..18d8b397f78 100644 --- a/turbo/jsonrpc/parity_api_test.go +++ b/turbo/jsonrpc/parity_api_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/rpc/rpccfg" "github.com/stretchr/testify/assert" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/rpc" ) var latestBlock = rpc.BlockNumberOrHashWithNumber(rpc.LatestBlockNumber) diff --git a/turbo/jsonrpc/receipts/receipts_generator.go b/turbo/jsonrpc/receipts/receipts_generator.go index c27fd5d4fb8..a69bad72115 100644 --- a/turbo/jsonrpc/receipts/receipts_generator.go +++ b/turbo/jsonrpc/receipts/receipts_generator.go @@ -2,19 +2,21 @@ package receipts import ( "context" + lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "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/turbo/services" - "github.com/ledgerwatch/erigon/turbo/transactions" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/transactions" ) type Generator struct { diff --git a/turbo/jsonrpc/send_transaction.go b/turbo/jsonrpc/send_transaction.go index e5fbe2fcce3..3c191e572cf 100644 --- a/turbo/jsonrpc/send_transaction.go +++ b/turbo/jsonrpc/send_transaction.go @@ -6,12 +6,12 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - txPoolProto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + txPoolProto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) // SendRawTransaction implements eth_sendRawTransaction. Creates new message call transaction or a contract creation for previously-signed transactions. diff --git a/turbo/jsonrpc/send_transaction_test.go b/turbo/jsonrpc/send_transaction_test.go index 7e7984feaff..f88aa554c42 100644 --- a/turbo/jsonrpc/send_transaction_test.go +++ b/turbo/jsonrpc/send_transaction_test.go @@ -27,29 +27,29 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/common/u256" - - "github.com/ledgerwatch/erigon-lib/log/v3" - - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/jsonrpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/common" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/rpc/rpccfg" + + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/common/u256" + + "github.com/erigontech/erigon-lib/log/v3" + + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/jsonrpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages" + "github.com/erigontech/erigon/turbo/stages/mock" ) func newBaseApiForTest(m *mock.MockSentry) *jsonrpc.BaseAPI { diff --git a/turbo/jsonrpc/storage_range.go b/turbo/jsonrpc/storage_range.go index 35f27479006..721d675a3d5 100644 --- a/turbo/jsonrpc/storage_range.go +++ b/turbo/jsonrpc/storage_range.go @@ -18,9 +18,10 @@ package jsonrpc import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" ) // StorageRangeResult is the result of a debug_storageRangeAt API call. diff --git a/turbo/jsonrpc/trace_adhoc.go b/turbo/jsonrpc/trace_adhoc.go index a92d5895422..57952a31795 100644 --- a/turbo/jsonrpc/trace_adhoc.go +++ b/turbo/jsonrpc/trace_adhoc.go @@ -26,24 +26,24 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - types2 "github.com/ledgerwatch/erigon-lib/types" - math2 "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/polygon/tracer" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/transactions" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + types2 "github.com/erigontech/erigon-lib/types" + math2 "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/polygon/tracer" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) const ( diff --git a/turbo/jsonrpc/trace_adhoc_test.go b/turbo/jsonrpc/trace_adhoc_test.go index b789a431928..1d3adcdaaf0 100644 --- a/turbo/jsonrpc/trace_adhoc_test.go +++ b/turbo/jsonrpc/trace_adhoc_test.go @@ -28,23 +28,23 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestEmptyQuery(t *testing.T) { diff --git a/turbo/jsonrpc/trace_api.go b/turbo/jsonrpc/trace_api.go index b5856213b03..b3c3bf743da 100644 --- a/turbo/jsonrpc/trace_api.go +++ b/turbo/jsonrpc/trace_api.go @@ -22,12 +22,12 @@ import ( jsoniter "github.com/json-iterator/go" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/cli/httpcfg" - "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/rpc" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/rpcdaemon/cli/httpcfg" + "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/rpc" ) // TraceAPI RPC interface into tracing API diff --git a/turbo/jsonrpc/trace_filtering.go b/turbo/jsonrpc/trace_filtering.go index 17fd90b6615..c60674140ac 100644 --- a/turbo/jsonrpc/trace_filtering.go +++ b/turbo/jsonrpc/trace_filtering.go @@ -23,29 +23,29 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/stream" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "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/eth/consensuschain" - "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/ethdb" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/stream" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/consensuschain" + "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/ethdb" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) // Transaction implements trace_transaction diff --git a/turbo/jsonrpc/trace_types.go b/turbo/jsonrpc/trace_types.go index 50f8b3483a0..4ce0ec3d71c 100644 --- a/turbo/jsonrpc/trace_types.go +++ b/turbo/jsonrpc/trace_types.go @@ -19,12 +19,12 @@ package jsonrpc import ( "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // TODO:(tjayrush) diff --git a/turbo/jsonrpc/tracing.go b/turbo/jsonrpc/tracing.go index 758b1c9c696..29011399f36 100644 --- a/turbo/jsonrpc/tracing.go +++ b/turbo/jsonrpc/tracing.go @@ -24,24 +24,24 @@ import ( "github.com/holiman/uint256" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "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" - tracersConfig "github.com/ledgerwatch/erigon/eth/tracers/config" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - polygontracer "github.com/ledgerwatch/erigon/polygon/tracer" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/transactions" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + tracersConfig "github.com/erigontech/erigon/eth/tracers/config" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + polygontracer "github.com/erigontech/erigon/polygon/tracer" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) // TraceBlockByNumber implements debug_traceBlockByNumber. Returns Geth style block traces. diff --git a/turbo/jsonrpc/txpool_api.go b/turbo/jsonrpc/txpool_api.go index 16d59be0d84..b0e47f54835 100644 --- a/turbo/jsonrpc/txpool_api.go +++ b/turbo/jsonrpc/txpool_api.go @@ -20,15 +20,15 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" ) // TxPoolAPI the interface for the txpool_ RPC commands diff --git a/turbo/jsonrpc/txpool_api_test.go b/turbo/jsonrpc/txpool_api_test.go index 623446e6988..7f9d47c104f 100644 --- a/turbo/jsonrpc/txpool_api_test.go +++ b/turbo/jsonrpc/txpool_api_test.go @@ -22,21 +22,21 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/config3" - txPoolProto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/config3" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/kv/kvcache" + + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rpc/rpccfg" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestTxPoolContent(t *testing.T) { @@ -68,7 +68,7 @@ func TestTxPoolContent(t *testing.T) { reply, err := txPool.Add(ctx, &txpool.AddRequest{RlpTxs: [][]byte{buf.Bytes()}}) require.NoError(err) for _, res := range reply.Imported { - require.Equal(res, txPoolProto.ImportResult_SUCCESS, fmt.Sprintf("%s", reply.Errors)) + require.Equal(res, txpool.ImportResult_SUCCESS, fmt.Sprintf("%s", reply.Errors)) } content, err := api.Content(ctx) diff --git a/turbo/jsonrpc/web3_api.go b/turbo/jsonrpc/web3_api.go index 133474b1deb..848f73e558f 100644 --- a/turbo/jsonrpc/web3_api.go +++ b/turbo/jsonrpc/web3_api.go @@ -19,10 +19,10 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/rpchelper" ) // Web3API provides interfaces for the web3_ RPC commands diff --git a/turbo/logging/flags.go b/turbo/logging/flags.go index 01d68c12b65..4da33cc9a40 100644 --- a/turbo/logging/flags.go +++ b/turbo/logging/flags.go @@ -19,7 +19,7 @@ package logging import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) var ( diff --git a/turbo/logging/logging.go b/turbo/logging/logging.go index 819ce03f7c0..f2eb8b9f9f8 100644 --- a/turbo/logging/logging.go +++ b/turbo/logging/logging.go @@ -26,9 +26,9 @@ import ( "github.com/urfave/cli/v2" "gopkg.in/natefinch/lumberjack.v2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/common/metrics" ) // Determine the log dir path based on the given urfave context diff --git a/turbo/mock/txpool.go b/turbo/mock/txpool.go index 369c6abb1a2..2bf97835930 100644 --- a/turbo/mock/txpool.go +++ b/turbo/mock/txpool.go @@ -20,11 +20,11 @@ import ( "sort" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/event" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/event" ) // TestTxPool is a mock transaction pool that blindly accepts all transactions. diff --git a/turbo/node/node.go b/turbo/node/node.go index e1e00158de6..b175fd3aae2 100644 --- a/turbo/node/node.go +++ b/turbo/node/node.go @@ -22,17 +22,17 @@ import ( "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/eth" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/node" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - erigoncli "github.com/ledgerwatch/erigon/turbo/cli" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/eth" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/node" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + erigoncli "github.com/erigontech/erigon/turbo/cli" ) // ErigonNode represents a single node, that runs sync and p2p network. diff --git a/turbo/rlphacks/bytes_test.go b/turbo/rlphacks/bytes_test.go index 51c390a853b..21699cffe72 100644 --- a/turbo/rlphacks/bytes_test.go +++ b/turbo/rlphacks/bytes_test.go @@ -22,7 +22,7 @@ import ( "bytes" "testing" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) func TestFastDoubleRlpForByteArrays(t *testing.T) { diff --git a/turbo/rpchelper/filters.go b/turbo/rpchelper/filters.go index d3f3b722a7e..20a17da7965 100644 --- a/turbo/rpchelper/filters.go +++ b/turbo/rpchelper/filters.go @@ -32,18 +32,18 @@ import ( "google.golang.org/grpc" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/concurrent" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpoolproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - txpool2 "github.com/ledgerwatch/erigon-lib/txpool" - - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/concurrent" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + txpool "github.com/erigontech/erigon-lib/gointerfaces/txpoolproto" + "github.com/erigontech/erigon-lib/log/v3" + txpool2 "github.com/erigontech/erigon-lib/txpool" + + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/rlp" ) // Filters holds the state for managing subscriptions to various Ethereum events. diff --git a/turbo/rpchelper/filters_deadlock_test.go b/turbo/rpchelper/filters_deadlock_test.go index 80dbe4faba5..e81fc51ee56 100644 --- a/turbo/rpchelper/filters_deadlock_test.go +++ b/turbo/rpchelper/filters_deadlock_test.go @@ -20,15 +20,15 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/turbo/rpchelper" ) func TestFiltersDeadlock_Test(t *testing.T) { diff --git a/turbo/rpchelper/filters_test.go b/turbo/rpchelper/filters_test.go index 43db5d1d855..9372b579c81 100644 --- a/turbo/rpchelper/filters_test.go +++ b/turbo/rpchelper/filters_test.go @@ -22,16 +22,16 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" + types2 "github.com/erigontech/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/filters" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/filters" ) func createLog() *remote.SubscribeLogsReply { diff --git a/turbo/rpchelper/helper.go b/turbo/rpchelper/helper.go index 9dc60839f07..886f4d9e17b 100644 --- a/turbo/rpchelper/helper.go +++ b/turbo/rpchelper/helper.go @@ -21,17 +21,17 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - borfinality "github.com/ledgerwatch/erigon/polygon/bor/finality" - "github.com/ledgerwatch/erigon/polygon/bor/finality/whitelist" - "github.com/ledgerwatch/erigon/rpc" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/eth/stagedsync/stages" + borfinality "github.com/erigontech/erigon/polygon/bor/finality" + "github.com/erigontech/erigon/polygon/bor/finality/whitelist" + "github.com/erigontech/erigon/rpc" ) // unable to decode supplied params, or an invalid number of parameters diff --git a/turbo/rpchelper/interface.go b/turbo/rpchelper/interface.go index 83d5fa53c08..d537c00782f 100644 --- a/turbo/rpchelper/interface.go +++ b/turbo/rpchelper/interface.go @@ -20,13 +20,13 @@ import ( "context" "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" + libcommon "github.com/erigontech/erigon-lib/common" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/p2p" ) // ApiBackend - interface which must be used by API layer diff --git a/turbo/rpchelper/logsfilter.go b/turbo/rpchelper/logsfilter.go index 42ffbb32128..3ff1eeb3541 100644 --- a/turbo/rpchelper/logsfilter.go +++ b/turbo/rpchelper/logsfilter.go @@ -19,12 +19,12 @@ package rpchelper import ( "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/concurrent" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/concurrent" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" - types2 "github.com/ledgerwatch/erigon/core/types" + types2 "github.com/erigontech/erigon/core/types" ) type LogsFilterAggregator struct { diff --git a/turbo/rpchelper/metrics.go b/turbo/rpchelper/metrics.go index 423b7c9b495..c1da7b6b4af 100644 --- a/turbo/rpchelper/metrics.go +++ b/turbo/rpchelper/metrics.go @@ -17,7 +17,7 @@ package rpchelper import ( - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" ) const ( diff --git a/turbo/rpchelper/rpc_block.go b/turbo/rpchelper/rpc_block.go index 9fcf181e10c..7c57495a768 100644 --- a/turbo/rpchelper/rpc_block.go +++ b/turbo/rpchelper/rpc_block.go @@ -19,12 +19,12 @@ package rpchelper import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/rpc" ) var UnknownBlockError = &rpc.CustomError{ diff --git a/turbo/services/interfaces.go b/turbo/services/interfaces.go index 7c9db8365bb..42a9dcd2661 100644 --- a/turbo/services/interfaces.go +++ b/turbo/services/interfaces.go @@ -19,15 +19,15 @@ package services import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/rlp" ) type All struct { diff --git a/turbo/shards/events.go b/turbo/shards/events.go index 22323762bb4..69ac068b401 100644 --- a/turbo/shards/events.go +++ b/turbo/shards/events.go @@ -19,9 +19,9 @@ package shards import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon/core/types" ) type RpcEventType uint64 diff --git a/turbo/shards/state_cache.go b/turbo/shards/state_cache.go index 57806e0c734..2e7a4e59482 100644 --- a/turbo/shards/state_cache.go +++ b/turbo/shards/state_cache.go @@ -22,13 +22,14 @@ import ( "fmt" "unsafe" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/c2h5oh/datasize" "github.com/google/btree" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/metrics" + + "github.com/erigontech/erigon/core/types/accounts" ) // LRU state cache consists of two structures - B-Tree and binary heap diff --git a/turbo/shards/state_cache_test.go b/turbo/shards/state_cache_test.go index 1aa1358fb5e..4ad54f3c6da 100644 --- a/turbo/shards/state_cache_test.go +++ b/turbo/shards/state_cache_test.go @@ -22,11 +22,11 @@ import ( "testing" "github.com/c2h5oh/datasize" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) func TestCacheBtreeOrderAccountStorage2(t *testing.T) { diff --git a/turbo/shards/state_change_accumulator.go b/turbo/shards/state_change_accumulator.go index 73207497ddf..1e0e57a3cbf 100644 --- a/turbo/shards/state_change_accumulator.go +++ b/turbo/shards/state_change_accumulator.go @@ -19,9 +19,9 @@ package shards import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" ) // Accumulator collects state changes in a form that can then be delivered to the RPC daemon diff --git a/turbo/shards/trie_cache.go b/turbo/shards/trie_cache.go index f721a8692c3..28c1d29331d 100644 --- a/turbo/shards/trie_cache.go +++ b/turbo/shards/trie_cache.go @@ -22,12 +22,12 @@ import ( "math/bits" "unsafe" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/google/btree" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/dbutils" + + "github.com/erigontech/erigon/core/types/accounts" ) // An optional addition to the state cache, helping to calculate state root diff --git a/turbo/silkworm/silkworm.go b/turbo/silkworm/silkworm.go index 721433f3c7d..3c10b2bd800 100644 --- a/turbo/silkworm/silkworm.go +++ b/turbo/silkworm/silkworm.go @@ -23,9 +23,9 @@ import ( silkworm_go "github.com/erigontech/silkworm-go" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" ) type Silkworm = silkworm_go.Silkworm diff --git a/turbo/snapshotsync/freezeblocks/beacon_block_reader.go b/turbo/snapshotsync/freezeblocks/beacon_block_reader.go index 4f70726f12a..d6ba0d9db4a 100644 --- a/turbo/snapshotsync/freezeblocks/beacon_block_reader.go +++ b/turbo/snapshotsync/freezeblocks/beacon_block_reader.go @@ -23,13 +23,14 @@ import ( "sync" "github.com/klauspost/compress/zstd" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" ) var buffersPool = sync.Pool{ diff --git a/turbo/snapshotsync/freezeblocks/block_reader.go b/turbo/snapshotsync/freezeblocks/block_reader.go index 435e421f863..4b770737e2c 100644 --- a/turbo/snapshotsync/freezeblocks/block_reader.go +++ b/turbo/snapshotsync/freezeblocks/block_reader.go @@ -26,28 +26,28 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/polygon/bor" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remoteproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon/core/rawdb" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/types" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/log/v3" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/polygon/bor" + + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/gointerfaces" + remote "github.com/erigontech/erigon-lib/gointerfaces/remoteproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon/core/rawdb" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + bortypes "github.com/erigontech/erigon/polygon/bor/types" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) var ErrSpanNotFound = errors.New("span not found") diff --git a/turbo/snapshotsync/freezeblocks/block_reader_test.go b/turbo/snapshotsync/freezeblocks/block_reader_test.go index 01b33c02041..6fe79bb1d43 100644 --- a/turbo/snapshotsync/freezeblocks/block_reader_test.go +++ b/turbo/snapshotsync/freezeblocks/block_reader_test.go @@ -25,15 +25,15 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" - "github.com/ledgerwatch/erigon/eth/ethconfig" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" + "github.com/erigontech/erigon/eth/ethconfig" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/turbo/testlog" ) func TestBlockReaderLastFrozenSpanIdWhenSegmentFilesArePresent(t *testing.T) { diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots.go b/turbo/snapshotsync/freezeblocks/block_snapshots.go index b1529ac7ac1..663d4a5dd41 100644 --- a/turbo/snapshotsync/freezeblocks/block_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/block_snapshots.go @@ -38,34 +38,34 @@ import ( "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/silkworm" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/snapcfg" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + dir2 "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/silkworm" ) type Range struct { diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots_test.go b/turbo/snapshotsync/freezeblocks/block_snapshots_test.go index ce8a79f646b..e0cad88290f 100644 --- a/turbo/snapshotsync/freezeblocks/block_snapshots_test.go +++ b/turbo/snapshotsync/freezeblocks/block_snapshots_test.go @@ -25,18 +25,18 @@ import ( "github.com/stretchr/testify/require" "golang.org/x/exp/slices" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" - - "github.com/ledgerwatch/erigon/common/math" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" + + "github.com/erigontech/erigon/common/math" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/params" ) func createTestSegmentFile(t *testing.T, from, to uint64, name snaptype.Enum, dir string, version snaptype.Version, logger log.Logger) { diff --git a/turbo/snapshotsync/freezeblocks/bor_snapshots.go b/turbo/snapshotsync/freezeblocks/bor_snapshots.go index 642967ad04f..a3e41d991bc 100644 --- a/turbo/snapshotsync/freezeblocks/bor_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/bor_snapshots.go @@ -23,12 +23,12 @@ import ( "path/filepath" "reflect" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/hack/tool/fromdb" - "github.com/ledgerwatch/erigon/eth/ethconfig" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/hack/tool/fromdb" + "github.com/erigontech/erigon/eth/ethconfig" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/turbo/services" ) func (br *BlockRetire) dbHasEnoughDataForBorRetire(ctx context.Context) (bool, error) { diff --git a/turbo/snapshotsync/freezeblocks/caplin_snapshots.go b/turbo/snapshotsync/freezeblocks/caplin_snapshots.go index 10054dc6b0c..edf460fb36d 100644 --- a/turbo/snapshotsync/freezeblocks/caplin_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/caplin_snapshots.go @@ -29,25 +29,25 @@ import ( "github.com/klauspost/compress/zstd" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" - - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/blob_storage" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" - "github.com/ledgerwatch/erigon/eth/ethconfig" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain/snapcfg" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" + + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/blob_storage" + "github.com/erigontech/erigon/cl/persistence/format/snapshot_format" + "github.com/erigontech/erigon/eth/ethconfig" ) var sidecarSSZSize = (&cltypes.BlobSidecar{}).EncodingSizeSSZ() diff --git a/turbo/snapshotsync/freezeblocks/dump_test.go b/turbo/snapshotsync/freezeblocks/dump_test.go index 0e843ebc03b..54fc0124f6a 100644 --- a/turbo/snapshotsync/freezeblocks/dump_test.go +++ b/turbo/snapshotsync/freezeblocks/dump_test.go @@ -22,27 +22,27 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/borcfg" "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon/turbo/stages/mock" ) func nonceRange(from, to int) []uint64 { diff --git a/turbo/snapshotsync/snap/flags.go b/turbo/snapshotsync/snap/flags.go index f8a2c963848..1102cf10abf 100644 --- a/turbo/snapshotsync/snap/flags.go +++ b/turbo/snapshotsync/snap/flags.go @@ -17,8 +17,8 @@ package snap import ( - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/eth/ethconfig" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/eth/ethconfig" ) var ( diff --git a/turbo/snapshotsync/snapshotsync.go b/turbo/snapshotsync/snapshotsync.go index 83da3b78a11..ce42163aea7 100644 --- a/turbo/snapshotsync/snapshotsync.go +++ b/turbo/snapshotsync/snapshotsync.go @@ -27,25 +27,25 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/core/rawdb" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - snaptype2 "github.com/ledgerwatch/erigon/core/snaptype" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/downloader/downloadergrpc" + "github.com/erigontech/erigon-lib/downloader/snaptype" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/core/rawdb" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + snaptype2 "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/turbo/services" ) type CaplinMode int diff --git a/turbo/snapshotsync/snapshotsync_test.go b/turbo/snapshotsync/snapshotsync_test.go index a3432638cda..79eb34710d9 100644 --- a/turbo/snapshotsync/snapshotsync_test.go +++ b/turbo/snapshotsync/snapshotsync_test.go @@ -20,8 +20,8 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" ) func TestBlackListForPruning(t *testing.T) { diff --git a/turbo/stages/blockchain_test.go b/turbo/stages/blockchain_test.go index 9a6584ca34d..d153d4cdcde 100644 --- a/turbo/stages/blockchain_test.go +++ b/turbo/stages/blockchain_test.go @@ -24,39 +24,39 @@ import ( "encoding/binary" "errors" "fmt" - protosentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + protosentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/rlp" "math" "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - libchain "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/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - types2 "github.com/ledgerwatch/erigon-lib/types" - - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/consensus/ethash" - "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/crypto" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libchain "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + types2 "github.com/erigontech/erigon-lib/types" + + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" ) // So we can deterministically seed different blockchains diff --git a/turbo/stages/bodydownload/body_algos.go b/turbo/stages/bodydownload/body_algos.go index 8f20a451e47..61bcd0d7d24 100644 --- a/turbo/stages/bodydownload/body_algos.go +++ b/turbo/stages/bodydownload/body_algos.go @@ -25,16 +25,16 @@ import ( "github.com/holiman/uint256" "golang.org/x/exp/maps" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/dataflow" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/adapter" - "github.com/ledgerwatch/erigon/turbo/services" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/dataflow" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/adapter" + "github.com/erigontech/erigon/turbo/services" ) // UpdateFromDb reads the state of the database and refreshes the state of the body download diff --git a/turbo/stages/bodydownload/body_data_struct.go b/turbo/stages/bodydownload/body_data_struct.go index 947e571e5ca..e29b9892214 100644 --- a/turbo/stages/bodydownload/body_data_struct.go +++ b/turbo/stages/bodydownload/body_data_struct.go @@ -20,13 +20,13 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/google/btree" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/turbo/services" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/turbo/services" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" ) // BodyHashes is to be used for the mapping between TxHash, UncleHash, WithdrawalsHash, and RequestRoot to the block header diff --git a/turbo/stages/bodydownload/body_test.go b/turbo/stages/bodydownload/body_test.go index 4e93f139bf0..4164eb977e7 100644 --- a/turbo/stages/bodydownload/body_test.go +++ b/turbo/stages/bodydownload/body_test.go @@ -19,11 +19,11 @@ package bodydownload_test import ( "testing" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/mock" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/consensus/ethash" + "github.com/erigontech/erigon/consensus/ethash" ) func TestCreateBodyDownload(t *testing.T) { diff --git a/turbo/stages/bodydownload/prefetched_blocks.go b/turbo/stages/bodydownload/prefetched_blocks.go index a870b1d0a96..a03ac4f43ef 100644 --- a/turbo/stages/bodydownload/prefetched_blocks.go +++ b/turbo/stages/bodydownload/prefetched_blocks.go @@ -18,9 +18,10 @@ package bodydownload import ( lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/core/types" ) type PrefetchedBlocks struct { diff --git a/turbo/stages/chain_makers_test.go b/turbo/stages/chain_makers_test.go index ad33c7927f2..0f66ca88f3a 100644 --- a/turbo/stages/chain_makers_test.go +++ b/turbo/stages/chain_makers_test.go @@ -21,25 +21,25 @@ package stages_test import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - protosentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + protosentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/rlp" "math/big" "testing" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" + "github.com/erigontech/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestGenerateChain(t *testing.T) { diff --git a/turbo/stages/genesis_test.go b/turbo/stages/genesis_test.go index 27d0afa888a..87616166cf5 100644 --- a/turbo/stages/genesis_test.go +++ b/turbo/stages/genesis_test.go @@ -27,20 +27,20 @@ import ( "github.com/davecgh/go-spew/spew" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "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/params" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestSetupGenesis(t *testing.T) { diff --git a/turbo/stages/headerdownload/header_algo_test.go b/turbo/stages/headerdownload/header_algo_test.go index 4e228d1121e..5f7cadfaf7f 100644 --- a/turbo/stages/headerdownload/header_algo_test.go +++ b/turbo/stages/headerdownload/header_algo_test.go @@ -22,13 +22,13 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestSideChainInsert(t *testing.T) { diff --git a/turbo/stages/headerdownload/header_algos.go b/turbo/stages/headerdownload/header_algos.go index fcca9cec549..7b452eb6119 100644 --- a/turbo/stages/headerdownload/header_algos.go +++ b/turbo/stages/headerdownload/header_algos.go @@ -31,24 +31,24 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/dataflow" - "github.com/ledgerwatch/erigon/turbo/services" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/dataflow" + "github.com/erigontech/erigon/turbo/services" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" ) const POSPandaBanner = ` diff --git a/turbo/stages/headerdownload/header_data_struct.go b/turbo/stages/headerdownload/header_data_struct.go index ed6627bc217..c3e353b44e6 100644 --- a/turbo/stages/headerdownload/header_data_struct.go +++ b/turbo/stages/headerdownload/header_data_struct.go @@ -26,13 +26,13 @@ import ( "github.com/google/btree" lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) type QueueID uint8 diff --git a/turbo/stages/mock/mock_sentry.go b/turbo/stages/mock/mock_sentry.go index 6466e446273..c744982191b 100644 --- a/turbo/stages/mock/mock_sentry.go +++ b/turbo/stages/mock/mock_sentry.go @@ -34,62 +34,62 @@ import ( "golang.org/x/sync/semaphore" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - execution "github.com/ledgerwatch/erigon-lib/gointerfaces/executionproto" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - ptypes "github.com/ledgerwatch/erigon-lib/gointerfaces/typesproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/consensuschain" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconsensusconfig" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/builder" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/execution/eth1" - "github.com/ledgerwatch/erigon/turbo/execution/eth1/eth1_chain_reader.go" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - stages2 "github.com/ledgerwatch/erigon/turbo/stages" - "github.com/ledgerwatch/erigon/turbo/stages/bodydownload" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + execution "github.com/erigontech/erigon-lib/gointerfaces/executionproto" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + ptypes "github.com/erigontech/erigon-lib/gointerfaces/typesproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/txpool" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/consensuschain" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconsensusconfig" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/builder" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/execution/eth1" + "github.com/erigontech/erigon/turbo/execution/eth1/eth1_chain_reader.go" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + stages2 "github.com/erigontech/erigon/turbo/stages" + "github.com/erigontech/erigon/turbo/stages/bodydownload" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) const MockInsertAsInitialCycle = false diff --git a/turbo/stages/mock/sentry_mock_test.go b/turbo/stages/mock/sentry_mock_test.go index d827ac7353e..5d2469dd526 100644 --- a/turbo/stages/mock/sentry_mock_test.go +++ b/turbo/stages/mock/sentry_mock_test.go @@ -23,20 +23,20 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentryproto" - "github.com/ledgerwatch/erigon-lib/wrap" - - "github.com/ledgerwatch/erigon/common/u256" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "github.com/erigontech/erigon-lib/log/v3" + + libcommon "github.com/erigontech/erigon-lib/common" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentryproto" + "github.com/erigontech/erigon-lib/wrap" + + "github.com/erigontech/erigon/common/u256" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages" + "github.com/erigontech/erigon/turbo/stages/mock" ) func TestEmptyStageSync(t *testing.T) { diff --git a/turbo/stages/stageloop.go b/turbo/stages/stageloop.go index 5482880e3b6..84734c2072e 100644 --- a/turbo/stages/stageloop.go +++ b/turbo/stages/stageloop.go @@ -25,40 +25,40 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloaderproto" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/rawdb/blockio" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/p2p" - "github.com/ledgerwatch/erigon/p2p/sentry" - "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/finality" - "github.com/ledgerwatch/erigon/polygon/bor/finality/flags" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_helpers" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/shards" - "github.com/ledgerwatch/erigon/turbo/silkworm" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/direct" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloaderproto" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb/blockio" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/p2p" + "github.com/erigontech/erigon/p2p/sentry" + "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/finality" + "github.com/erigontech/erigon/polygon/bor/finality/flags" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/engineapi/engine_helpers" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/silkworm" + "github.com/erigontech/erigon/turbo/stages/headerdownload" ) // StageLoop runs the continuous loop of staged sync diff --git a/turbo/testlog/testlog.go b/turbo/testlog/testlog.go index 546a695b258..3fcc6ca79db 100644 --- a/turbo/testlog/testlog.go +++ b/turbo/testlog/testlog.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // Handler returns a log handler which logs to the unit test log of t. diff --git a/turbo/transactions/call.go b/turbo/transactions/call.go index 017d957ec6e..7baeeff2437 100644 --- a/turbo/transactions/call.go +++ b/turbo/transactions/call.go @@ -23,20 +23,20 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "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/rpc" - ethapi2 "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/rpc" + ethapi2 "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/services" ) func DoCall( diff --git a/turbo/transactions/tracing.go b/turbo/transactions/tracing.go index 080c29d79db..4065672b93c 100644 --- a/turbo/transactions/tracing.go +++ b/turbo/transactions/tracing.go @@ -26,21 +26,21 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "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/eth/tracers" - tracersConfig "github.com/ledgerwatch/erigon/eth/tracers/config" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/tracers" + tracersConfig "github.com/erigontech/erigon/eth/tracers/config" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" ) type BlockGetter interface { diff --git a/turbo/trie/account_node_test.go b/turbo/trie/account_node_test.go index 5d88b17b6b9..80aa6198544 100644 --- a/turbo/trie/account_node_test.go +++ b/turbo/trie/account_node_test.go @@ -24,10 +24,10 @@ import ( "github.com/holiman/uint256" "golang.org/x/crypto/sha3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" ) func TestGetAccount(t *testing.T) { diff --git a/turbo/trie/debug.go b/turbo/trie/debug.go index e5fe645f8eb..4d115a97e5d 100644 --- a/turbo/trie/debug.go +++ b/turbo/trie/debug.go @@ -26,7 +26,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) type HexStdOutWriter struct{} diff --git a/turbo/trie/delete_subrtee_test.go b/turbo/trie/delete_subrtee_test.go index 8e33fb8ab57..10895e179b0 100644 --- a/turbo/trie/delete_subrtee_test.go +++ b/turbo/trie/delete_subrtee_test.go @@ -23,11 +23,12 @@ import ( "testing" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" ) func TestTrieDeleteSubtree_ShortNode(t *testing.T) { diff --git a/turbo/trie/encoding.go b/turbo/trie/encoding.go index 69a10fd24dc..03437937dc7 100644 --- a/turbo/trie/encoding.go +++ b/turbo/trie/encoding.go @@ -22,7 +22,7 @@ package trie import ( "io" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) // Trie keys are dealt with in three distinct encodings: diff --git a/turbo/trie/encoding_test.go b/turbo/trie/encoding_test.go index 8d6bfa72da5..577a220ef9b 100644 --- a/turbo/trie/encoding_test.go +++ b/turbo/trie/encoding_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon/common" + "github.com/erigontech/erigon/common" ) func TestHexCompact(t *testing.T) { diff --git a/turbo/trie/errors.go b/turbo/trie/errors.go index c41183b59b1..2c18dd380b9 100644 --- a/turbo/trie/errors.go +++ b/turbo/trie/errors.go @@ -22,7 +22,7 @@ package trie import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) // MissingNodeError is returned by the trie functions (TryGet, TryUpdate, TryDelete) diff --git a/turbo/trie/flatdb_sub_trie_loader_test.go b/turbo/trie/flatdb_sub_trie_loader_test.go index 99bc22ef7d8..981c958f016 100644 --- a/turbo/trie/flatdb_sub_trie_loader_test.go +++ b/turbo/trie/flatdb_sub_trie_loader_test.go @@ -21,12 +21,12 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" ) func TestCreateLoadingPrefixes(t *testing.T) { diff --git a/turbo/trie/gen_struct_step.go b/turbo/trie/gen_struct_step.go index d96cb6005c9..6a751c84b9c 100644 --- a/turbo/trie/gen_struct_step.go +++ b/turbo/trie/gen_struct_step.go @@ -23,9 +23,10 @@ import ( "fmt" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + libcommon "github.com/erigontech/erigon-lib/common" + + "github.com/erigontech/erigon/turbo/rlphacks" ) // Experimental code for separating data and structural information diff --git a/turbo/trie/hack.go b/turbo/trie/hack.go index 17ffb8389c0..3cfc9b35b9f 100644 --- a/turbo/trie/hack.go +++ b/turbo/trie/hack.go @@ -19,10 +19,10 @@ package trie import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/rlp" ) func FullNode1() { diff --git a/turbo/trie/hashbuilder.go b/turbo/trie/hashbuilder.go index 9a9ca9329e4..0d0a738e92a 100644 --- a/turbo/trie/hashbuilder.go +++ b/turbo/trie/hashbuilder.go @@ -23,14 +23,15 @@ import ( "math/bits" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - length2 "github.com/ledgerwatch/erigon-lib/common/length" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + libcommon "github.com/erigontech/erigon-lib/common" + length2 "github.com/erigontech/erigon-lib/common/length" + + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/rlphacks" ) const hashStackStride = length2.Hash + 1 // + 1 byte for RLP encoding diff --git a/turbo/trie/hasher.go b/turbo/trie/hasher.go index cfc5bbbec6a..2e87009209f 100644 --- a/turbo/trie/hasher.go +++ b/turbo/trie/hasher.go @@ -24,13 +24,13 @@ import ( "hash" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/rlphacks" ) type hasher struct { diff --git a/turbo/trie/hasher_test.go b/turbo/trie/hasher_test.go index d3ce67cf851..ca1b4d87490 100644 --- a/turbo/trie/hasher_test.go +++ b/turbo/trie/hasher_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func TestValue(t *testing.T) { diff --git a/turbo/trie/intermediate_hashes_test.go b/turbo/trie/intermediate_hashes_test.go index 4d97231ebed..3b2b190b35e 100644 --- a/turbo/trie/intermediate_hashes_test.go +++ b/turbo/trie/intermediate_hashes_test.go @@ -21,8 +21,8 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/stretchr/testify/assert" ) diff --git a/turbo/trie/node.go b/turbo/trie/node.go index e0b90920525..8851ddfc67e 100644 --- a/turbo/trie/node.go +++ b/turbo/trie/node.go @@ -23,11 +23,11 @@ import ( "bytes" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/rlp" ) const codeSizeUncached = -1 diff --git a/turbo/trie/proof.go b/turbo/trie/proof.go index 816266e1d7f..38c26ed6b6d 100644 --- a/turbo/trie/proof.go +++ b/turbo/trie/proof.go @@ -20,12 +20,12 @@ import ( "bytes" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/turbo/trie/retain_list.go b/turbo/trie/retain_list.go index b55c0650468..98087593a62 100644 --- a/turbo/trie/retain_list.go +++ b/turbo/trie/retain_list.go @@ -26,12 +26,13 @@ import ( "math/big" "sort" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/core/types/accounts" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/length" + + "github.com/erigontech/erigon/core/types/accounts" ) type RetainDecider interface { diff --git a/turbo/trie/retain_list_test.go b/turbo/trie/retain_list_test.go index c99d1b4d3e2..96e1381544a 100644 --- a/turbo/trie/retain_list_test.go +++ b/turbo/trie/retain_list_test.go @@ -19,12 +19,12 @@ package trie import ( "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/stretchr/testify/require" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon/core/types/accounts" ) func FakePreimage(hash libcommon.Hash) libcommon.Hash { diff --git a/turbo/trie/stream.go b/turbo/trie/stream.go index d21498a0983..44852f74b42 100644 --- a/turbo/trie/stream.go +++ b/turbo/trie/stream.go @@ -25,12 +25,12 @@ import ( "fmt" "os" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/rlphacks" ) // StreamItem is an enum type for values that help distinguish different diff --git a/turbo/trie/stream_test.go b/turbo/trie/stream_test.go index d604c12907c..90450ed3062 100644 --- a/turbo/trie/stream_test.go +++ b/turbo/trie/stream_test.go @@ -24,11 +24,11 @@ import ( "sort" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" ) func TestHashWithModificationsEmpty(t *testing.T) { diff --git a/turbo/trie/structural_test.go b/turbo/trie/structural_test.go index ca62fbf5930..b50458bf234 100644 --- a/turbo/trie/structural_test.go +++ b/turbo/trie/structural_test.go @@ -28,13 +28,13 @@ import ( "slices" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/rlphacks" ) func TestV2HashBuilding(t *testing.T) { diff --git a/turbo/trie/sub_trie_loader.go b/turbo/trie/sub_trie_loader.go index 993c5024093..576c345e797 100644 --- a/turbo/trie/sub_trie_loader.go +++ b/turbo/trie/sub_trie_loader.go @@ -17,7 +17,7 @@ package trie import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var emptyHash [32]byte diff --git a/turbo/trie/trie.go b/turbo/trie/trie.go index e98e4fc19b3..ebc57289b6a 100644 --- a/turbo/trie/trie.go +++ b/turbo/trie/trie.go @@ -25,11 +25,11 @@ import ( "encoding/binary" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/ethdb" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/ethdb" ) var ( diff --git a/turbo/trie/trie_root.go b/turbo/trie/trie_root.go index 6620cdc845c..82d7383bc9f 100644 --- a/turbo/trie/trie_root.go +++ b/turbo/trie/trie_root.go @@ -24,16 +24,16 @@ import ( "math/bits" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - length2 "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - dbutils2 "github.com/ledgerwatch/erigon-lib/kv/dbutils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + length2 "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + dbutils2 "github.com/erigontech/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/rlphacks" ) /* diff --git a/turbo/trie/trie_test.go b/turbo/trie/trie_test.go index 4926d1766f2..028a740a3c8 100644 --- a/turbo/trie/trie_test.go +++ b/turbo/trie/trie_test.go @@ -29,13 +29,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" ) func init() { diff --git a/turbo/trie/trie_transform.go b/turbo/trie/trie_transform.go index 2b2a02d5bb6..ff1d15a2324 100644 --- a/turbo/trie/trie_transform.go +++ b/turbo/trie/trie_transform.go @@ -17,8 +17,8 @@ package trie import ( - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types/accounts" ) type keyTransformFunc func([]byte) []byte diff --git a/turbo/trie/visual.go b/turbo/trie/visual.go index 301418144ba..8151cc50ec0 100644 --- a/turbo/trie/visual.go +++ b/turbo/trie/visual.go @@ -26,9 +26,9 @@ import ( "io" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/visual" + "github.com/erigontech/erigon/visual" ) // VisualOpts contains various configuration options fo the Visual function diff --git a/wmake.ps1 b/wmake.ps1 index e3472df00b2..f1397750efb 100644 --- a/wmake.ps1 +++ b/wmake.ps1 @@ -397,7 +397,7 @@ if (!Test-Path -Path [string](Join-Path $MyContext.Directory "\.git") -PathType Error ! Directory $MyContext.Directory does not seem to be a properly cloned Erigon repository Please clone it using - git clone --recurse-submodules -j8 https://github.com/ledgerwatch/erigon.git + git clone --recurse-submodules -j8 https://github.com/erigontech/erigon.git "@ exit 1 @@ -416,7 +416,7 @@ $Erigon.Branch = [string]@(git.exe rev-parse --abbrev-ref HEAD) $Erigon.Tag = [string]@(git.exe describe --tags) $Erigon.BuildTags = "nosqlite,noboltdb" -$Erigon.Package = "github.com/ledgerwatch/erigon" +$Erigon.Package = "github.com/erigontech/erigon" $Erigon.BuildFlags = "-trimpath -tags $($Erigon.BuildTags) -buildvcs=false -v" $Erigon.BuildFlags += " -ldflags ""-X $($Erigon.Package)/params.GitCommit=$($Erigon.Commit) -X $($Erigon.Package)/params.GitBranch=$($Erigon.Branch) -X $($Erigon.Package)/params.GitTag=$($Erigon.Tag)"""