diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 6811ebe0ce9..49223e4745e 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -1,6 +1,6 @@ --- steps: - - command: './nightly.sh' - label: 'build & run geth' + - 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 9fb3c86a6b0..30637b44a55 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,14 +1,14 @@ # Contributing -Thank you for considering to help out with the source code! We welcome -contributions from anyone on the internet, and are grateful for even the +Thank you for considering to help out with the source code! We welcome +contributions from anyone on the internet, and are grateful for even the smallest of fixes! -If you'd like to contribute to Erigon, please fork, fix, commit and send a +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 -ensure those changes are in line with the general philosophy of the project +you wish to submit more complex changes though, please check up with the core +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. @@ -16,25 +16,25 @@ well as our review and merge procedures quick and simple. Please make sure your contributions adhere to our coding guidelines: - * Code must adhere to the official Go -[formatting](https://golang.org/doc/effective_go.html#formatting) guidelines -(i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). - * Code must be documented adhering to the official Go -[commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. - * Pull requests need to be based on and opened against the `devel` branch. - * Commit messages should be prefixed with the package(s) they modify. - * E.g. "eth, rpc: make trace configs optional" +- Code must adhere to the official Go + [formatting](https://golang.org/doc/effective_go.html#formatting) guidelines + (i.e. uses [gofmt](https://golang.org/cmd/gofmt/)). +- Code must be documented adhering to the official Go + [commentary](https://golang.org/doc/effective_go.html#commentary) guidelines. +- Pull requests need to be based on and opened against the `devel` branch. +- Commit messages should be prefixed with the package(s) they modify. + - E.g. "eth, rpc: make trace configs optional" ## Can I have feature X -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 +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/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..283dca7da47 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -1,9 +1,9 @@ --- name: Ask a question about: Something is unclear -title: '' -labels: 'type:docs' -assignees: '' +title: "" +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 95c05472747..94a63c5f189 100644 --- a/.github/workflows/docker-tags.yml +++ b/.github/workflows/docker-tags.yml @@ -3,7 +3,7 @@ name: Docker tags on: push: tags: - - 'y*.*.*' + - "y*.*.*" workflow_dispatch: jobs: @@ -33,9 +33,9 @@ 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/} DOCKER_USERNAME: ${{ secrets.DOCKERHUB }} - DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} \ No newline at end of file + DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_KEY }} diff --git a/.github/workflows/test-hive-eest.yml b/.github/workflows/test-hive-eest.yml index 4b34e480782..32cf46ab759 100644 --- a/.github/workflows/test-hive-eest.yml +++ b/.github/workflows/test-hive-eest.yml @@ -3,8 +3,8 @@ name: Hive EEST tests on: push: branches: - - release/* - - pectra_e2 + - release/* + - pectra_e2 workflow_dispatch: jobs: @@ -34,7 +34,7 @@ jobs: mv clients/erigon/Dockerfile.git clients/erigon/Dockerfile branch_name=$(echo ${GITHUB_REF#refs/heads/} | sed 's/[&/\]/\\&/g') echo Building Hive with Erigon branch - $branch_name - sed -i "s/^ARG github=ledgerwatch\/erigon$/ARG github=erigontech\/erigon/" clients/erigon/Dockerfile + sed -i "s/^ARG github=erigontech\/erigon$/ARG github=erigontech\/erigon/" clients/erigon/Dockerfile sed -i "s/^ARG tag=main$/ARG tag=${branch_name}/" clients/erigon/Dockerfile if [[ "$branch_name" != "main" ]]; then sed -i "/$sync.parallel-state-flushing/d" clients/erigon/erigon.sh @@ -78,4 +78,5 @@ jobs: exit 1 fi } - run_suite eest/consume-engine \ No newline at end of file + run_suite eest/consume-engine + \ No newline at end of file diff --git a/.github/workflows/test-integration-caplin.yml b/.github/workflows/test-integration-caplin.yml index 56204fccb14..b4cb12d7563 100644 --- a/.github/workflows/test-integration-caplin.yml +++ b/.github/workflows/test-integration-caplin.yml @@ -20,7 +20,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 d9ab632a77a..08ddb1206d7 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/DEV_CHAIN.md b/DEV_CHAIN.md index b77ece8e456..7f907376bfb 100644 --- a/DEV_CHAIN.md +++ b/DEV_CHAIN.md @@ -1,156 +1,157 @@ Steps to setup and run Erigon dev chain. This tutorial is made for macOS. +## 1. Clone and Build Erigon -## 1. Clone and Build Erigon Open terminal 1 and type the following command -```bash -git clone --recurse-submodules -j8 https://github.com/ledgerwatch/erigon.git +```bash +git clone --recurse-submodules -j8 https://github.com/erigontech/erigon.git cd erigon make erigon ``` - ## 2. Build RPC daemon + On the same terminal folder you can build the RPC daemon. ```bash make rpcdaemon ``` -## 3. Start Node 1 +## 3. Start Node 1 + If everything is fine, by changing directory to erigon/build/bin you will see the two exec for erigon and rpc daemon. On the terminal you can type the following command to start node1. ```bash ./erigon --datadir=dev --chain=dev --private.api.addr=localhost:9090 --mine ``` + Or, you could start the rpcdaemon internally together + ```bash ./erigon --datadir=dev --chain=dev --private.api.addr=localhost:9090 --mine --http.api=eth,erigon,web3,net,debug,trace,txpool,parity,admin --http.corsdomain="*" ``` - - Argument notes: - * datadir : Tells where the data is stored, default level is dev folder. - * chain : Tells that we want to run Erigon in the dev chain. - * private.api.addr=localhost:9090 : Tells where Eigon is going to listen for connections. - * mine : Add this if you want the node to mine. - * dev.period : Add this to specify the timing interval among blocks. Number of seconds MUST be > 0 (if you want empty blocks) otherwise the default value 0 does not allow mining of empty blocks. - * http.api: List of services to start on http (rpc) access - + +Argument notes: + +- datadir : Tells where the data is stored, default level is dev folder. +- chain : Tells that we want to run Erigon in the dev chain. +- private.api.addr=localhost:9090 : Tells where Eigon is going to listen for connections. +- mine : Add this if you want the node to mine. +- dev.period : Add this to specify the timing interval among blocks. Number of seconds MUST be > 0 (if you want empty blocks) otherwise the default value 0 does not allow mining of empty blocks. +- http.api: List of services to start on http (rpc) access + The result will be something like this: Node 1 start - Now save the enode information generated in the logs, we will use this in a minute. Here there is an example. -``` -enode://d30d079163d7b69fcb261c0538c0c3faba4fb4429652970e60fa25deb02a789b4811e98b468726ba0be63b9dc925a019f433177eb6b45c23bb78892f786d8f7a@127.0.0.1:53171 + +``` +enode://d30d079163d7b69fcb261c0538c0c3faba4fb4429652970e60fa25deb02a789b4811e98b468726ba0be63b9dc925a019f433177eb6b45c23bb78892f786d8f7a@127.0.0.1:53171 ``` ## 4. Start RPC daemon Open terminal 2 and navigate to erigon/build/bin folder. Here type the following command - -```bash + +```bash ./rpcdaemon --datadir=dev --private.api.addr=localhost:9090 --http.api=eth,erigon,web3,net,debug,trace,txpool,parity ``` + The result will look like this: rpc daemon start - - ## 5. Start Node 2 - + Node 2 has to connect to Node 1 in order to sync. As such, we will use the argument --staticpeers. To tell Node 2 where Node 1 is we will use the Enode info of Node 1 we saved before. Open terminal 3 and navigate to erigon/build/bin folder. Paste in the following command the Enode info and run it, be careful to remove the last part ?discport=0. The node info of the first peer can also be obtained with an admin RPC call + ```bash curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "admin_nodeInfo", "params": [], "id":83}' localhost:8545 - ``` +``` -```bash +```bash ./erigon --datadir=dev2 --chain=dev --private.api.addr=localhost:9091 \ --staticpeers="enode://d30d079163d7b69fcb261c0538c0c3faba4fb4429652970e60fa25deb02a789b4811e98b468726ba0be63b9dc925a019f433177eb6b45c23bb78892f786d8f7a@127.0.0.1:53171" \ --nodiscover ``` -You might face a conflict with ports if you run it on the same machine. To specify different ports use, for instance ``--torrent.port 42079``, you might consider specifying all the other flags too: ``--port --http.port --authrpc.port `` - +You might face a conflict with ports if you run it on the same machine. To specify different ports use, for instance `--torrent.port 42079`, you might consider specifying all the other flags too: `--port --http.port --authrpc.port ` + To check if the nodes are connected, you can go to the log of both nodes and look for the line - - ``` [p2p] GoodPeers eth66=1 ``` - + +` [p2p] GoodPeers eth66=1` + Note: this might take a while it is not instantaneous, also if you see a 1 on either one of the two the node is fine. - - - - - -## 6. Interact with the node using RPC - - Open a terminal 4 and type - + +## 6. Interact with the node using RPC + +Open a terminal 4 and type + ```bash curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_chainId", "params": [], "id":1}' localhost:8545 ``` - The result should look like this: - + +The result should look like this: + ```json -{"jsonrpc":"2.0","id":1,"result":"0x539"} +{ "jsonrpc": "2.0", "id": 1, "result": "0x539" } ``` Other commands you can try: - ```bash - curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_gasPrice", "params": [], "id":1}' localhost:8545 - ``` - ```bash - curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_mining", "params": [], "id":1}' localhost:8545 - ``` - ```bash - curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id":1}' localhost:8545 - ``` - ```bash - curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "net_peerCount", "params": [], "id":74}' localhost:8545 - ``` - ```bash - curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_blockNumber", "params": [], "id":83}' localhost:8545 - ``` - +```bash +curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_gasPrice", "params": [], "id":1}' localhost:8545 +``` + +```bash +curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_mining", "params": [], "id":1}' localhost:8545 +``` + +```bash + curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_syncing", "params": [], "id":1}' localhost:8545 +``` + +```bash + curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "net_peerCount", "params": [], "id":74}' localhost:8545 +``` + +```bash + curl -X POST -H "Content-Type: application/json" --data '{"jsonrpc": "2.0", "method": "eth_blockNumber", "params": [], "id":83}' localhost:8545 +``` + ## 7. Send a transaction with MetaMask - - Finally, we want to try sending a transaction between two accounts. - For this example we will use dev accounts retrieved from Erigon code: - - * Account with balance (Dev 1) - * address = ``` 0x67b1d87101671b127f5f8714789C7192f7ad340e ``` - * privateKey = ``` 26e86e45f6fc45ec6e2ecd128cec80fa1d1505e5507dcd2ae58c3130a7a97b48 ``` - - * Empty account (Dev 2) - * address = ``` 0xa94f5374Fce5edBC8E2a8697C15331677e6EbF0B ``` - * privateKey = ``` 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8 ``` - - - -Now from MetaMask, you can import Dev 1 , and then send a transaction to pass some ethers from Dev 1 to Dev 2. + +Finally, we want to try sending a transaction between two accounts. +For this example we will use dev accounts retrieved from Erigon code: + +- Account with balance (Dev 1) + + - address = `0x67b1d87101671b127f5f8714789C7192f7ad340e` + - privateKey = `26e86e45f6fc45ec6e2ecd128cec80fa1d1505e5507dcd2ae58c3130a7a97b48` + +- Empty account (Dev 2) + - address = `0xa94f5374Fce5edBC8E2a8697C15331677e6EbF0B` + - privateKey = `45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8` + +Now from MetaMask, you can import Dev 1 , and then send a transaction to pass some ethers from Dev 1 to Dev 2. From the RPC daemon terminal, you will see something like this - + Transaction example - Finally you will see the ethers in the Dev 2 account balance. - +Finally you will see the ethers in the Dev 2 account balance. +## 7. Check a mined block - ## 7. Check a mined block - - Now we want to check the creation of a new block and that all the nodes sync. +Now we want to check the creation of a new block and that all the nodes sync. Below we can see that block 1 is created (blocn_num=1) and that the next block to be proposed increments from 1 to 2 ( block=2). The other nodes will see the same update. - + Block - 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 71d4c8d1619..9fdf15e60e6 100644 --- a/Makefile +++ b/Makefile @@ -43,7 +43,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}" @@ -290,7 +290,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.21.6 .PHONY: release-dry-run diff --git a/README.md b/README.md index d5c249062d5..3de2e20c987 100644 --- a/README.md +++ b/README.md @@ -7,37 +7,38 @@ by default. An accessible and complete version of the documentation is available at **[erigon.gitbook.io](https://erigon.gitbook.io)**.
-![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) - [System Requirements](#system-requirements) - [Usage](#usage) - + [Getting Started](#getting-started) - + [Logging](#logging) - + [Testnets](#testnets) - + [Block Production](#block-production-pow-miner-or-pos-validator) - + [Windows](#windows) - + [GoDoc](https://godoc.org/github.com/ledgerwatch/erigon) - + [Beacon Chain](#beacon-chain-consensus-layer) - + [Dev Chain](#dev-chain) - + [Caplin (Internal Consensus Layer)](#caplin) + + - [Getting Started](#getting-started) + - [Logging](#logging) + - [Testnets](#testnets) + - [Block Production](#block-production-pow-miner-or-pos-validator) + - [Windows](#windows) + - [GoDoc](https://godoc.org/github.com/erigontech/erigon) + - [Beacon Chain](#beacon-chain-consensus-layer) + - [Dev Chain](#dev-chain) + - [Caplin (Internal Consensus Layer)](#caplin) - [Key features](#key-features) - + [More Efficient State Storage](#more-efficient-state-storage) - + [Faster Initial Sync](#faster-initial-sync) - + [JSON-RPC daemon](#json-rpc-daemon) - + [Run all components by docker-compose](#run-all-components-by-docker-compose) - + [Grafana dashboard](#grafana-dashboard) - + [Internal Consensus Layer](#caplin) + - [More Efficient State Storage](#more-efficient-state-storage) + - [Faster Initial Sync](#faster-initial-sync) + - [JSON-RPC daemon](#json-rpc-daemon) + - [Run all components by docker-compose](#run-all-components-by-docker-compose) + - [Grafana dashboard](#grafana-dashboard) + - [Internal Consensus Layer](#caplin) - [Documentation](#documentation) - [FAQ](#faq) - [Getting in touch](#getting-in-touch) - + [Erigon Discord Server](#erigon-discord-server) - + [Reporting security issues/concerns](#reporting-security-issues/concerns) - + [Team](#team) + - [Erigon Discord Server](#erigon-discord-server) + - [Reporting security issues/concerns](#reporting-security-issues/concerns) + - [Team](#team) - [Known issues](#known-issues) - + [`htop` shows incorrect memory usage](#htop-shows-incorrect-memory-usage) + - [`htop` shows incorrect memory usage](#htop-shows-incorrect-memory-usage) @@ -49,18 +50,17 @@ in `erigon --help`). We don't allow change this flag after first start. In-depth links are marked by the microscope sign (πŸ”¬) -System Requirements -=================== +# System Requirements -* For an Archive node of Ethereum Mainnet we recommend >=3.5TB storage space: 2.3TiB state (as of March 2024), +- For an Archive node of Ethereum Mainnet we recommend >=3.5TB storage space: 2.3TiB state (as of March 2024), 643GiB snapshots (can symlink or mount folder `/snapshots` to another disk), 200GB temp files (can symlink or mount folder `/temp` to another disk). Ethereum Mainnet Full node ( see `--prune*` flags): 1.1TiB (March 2024). -* Goerli Full node (see `--prune*` flags): 189GB on Beta, 114GB on Alpha (April 2022). +- Goerli Full node (see `--prune*` flags): 189GB on Beta, 114GB on Alpha (April 2022). -* Gnosis Chain Archive: 1.7TiB (March 2024). Gnosis Chain Full node (`--prune=hrtc` flag): 530GiB (March 2024). +- Gnosis Chain Archive: 1.7TiB (March 2024). Gnosis Chain Full node (`--prune=hrtc` flag): 530GiB (March 2024). -* Polygon Mainnet Archive: 8.5TiB (December 2023). `--prune.*.older 15768000`: 5.1Tb (September 2023). Polygon Mumbai Archive: +- Polygon Mainnet Archive: 8.5TiB (December 2023). `--prune.*.older 15768000`: 5.1Tb (September 2023). Polygon Mumbai Archive: 1TB. (April 2022). SSD or NVMe. Do not recommend HDD - on HDD Erigon will always stay N blocks behind chain tip, but not fall behind. @@ -71,28 +71,27 @@ RAM: >=16GB, 64-bit architecture. [Golang version >= 1.21](https://golang.org/doc/install); GCC 10+ or Clang; On Linux: kernel > v4 πŸ”¬ more details on disk storage [here](https://erigon.substack.com/p/disk-footprint-changes-in-new-erigon?s=r) -and [here](https://ledgerwatch.github.io/turbo_geth_release.html#Disk-space). +and [here](https://erigontech/.github.io/turbo_geth_release.html#Disk-space). -Usage -===== +# Usage ### Getting Started 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 devel make erigon @@ -105,7 +104,7 @@ download speed by flag `--torrent.download.rate=20mb`. πŸ”¬ See [Downloade Use `--datadir` to choose where to store data. -Use `--chain=gnosis` for [Gnosis Chain](https://www.gnosis.io/), `--chain=bor-mainnet` for Polygon Mainnet, +Use `--chain=gnosis` for [Gnosis Chain](https://www.gnosis.io/), `--chain=bor-mainnet` for Polygon Mainnet, `--chain=mumbai` for Polygon Mumbai and `--chain=amoy` for Polygon Amoy. For Gnosis Chain you need a [Consensus Layer](#beacon-chain-consensus-layer) client alongside Erigon (https://docs.gnosischain.com/node/manual/beacon). @@ -119,7 +118,7 @@ Running `make help` will list and describe the convenience commands available in free space (for merge recent files to bigger one). - temp: can grow to ~100gb, but usually empty. can symlink/mount it to cheaper disk. - txpool: pending transactions. safe to remove. -- nodes: p2p peers. safe to remove. +- nodes: p2p peers. safe to remove. ### Logging @@ -176,7 +175,7 @@ If you would like to give Erigon a try, but do not have spare 2TB on your drive, of the public testnets, GΓΆrli. 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=goerli @@ -192,12 +191,11 @@ the chain in `--chain`. Support only remote-miners. -* To enable, add `--mine --miner.etherbase=...` or `--mine --miner.miner.sigkey=...` flags. -* Other supported options: `--miner.extradata`, `--miner.notify`, `--miner.gaslimit`, `--miner.gasprice` +- To enable, add `--mine --miner.etherbase=...` or `--mine --miner.miner.sigkey=...` flags. +- Other supported options: `--miner.extradata`, `--miner.notify`, `--miner.gaslimit`, `--miner.gasprice` , `--miner.gastarget` -* JSON-RPC supports methods: eth_coinbase , eth_hashrate, eth_mining, eth_getWork, eth_submitWork, eth_submitHashrate -* JSON-RPC supports websocket methods: newPendingTransaction - +- JSON-RPC supports methods: eth_coinbase , eth_hashrate, eth_mining, eth_getWork, eth_submitWork, eth_submitHashrate +- JSON-RPC supports websocket methods: newPendingTransaction πŸ”¬ Detailed explanation is [here](/docs/mining.md). @@ -205,20 +203,21 @@ Support only remote-miners. Windows users may run erigon in 3 possible ways: -* Build executable binaries natively for Windows using provided `wmake.ps1` PowerShell script. Usage syntax is the same +- Build executable binaries natively for Windows using provided `wmake.ps1` PowerShell script. Usage syntax is the same as `make` command so you have to run `.\wmake.ps1 [-target] `. Example: `.\wmake.ps1 erigon` builds erigon executable. All binaries are placed in `.\build\bin\` subfolder. There are some requirements for a successful native build on windows : - * [Git](https://git-scm.com/downloads) for Windows must be installed. If you're cloning this repository is very - likely you already have it - * [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.21 - * GNU CC Compiler at least version 13 (is highly suggested that you install `chocolatey` package manager - see - following point) - * If you need to build MDBX tools (i.e. `.\wmake.ps1 db-tools`) - then [Chocolatey package manager](https://chocolatey.org/) for Windows must be installed. By Chocolatey you need - to install the following components : `cmake`, `make`, `mingw` by `choco install cmake make mingw`. Make sure - Windows System "Path" variable has: - C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin + + - [Git](https://git-scm.com/downloads) for Windows must be installed. If you're cloning this repository is very + likely you already have it + - [GO Programming Language](https://golang.org/dl/) must be installed. Minimum required version is 1.21 + - GNU CC Compiler at least version 13 (is highly suggested that you install `chocolatey` package manager - see + following point) + - If you need to build MDBX tools (i.e. `.\wmake.ps1 db-tools`) + then [Chocolatey package manager](https://chocolatey.org/) for Windows must be installed. By Chocolatey you need + to install the following components : `cmake`, `make`, `mingw` by `choco install cmake make mingw`. Make sure + Windows System "Path" variable has: + C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw64\bin **Important note about Anti-Viruses** During MinGW's compiler detection phase some temporary executables are generated to test compiler capabilities. It's @@ -229,9 +228,9 @@ Windows users may run erigon in 3 possible ways: for `build\bin\mdbx\CMakeFiles` sub-folder of the cloned repo or you can run erigon using the following other two options -* Use Docker : see [docker-compose.yml](./docker-compose.yml) +- Use Docker : see [docker-compose.yml](./docker-compose.yml) -* Use WSL (Windows Subsystem for Linux) **strictly on version 2**. Under this option you can build Erigon just as you +- Use WSL (Windows Subsystem for Linux) **strictly on version 2**. Under this option you can build Erigon just as you would on a regular Linux distribution. You can point your data also to any of the mounted Windows partitions ( eg. `/mnt/c/[...]`, `/mnt/d/[...]` etc) but in such case be advised performance is impacted: this is due to the fact those mount points use `DrvFS` which is a [network file system](#blocks-execution-is-slow-on-cloud-network-drives) @@ -308,15 +307,15 @@ secret path created by Erigon. ### Caplin -Caplin is a full-fledged validating Consensus Client like Prysm, Lighthouse, Teku, Nimbus and Lodestar. Its goal is: +Caplin is a full-fledged validating Consensus Client like Prysm, Lighthouse, Teku, Nimbus and Lodestar. Its goal is: -* provide better stability -* Validation of the chain -* Stay in sync -* keep the execution of blocks on chain tip -* serve the Beacon API using a fast and compact data model alongside low CPU and memory usage. +- provide better stability +- Validation of the chain +- Stay in sync +- keep the execution of blocks on chain tip +- serve the Beacon API using a fast and compact data model alongside low CPU and memory usage. - The main reason why developed a new Consensus Layer is to experiment with the possible benefits that could come with it. For example, The Engine API does not work well with Erigon. The Engine API sends data one block at a time, which does not suit how Erigon works. Erigon is designed to handle many blocks simultaneously and needs to sort and process data efficiently. Therefore, it would be better for Erigon to handle the blocks independently instead of relying on the Engine API. +The main reason why developed a new Consensus Layer is to experiment with the possible benefits that could come with it. For example, The Engine API does not work well with Erigon. The Engine API sends data one block at a time, which does not suit how Erigon works. Erigon is designed to handle many blocks simultaneously and needs to sort and process data efficiently. Therefore, it would be better for Erigon to handle the blocks independently instead of relying on the Engine API. #### Caplin's Usage. @@ -324,7 +323,7 @@ Caplin can be enabled through the `--internalcl` flag. from that point on, an ex Caplin also has an archivial mode for historical states and blocks. it can be enabled through the `--caplin.archive` flag. In order to enable the caplin's Beacon API, the flag `--beacon.api=` must be added. -e.g: `--beacon.api=beacon,builder,config,debug,node,validator,lighthouse` will enable all endpoints. **NOTE: Caplin is not staking-ready so aggregation endpoints are still to be implemented. Additionally enabling the Beacon API will lead to a 6 GB higher RAM usage. +e.g: `--beacon.api=beacon,builder,config,debug,node,validator,lighthouse` will enable all endpoints. \*\*NOTE: Caplin is not staking-ready so aggregation endpoints are still to be implemented. Additionally enabling the Beacon API will lead to a 6 GB higher RAM usage. ### Multiple Instances / One Machine @@ -346,11 +345,10 @@ Quote your path if it has spaces. πŸ”¬ Detailed explanation is [DEV_CHAIN](/DEV_CHAIN.md). -Key features -============ +# Key features πŸ”¬ See more -detailed [overview of functionality and current limitations](https://ledgerwatch.github.io/turbo_geth_release.html). It +detailed [overview of functionality and current limitations](https://erigontech/.github.io/turbo_geth_release.html). It is being updated on recurring basis. ### More Efficient State Storage @@ -362,7 +360,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**. @@ -384,17 +382,17 @@ to sync Ethereum mainnet in under 2 days if you have a fast enough network conne Examples of stages are: -* Downloading headers; +- Downloading headers; -* Downloading block bodies; +- Downloading block bodies; -* Recovering senders' addresses; +- Recovering senders' addresses; -* Executing blocks; +- Executing blocks; -* Validating root hashes and building intermediate hashes for the state Merkle trie; +- Validating root hashes and building intermediate hashes for the state Merkle trie; -* [...] +- [...] ### JSON-RPC daemon @@ -450,9 +448,9 @@ make user_macos There is a `.env.example` file in the root of the repo. -* `DOCKER_UID` - The UID of the docker user -* `DOCKER_GID` - The GID of the docker user -* `XDG_DATA_HOME` - The data directory which will be mounted to the docker containers +- `DOCKER_UID` - The UID of the docker user +- `DOCKER_GID` - The GID of the docker user +- `XDG_DATA_HOME` - The data directory which will be mounted to the docker containers If not specified, the UID/GID will use the current user. @@ -509,7 +507,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 @@ -528,18 +526,14 @@ old data Disabled by default. To enable see `./build/bin/erigon --help` for flags `--prune` -Documentation -============== +# Documentation The `./docs` directory includes a lot of useful but outdated documentation. For code located in the `./cmd` directory, their respective documentation can be found in `./cmd/*/README.md`. A more recent collation of developments and happenings in Erigon can be found in the [Erigon Blog](https://erigon.substack.com/). - - -FAQ -================ +# FAQ ### How much RAM do I need @@ -554,7 +548,7 @@ Detailed explanation: [./docs/programmers_guide/db_faq.md](./docs/programmers_gu #### `erigon` ports | Component | Port | Protocol | Purpose | Should Expose | -|-----------|-------|-----------|-----------------------------|---------------| +| --------- | ----- | --------- | --------------------------- | ------------- | | engine | 9090 | TCP | gRPC Server | Private | | engine | 42069 | TCP & UDP | Snap sync (Bittorrent) | Public | | engine | 8551 | TCP | Engine API (JWT auth) | Private | @@ -570,25 +564,25 @@ node. #### `caplin` ports -| Component | Port | Protocol | Purpose | Should Expose | -|-----------|------|----------|------------------|---------------| -| sentinel | 4000 | UDP | Peering | Public | -| sentinel | 4001 | TCP | Peering | Public | +| Component | Port | Protocol | Purpose | Should Expose | +| --------- | ---- | -------- | ------- | ------------- | +| sentinel | 4000 | UDP | Peering | Public | +| sentinel | 4001 | TCP | Peering | Public | If you are using `--internalcl` aka `caplin` as your consensus client, then also look at the chart above #### `beaconAPI` ports -| Component | Port | Protocol | Purpose | Should Expose | -|-----------|------|----------|------------------|---------------| -| REST | 5555 | TCP | REST | Public | +| Component | Port | Protocol | Purpose | Should Expose | +| --------- | ---- | -------- | ------- | ------------- | +| REST | 5555 | TCP | REST | Public | If you are using `--internalcl` aka `caplin` as your consensus client and `--beacon.api` then also look at the chart above #### `shared` ports | Component | Port | Protocol | Purpose | Should Expose | -|-----------|------|----------|---------|---------------| +| --------- | ---- | -------- | ------- | ------------- | | all | 6060 | TCP | pprof | Private | | all | 6060 | TCP | metrics | Private | @@ -632,7 +626,7 @@ Running erigon from `build/bin` as a separate user might produce an error: error while loading shared libraries: libsilkworm_capi.so: cannot open shared object file: No such file or directory -The library needs to be *installed* for another user using `make DIST= install`. You could use `$HOME/erigon` or `/opt/erigon` as the installation path, for example: +The library needs to be _installed_ for another user using `make DIST= install`. You could use `$HOME/erigon` or `/opt/erigon` as the installation path, for example: make DIST=/opt/erigon install @@ -671,11 +665,9 @@ https://github.com/mathMakesArt/Erigon-on-RPi-4 ### How to change db pagesize -[post](https://github.com/ledgerwatch/erigon/blob/devel/cmd/integration/Readme.md#copy-data-to-another-db) - +[post](https://github.com/erigontech/erigon/blob/devel/cmd/integration/Readme.md#copy-data-to-another-db) -Getting in touch -================ +# Getting in touch ### Erigon Discord Server @@ -687,8 +679,7 @@ your name, occupation, a brief explanation of why you want to join the Discord, Send an email to `security [at] torquem.ch`. -Known issues -============ +# Known issues ### `htop` shows incorrect memory usage @@ -706,8 +697,8 @@ Erigon at all. Next tools show correct memory usage of Erigon: - `vmmap -summary PID | grep -i "Physical footprint"`. Without `grep` you can see details - - `section MALLOC ZONE column Resident Size` shows App memory usage, `section REGION TYPE column Resident Size` - shows OS pages cache size. + - `section MALLOC ZONE column Resident Size` shows App memory usage, `section REGION TYPE column Resident Size` + shows OS pages cache size. - `Prometheus` dashboard shows memory of Go app without OS pages cache (`make prometheus`, open in browser `localhost:3000`, credentials `admin/admin`) - `cat /proc//smaps` @@ -726,7 +717,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. 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 aaba001ba94..f653298c831 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -24,9 +24,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 2ca829d7759..96ee1e6706b 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -27,11 +27,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 59da964fbe0..cebf2bffeb1 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -21,10 +21,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 120cf191bf9..9690ac42979 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,10 +21,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 bd679c7f68d..171f5df8a81 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -25,34 +25,34 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/log/v3" "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/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - 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/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" + 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/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 0f14ad4703a..4537d6b1a11 100644 --- a/accounts/abi/bind/backends/simulated_test.go +++ b/accounts/abi/bind/backends/simulated_test.go @@ -26,18 +26,18 @@ import ( "testing" "time" + 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" "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" ) func TestSimulatedBackend(t *testing.T) { diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index d6f2b33b805..bd3c15290dd 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -22,14 +22,14 @@ import ( "fmt" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" "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" + 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 e16c4ad0485..7b6c2e18e04 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -18,20 +18,20 @@ package bind_test import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "math/big" "reflect" "strings" "testing" - 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 feaef12be23..d6a23e3d056 100644 --- a/accounts/abi/bind/bind.go +++ b/accounts/abi/bind/bind.go @@ -17,7 +17,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 ( @@ -30,9 +30,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 7698dd6dc9e..62cad2ee495 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -26,7 +26,7 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/common/dir" ) var bindTests = []struct { @@ -47,7 +47,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) @@ -70,7 +70,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) @@ -86,7 +86,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) @@ -102,7 +102,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) @@ -129,7 +129,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) @@ -167,7 +167,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) @@ -208,7 +208,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) @@ -288,10 +288,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 @@ -343,10 +343,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 @@ -389,10 +389,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 @@ -446,11 +446,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 @@ -495,10 +495,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 @@ -561,10 +561,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 @@ -606,10 +606,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 @@ -645,10 +645,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 @@ -693,10 +693,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 @@ -742,11 +742,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 @@ -818,10 +818,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 @@ -911,11 +911,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 @@ -1102,10 +1102,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 @@ -1237,10 +1237,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" `, ` @@ -1379,10 +1379,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 @@ -1445,10 +1445,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 @@ -1533,10 +1533,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 @@ -1596,10 +1596,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() @@ -1658,10 +1658,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 @@ -1719,10 +1719,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() @@ -1842,7 +1842,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 3caa889fd00..878251ba6d5 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,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 { @@ -93,12 +93,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 00fdff6e69e..7c8568d5d7f 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,10 +21,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 tx to be mined on the blockchain. diff --git a/accounts/abi/bind/util_test.go b/accounts/abi/bind/util_test.go index 3c2632e4d15..92f78cacf1f 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -24,14 +24,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 0a709efd378..b1bf1545e36 100644 --- a/accounts/abi/error.go +++ b/accounts/abi/error.go @@ -23,9 +23,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 27f64e71d50..84b9bcb3def 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,9 +20,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 a734f971dfc..40289372947 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,12 +25,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(`{ @@ -355,7 +355,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 f7a129ddbf8..69cae4f2c87 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,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 2f0fe3f45c3..77c1a431103 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -22,9 +22,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 49f576137c4..6a37cabcfe9 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -28,9 +28,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 4248596079f..bad427cc4cf 100644 --- a/accounts/abi/packing_test.go +++ b/accounts/abi/packing_test.go @@ -19,7 +19,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 ca14e22383c..9b2042355ae 100644 --- a/accounts/abi/topics.go +++ b/accounts/abi/topics.go @@ -23,10 +23,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 7a576c8c1f1..1f6e0787923 100644 --- a/accounts/abi/topics_test.go +++ b/accounts/abi/topics_test.go @@ -22,9 +22,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 d8609828243..f9ac6f9b512 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -24,7 +24,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 a1ac4738a2a..56379ef09a5 100644 --- a/accounts/abi/type_test.go +++ b/accounts/abi/type_test.go @@ -22,7 +22,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 64f2599a1fc..e13c0205b50 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -22,7 +22,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 083f329b75e..209269b1cad 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -27,10 +27,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 cc77a206181..ce3e13e6776 100644 --- a/cl/abstract/beacon_state.go +++ b/cl/abstract/beacon_state.go @@ -1,11 +1,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/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 9efbd5c042a..cb04939ef77 100644 --- a/cl/aggregation/pool.go +++ b/cl/aggregation/pool.go @@ -1,8 +1,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 62f1b704e4e..90de65b0d8a 100644 --- a/cl/aggregation/pool_impl.go +++ b/cl/aggregation/pool_impl.go @@ -7,11 +7,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 79ae9cf410f..ad5718e53fb 100644 --- a/cl/aggregation/pool_test.go +++ b/cl/aggregation/pool_test.go @@ -5,7 +5,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 ef80facf1ad..83d57bbf945 100644 --- a/cl/antiquary/antiquary.go +++ b/cl/antiquary/antiquary.go @@ -6,18 +6,18 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "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/cl/utils" - "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/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "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/cl/utils" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) const safetyMargin = 10_000 // We retire snapshots 10k blocks after the finalized head diff --git a/cl/antiquary/beacon_states_collector.go b/cl/antiquary/beacon_states_collector.go index 1b719b65cc1..60332f83d49 100644 --- a/cl/antiquary/beacon_states_collector.go +++ b/cl/antiquary/beacon_states_collector.go @@ -5,18 +5,18 @@ import ( "context" "io" + 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" "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" ) 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 d82e1ff3542..f2a74d59b23 100644 --- a/cl/antiquary/state_antiquary.go +++ b/cl/antiquary/state_antiquary.go @@ -7,24 +7,24 @@ import ( "sync" "time" + "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" "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" ) // pool for buffers diff --git a/cl/antiquary/state_antiquary_test.go b/cl/antiquary/state_antiquary_test.go index 19a984b37c3..b3214f41411 100644 --- a/cl/antiquary/state_antiquary_test.go +++ b/cl/antiquary/state_antiquary_test.go @@ -7,14 +7,14 @@ import ( _ "embed" "testing" - "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" "github.com/stretchr/testify/require" ) diff --git a/cl/antiquary/tests/tests.go b/cl/antiquary/tests/tests.go index 58f99cb1490..9e851912ba8 100644 --- a/cl/antiquary/tests/tests.go +++ b/cl/antiquary/tests/tests.go @@ -7,14 +7,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 ee7ea86d6e5..9e0ed28d35f 100644 --- a/cl/antiquary/utils.go +++ b/cl/antiquary/utils.go @@ -5,12 +5,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 5ad3ccaeee8..1c3d873cf65 100644 --- a/cl/beacon/beaconevents/emitter_test.go +++ b/cl/beacon/beaconevents/emitter_test.go @@ -4,7 +4,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 b9b8d1148ab..f41a05ad19d 100644 --- a/cl/beacon/beaconhttp/api.go +++ b/cl/beacon/beaconhttp/api.go @@ -9,9 +9,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 5bbb115171a..dab4f76e58b 100644 --- a/cl/beacon/beaconhttp/args.go +++ b/cl/beacon/beaconhttp/args.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" + "github.com/erigontech/erigon-lib/common" "github.com/go-chi/chi/v5" - "github.com/ledgerwatch/erigon-lib/common" ) type chainTag int diff --git a/cl/beacon/beaconhttp/beacon_response.go b/cl/beacon/beaconhttp/beacon_response.go index 64842a9be81..ea131c55246 100644 --- a/cl/beacon/beaconhttp/beacon_response.go +++ b/cl/beacon/beaconhttp/beacon_response.go @@ -4,8 +4,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 d6ee904d7e7..d9ec4ce58fe 100644 --- a/cl/beacon/beacontest/harness_test.go +++ b/cl/beacon/beacontest/harness_test.go @@ -5,7 +5,7 @@ import ( _ "embed" - "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/building/endpoints.go b/cl/beacon/building/endpoints.go index cdf3c133d8c..989cf34b2b1 100644 --- a/cl/beacon/building/endpoints.go +++ b/cl/beacon/building/endpoints.go @@ -1,8 +1,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 e7baf787b8d..a0230ce4286 100644 --- a/cl/beacon/building/state.go +++ b/cl/beacon/building/state.go @@ -3,7 +3,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 54e1360e968..fba4782d60d 100644 --- a/cl/beacon/handler/attestation_rewards.go +++ b/cl/beacon/handler/attestation_rewards.go @@ -6,16 +6,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 8b006ec4d4a..3d0b6b192a9 100644 --- a/cl/beacon/handler/blobs.go +++ b/cl/beacon/handler/blobs.go @@ -5,10 +5,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 5b1eddf240b..296dc073702 100644 --- a/cl/beacon/handler/block_production.go +++ b/cl/beacon/handler/block_production.go @@ -13,28 +13,28 @@ import ( "sync" "time" + "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "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/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" "github.com/go-chi/chi/v5" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "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/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" "golang.org/x/exp/slices" ) diff --git a/cl/beacon/handler/blocks.go b/cl/beacon/handler/blocks.go index 183987c0445..e9698de1546 100644 --- a/cl/beacon/handler/blocks.go +++ b/cl/beacon/handler/blocks.go @@ -5,11 +5,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 6e2f7ab7f61..97f68c2d667 100644 --- a/cl/beacon/handler/builder.go +++ b/cl/beacon/handler/builder.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" - "github.com/ledgerwatch/erigon/cl/clparams" - "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/cl/beacon/beaconhttp" + "github.com/erigontech/erigon/cl/clparams" + "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 df2a052c7f8..3a033e5da7b 100644 --- a/cl/beacon/handler/committees.go +++ b/cl/beacon/handler/committees.go @@ -5,10 +5,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 8a0914e769a..781e4367bd8 100644 --- a/cl/beacon/handler/config.go +++ b/cl/beacon/handler/config.go @@ -5,9 +5,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 dfb4a24065b..01bf95e2482 100644 --- a/cl/beacon/handler/data_test.go +++ b/cl/beacon/handler/data_test.go @@ -7,15 +7,15 @@ import ( "strings" "testing" - "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" "github.com/spf13/afero" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/handler/duties_attester.go b/cl/beacon/handler/duties_attester.go index aecc7b06e8e..63f739e6014 100644 --- a/cl/beacon/handler/duties_attester.go +++ b/cl/beacon/handler/duties_attester.go @@ -6,10 +6,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 297d1fcd27f..e5a66036c1e 100644 --- a/cl/beacon/handler/duties_proposer.go +++ b/cl/beacon/handler/duties_proposer.go @@ -7,13 +7,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 9cb7a44806e..b431ee4a49a 100644 --- a/cl/beacon/handler/duties_sync.go +++ b/cl/beacon/handler/duties_sync.go @@ -7,10 +7,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 209c81f5734..1be98cf7ff2 100644 --- a/cl/beacon/handler/events.go +++ b/cl/beacon/handler/events.go @@ -7,8 +7,8 @@ import ( "net/http" "sync" + "github.com/erigontech/erigon-lib/log/v3" "github.com/gfx-labs/sse" - "github.com/ledgerwatch/erigon-lib/log/v3" ) var validTopics = map[string]struct{}{ diff --git a/cl/beacon/handler/forkchoice.go b/cl/beacon/handler/forkchoice.go index c9e6ce9cbb3..48e166b43ac 100644 --- a/cl/beacon/handler/forkchoice.go +++ b/cl/beacon/handler/forkchoice.go @@ -6,7 +6,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 bb071a0b2fc..d5b29e33a92 100644 --- a/cl/beacon/handler/format.go +++ b/cl/beacon/handler/format.go @@ -1,7 +1,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 804066f7265..e50ffc35ef1 100644 --- a/cl/beacon/handler/genesis.go +++ b/cl/beacon/handler/genesis.go @@ -3,10 +3,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 7f47be85d9c..349561e384c 100644 --- a/cl/beacon/handler/handler.go +++ b/cl/beacon/handler/handler.go @@ -4,32 +4,32 @@ import ( "net/http" "sync" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "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/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" "github.com/go-chi/chi/v5" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "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/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" ) 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 6ad000d6a35..c1f3c7b82c0 100644 --- a/cl/beacon/handler/harness_test.go +++ b/cl/beacon/handler/harness_test.go @@ -4,8 +4,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 9a0a52231af..69d6621eac4 100644 --- a/cl/beacon/handler/headers.go +++ b/cl/beacon/handler/headers.go @@ -4,9 +4,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 79cbc5c6dac..80d5a935e26 100644 --- a/cl/beacon/handler/lightclient.go +++ b/cl/beacon/handler/lightclient.go @@ -5,9 +5,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 f024e90b0e0..b544308df5c 100644 --- a/cl/beacon/handler/lighthouse.go +++ b/cl/beacon/handler/lighthouse.go @@ -4,13 +4,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 f23078ee695..cede08900df 100644 --- a/cl/beacon/handler/liveness.go +++ b/cl/beacon/handler/liveness.go @@ -7,11 +7,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 7cba2bb7791..67083adc94b 100644 --- a/cl/beacon/handler/node.go +++ b/cl/beacon/handler/node.go @@ -7,8 +7,8 @@ import ( "runtime" "strconv" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "github.com/ledgerwatch/erigon/cl/beacon/beaconhttp" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon/cl/beacon/beaconhttp" ) /* diff --git a/cl/beacon/handler/pool.go b/cl/beacon/handler/pool.go index 6cb15c6db49..758f6d5e4d2 100644 --- a/cl/beacon/handler/pool.go +++ b/cl/beacon/handler/pool.go @@ -6,14 +6,14 @@ import ( "errors" "net/http" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "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 da21af13f02..22e0292ecb1 100644 --- a/cl/beacon/handler/pool_test.go +++ b/cl/beacon/handler/pool_test.go @@ -6,11 +6,11 @@ import ( "net/http/httptest" "testing" - 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" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/handler/rewards.go b/cl/beacon/handler/rewards.go index a4c67e554b5..db6900f560b 100644 --- a/cl/beacon/handler/rewards.go +++ b/cl/beacon/handler/rewards.go @@ -7,12 +7,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 3460fc24c0c..7a35ffb8b88 100644 --- a/cl/beacon/handler/rewards_test.go +++ b/cl/beacon/handler/rewards_test.go @@ -9,10 +9,10 @@ import ( "strings" "testing" - "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" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/handler/states.go b/cl/beacon/handler/states.go index 037852fd7c1..60dce602a9e 100644 --- a/cl/beacon/handler/states.go +++ b/cl/beacon/handler/states.go @@ -6,15 +6,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 31961c8fc43..518cb5bb6ff 100644 --- a/cl/beacon/handler/states_test.go +++ b/cl/beacon/handler/states_test.go @@ -8,11 +8,11 @@ import ( "strconv" "testing" - "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" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/handler/subscription.go b/cl/beacon/handler/subscription.go index ed097eda7ba..22cf4aa6e89 100644 --- a/cl/beacon/handler/subscription.go +++ b/cl/beacon/handler/subscription.go @@ -8,13 +8,13 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "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 ddf101357c4..72bd0074f81 100644 --- a/cl/beacon/handler/utils_test.go +++ b/cl/beacon/handler/utils_test.go @@ -5,31 +5,31 @@ import ( "math" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/afero" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "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 c055d6a180c..2217fb902c5 100644 --- a/cl/beacon/handler/validator_registration.go +++ b/cl/beacon/handler/validator_registration.go @@ -4,7 +4,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 1c38cf00fc1..cfff0c35601 100644 --- a/cl/beacon/handler/validator_registration_test.go +++ b/cl/beacon/handler/validator_registration_test.go @@ -7,9 +7,9 @@ import ( "net/http/httptest" "testing" - 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" "github.com/stretchr/testify/require" ) diff --git a/cl/beacon/handler/validator_test.go b/cl/beacon/handler/validator_test.go index a314d8ef2dc..e1625370a3e 100644 --- a/cl/beacon/handler/validator_test.go +++ b/cl/beacon/handler/validator_test.go @@ -7,12 +7,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 de998457ede..c710996c1a9 100644 --- a/cl/beacon/handler/validators.go +++ b/cl/beacon/handler/validators.go @@ -10,14 +10,14 @@ import ( "strings" "sync" - 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" + 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" "github.com/pkg/errors" ) diff --git a/cl/beacon/router.go b/cl/beacon/router.go index 51d37ace0e2..12fb57a2545 100644 --- a/cl/beacon/router.go +++ b/cl/beacon/router.go @@ -6,11 +6,11 @@ import ( "net/http" "time" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/beacon/handler" "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" ) type LayeredBeaconHandler struct { diff --git a/cl/beacon/synced_data/interface.go b/cl/beacon/synced_data/interface.go index e7566b8eea8..7228896c2fe 100644 --- a/cl/beacon/synced_data/interface.go +++ b/cl/beacon/synced_data/interface.go @@ -1,6 +1,6 @@ package synced_data -import "github.com/ledgerwatch/erigon/cl/phase1/core/state" +import "github.com/erigontech/erigon/cl/phase1/core/state" //go:generate mockgen -typed=true -destination=./mock_services/synced_data_mock.go -package=mock_services . SyncedData type SyncedData interface { 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 a5111b2e485..717459b9852 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,7 +12,7 @@ package mock_services import ( reflect "reflect" - state "github.com/ledgerwatch/erigon/cl/phase1/core/state" + 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 9248142d902..ad60a242027 100644 --- a/cl/beacon/synced_data/synced_data.go +++ b/cl/beacon/synced_data/synced_data.go @@ -3,8 +3,8 @@ package synced_data import ( "sync/atomic" - "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" ) type SyncedDataManager struct { diff --git a/cl/clparams/config.go b/cl/clparams/config.go index c233b5887c8..3a02ace8f46 100644 --- a/cl/clparams/config.go +++ b/cl/clparams/config.go @@ -23,11 +23,11 @@ import ( "path" "time" - "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" "gopkg.in/yaml.v2" - "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 e845dd175c9..46e5e91dcdc 100644 --- a/cl/clparams/initial_state/initial_state.go +++ b/cl/clparams/initial_state/initial_state.go @@ -3,9 +3,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 46714b2a305..0152186e402 100644 --- a/cl/clparams/initial_state/initial_state_test.go +++ b/cl/clparams/initial_state/initial_state_test.go @@ -3,9 +3,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 7e86e13160b..6df19e885f2 100644 --- a/cl/clstages/clstages.go +++ b/cl/clstages/clstages.go @@ -6,7 +6,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 8efc4b2e8b4..a2125a9c7ce 100644 --- a/cl/cltypes/aggregate.go +++ b/cl/cltypes/aggregate.go @@ -1,10 +1,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 cfaa4ed8f67..bd879770d4a 100644 --- a/cl/cltypes/beacon_block.go +++ b/cl/cltypes/beacon_block.go @@ -4,13 +4,13 @@ import ( "encoding/json" "fmt" - 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/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/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/beacon_block_test.go b/cl/cltypes/beacon_block_test.go index ae9c18347c1..581199957ef 100644 --- a/cl/cltypes/beacon_block_test.go +++ b/cl/cltypes/beacon_block_test.go @@ -6,11 +6,11 @@ import ( "math/big" "testing" + 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/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" ) diff --git a/cl/cltypes/beacon_header.go b/cl/cltypes/beacon_header.go index 4c67066f3df..0fef86138fd 100644 --- a/cl/cltypes/beacon_header.go +++ b/cl/cltypes/beacon_header.go @@ -1,11 +1,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 6a1fec24a55..74296c89f5c 100644 --- a/cl/cltypes/beacon_kzgcommitment.go +++ b/cl/cltypes/beacon_kzgcommitment.go @@ -5,11 +5,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 58f6da68461..dc166e9145a 100644 --- a/cl/cltypes/beacon_kzgcommitment_test.go +++ b/cl/cltypes/beacon_kzgcommitment_test.go @@ -3,8 +3,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/blinded_beacon_block.go b/cl/cltypes/blinded_beacon_block.go index f15a6d83c66..4749a593edc 100644 --- a/cl/cltypes/blinded_beacon_block.go +++ b/cl/cltypes/blinded_beacon_block.go @@ -3,14 +3,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" ) type SignedBlindedBeaconBlock struct { diff --git a/cl/cltypes/blob_sidecar.go b/cl/cltypes/blob_sidecar.go index b1f5edd65e3..977aaef0354 100644 --- a/cl/cltypes/blob_sidecar.go +++ b/cl/cltypes/blob_sidecar.go @@ -3,14 +3,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/bls_to_execution_change.go b/cl/cltypes/bls_to_execution_change.go index 8fa1a9000a9..496d446f889 100644 --- a/cl/cltypes/bls_to_execution_change.go +++ b/cl/cltypes/bls_to_execution_change.go @@ -3,10 +3,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 2aca0a33956..764f3a33788 100644 --- a/cl/cltypes/bls_to_execution_test.go +++ b/cl/cltypes/bls_to_execution_test.go @@ -1,11 +1,11 @@ package cltypes_test import ( - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "testing" - "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/clone.go b/cl/cltypes/clone.go index 99b5840bb3f..f7196fe5ad1 100644 --- a/cl/cltypes/clone.go +++ b/cl/cltypes/clone.go @@ -1,7 +1,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 e6d184185b6..450190e214f 100644 --- a/cl/cltypes/contribution.go +++ b/cl/cltypes/contribution.go @@ -1,12 +1,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 4c311f44a2f..d61c372f8d3 100644 --- a/cl/cltypes/eth1_block.go +++ b/cl/cltypes/eth1_block.go @@ -5,16 +5,16 @@ import ( "fmt" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" "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/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" + "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 ee9695d67ca..9745211d5cb 100644 --- a/cl/cltypes/eth1_data.go +++ b/cl/cltypes/eth1_data.go @@ -1,11 +1,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 9a15b92f3e6..b0f902efac3 100644 --- a/cl/cltypes/eth1_data_test.go +++ b/cl/cltypes/eth1_data_test.go @@ -3,11 +3,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 c49ee4d1608..7ddcde8c2c5 100644 --- a/cl/cltypes/eth1_header.go +++ b/cl/cltypes/eth1_header.go @@ -4,14 +4,14 @@ import ( "encoding/json" "fmt" + libcommon "github.com/erigontech/erigon-lib/common" + "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/core/types" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "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/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 8acfc6bda7e..378ccd01f1f 100644 --- a/cl/cltypes/eth1_header_test.go +++ b/cl/cltypes/eth1_header_test.go @@ -3,10 +3,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 eff0f292047..180a72ac277 100644 --- a/cl/cltypes/fork.go +++ b/cl/cltypes/fork.go @@ -1,9 +1,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 cbde62babf2..ef592532252 100644 --- a/cl/cltypes/fork_test.go +++ b/cl/cltypes/fork_test.go @@ -3,9 +3,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 f4abf293f8e..399368635fc 100644 --- a/cl/cltypes/historical_summary.go +++ b/cl/cltypes/historical_summary.go @@ -1,11 +1,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 89a716c11a2..b0019100da8 100644 --- a/cl/cltypes/historical_summary_test.go +++ b/cl/cltypes/historical_summary_test.go @@ -1,11 +1,11 @@ package cltypes_test import ( - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "testing" - "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 ba285ffb0b1..780eb8913c4 100644 --- a/cl/cltypes/indexed_attestation.go +++ b/cl/cltypes/indexed_attestation.go @@ -3,10 +3,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 61b337054ae..14d778fa433 100644 --- a/cl/cltypes/justification_bits.go +++ b/cl/cltypes/justification_bits.go @@ -3,9 +3,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 ac18566574a..c1612f78b39 100644 --- a/cl/cltypes/justification_bits_test.go +++ b/cl/cltypes/justification_bits_test.go @@ -3,7 +3,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 a6fe0c5e27c..ef68dde4a81 100644 --- a/cl/cltypes/light_client.go +++ b/cl/cltypes/light_client.go @@ -1,11 +1,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 dd53e25eabb..d7b1ae80801 100644 --- a/cl/cltypes/lightclient_utils/lightclient.go +++ b/cl/cltypes/lightclient_utils/lightclient.go @@ -3,11 +3,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 863c3cd4d27..ea53017e075 100644 --- a/cl/cltypes/network.go +++ b/cl/cltypes/network.go @@ -4,12 +4,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 de589e93fed..bcfa7cb77c2 100644 --- a/cl/cltypes/network_test.go +++ b/cl/cltypes/network_test.go @@ -3,12 +3,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 b9dfbdfff87..b5c8e130955 100644 --- a/cl/cltypes/participation_flags.go +++ b/cl/cltypes/participation_flags.go @@ -1,7 +1,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 4c492dc4712..976a498122b 100644 --- a/cl/cltypes/participation_flags_test.go +++ b/cl/cltypes/participation_flags_test.go @@ -3,7 +3,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 b7ef50dc656..eaf13437450 100644 --- a/cl/cltypes/slashings.go +++ b/cl/cltypes/slashings.go @@ -1,8 +1,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 3f13f34b8a2..6455ac1216a 100644 --- a/cl/cltypes/slashings_test.go +++ b/cl/cltypes/slashings_test.go @@ -3,8 +3,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 7b7de59e4d2..449db87fe8a 100644 --- a/cl/cltypes/solid/attestation.go +++ b/cl/cltypes/solid/attestation.go @@ -4,12 +4,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 cf84df93903..79d1969d01e 100644 --- a/cl/cltypes/solid/attestation_data.go +++ b/cl/cltypes/solid/attestation_data.go @@ -5,11 +5,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 ba0a5d5ab6e..4b54346164c 100644 --- a/cl/cltypes/solid/attestation_test.go +++ b/cl/cltypes/solid/attestation_test.go @@ -3,7 +3,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 f54d55af93a..d862f4a80d5 100644 --- a/cl/cltypes/solid/bitlist.go +++ b/cl/cltypes/solid/bitlist.go @@ -4,10 +4,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 01f685209ff..4a26cd9b754 100644 --- a/cl/cltypes/solid/bitlist_test.go +++ b/cl/cltypes/solid/bitlist_test.go @@ -3,7 +3,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 7520d026a22..4519dd1acef 100644 --- a/cl/cltypes/solid/checkpoint.go +++ b/cl/cltypes/solid/checkpoint.go @@ -5,11 +5,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 e6598028e4a..912811f81fd 100644 --- a/cl/cltypes/solid/checkpoint_test.go +++ b/cl/cltypes/solid/checkpoint_test.go @@ -3,11 +3,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 4ef2c78ec31..04b00481633 100644 --- a/cl/cltypes/solid/extra_data.go +++ b/cl/cltypes/solid/extra_data.go @@ -4,11 +4,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 74f124154ab..30d33fc4b85 100644 --- a/cl/cltypes/solid/extra_data_test.go +++ b/cl/cltypes/solid/extra_data_test.go @@ -3,7 +3,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 b6d9310f90e..133442d100d 100644 --- a/cl/cltypes/solid/hash_list.go +++ b/cl/cltypes/solid/hash_list.go @@ -3,13 +3,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 01a971cda9f..6ae4aaaba57 100644 --- a/cl/cltypes/solid/hash_vector.go +++ b/cl/cltypes/solid/hash_vector.go @@ -3,11 +3,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 a41a86b0e3c..ff0fb924a35 100644 --- a/cl/cltypes/solid/hashutil_test.go +++ b/cl/cltypes/solid/hashutil_test.go @@ -3,7 +3,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 31e73723148..e71b3fe23c1 100644 --- a/cl/cltypes/solid/interfaces.go +++ b/cl/cltypes/solid/interfaces.go @@ -3,9 +3,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 30af90a16a3..537873b5dcb 100644 --- a/cl/cltypes/solid/list_ssz.go +++ b/cl/cltypes/solid/list_ssz.go @@ -3,10 +3,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 5d41d49f12b..f004a7339d3 100644 --- a/cl/cltypes/solid/list_ssz_test.go +++ b/cl/cltypes/solid/list_ssz_test.go @@ -3,7 +3,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 f8cc50aa3ac..76edcc9cab8 100644 --- a/cl/cltypes/solid/list_test.go +++ b/cl/cltypes/solid/list_test.go @@ -3,8 +3,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 ba61000b9fe..a28ef08f252 100644 --- a/cl/cltypes/solid/pending_attestation.go +++ b/cl/cltypes/solid/pending_attestation.go @@ -4,12 +4,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 58d07e6f780..0c4b33b5503 100644 --- a/cl/cltypes/solid/sync_committee.go +++ b/cl/cltypes/solid/sync_committee.go @@ -3,10 +3,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 1a12bd4a0ca..eba8b1b2caa 100644 --- a/cl/cltypes/solid/sync_committee_test.go +++ b/cl/cltypes/solid/sync_committee_test.go @@ -3,8 +3,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 77b216af109..b3f0fb5e818 100644 --- a/cl/cltypes/solid/transactions.go +++ b/cl/cltypes/solid/transactions.go @@ -3,11 +3,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 2678cf0e212..8cec6fb980a 100644 --- a/cl/cltypes/solid/uint64_list.go +++ b/cl/cltypes/solid/uint64_list.go @@ -3,7 +3,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 1107f195d85..818c4779955 100644 --- a/cl/cltypes/solid/uint64_raw_list.go +++ b/cl/cltypes/solid/uint64_raw_list.go @@ -5,11 +5,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 f5ba39817f6..9cff76bfde1 100644 --- a/cl/cltypes/solid/uint64_vector.go +++ b/cl/cltypes/solid/uint64_vector.go @@ -3,8 +3,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 8cdaa7fa7fe..7117fa3209d 100644 --- a/cl/cltypes/solid/uint64slice_byte.go +++ b/cl/cltypes/solid/uint64slice_byte.go @@ -6,11 +6,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 973866df9fc..6fa2c7b6747 100644 --- a/cl/cltypes/solid/uint64slice_byte_test.go +++ b/cl/cltypes/solid/uint64slice_byte_test.go @@ -3,8 +3,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 ce8e7245676..3e6172ad574 100644 --- a/cl/cltypes/solid/validator.go +++ b/cl/cltypes/solid/validator.go @@ -4,11 +4,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 eb5b6e170d1..705c097f76f 100644 --- a/cl/cltypes/solid/validator_set.go +++ b/cl/cltypes/solid/validator_set.go @@ -4,12 +4,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 9e3debd19dc..b051e8350bb 100644 --- a/cl/cltypes/solid/validator_test.go +++ b/cl/cltypes/solid/validator_test.go @@ -4,7 +4,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 b5ff5fb6c70..704574b6e56 100644 --- a/cl/cltypes/sync_aggregator_selection_data.go +++ b/cl/cltypes/sync_aggregator_selection_data.go @@ -1,9 +1,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 c2eea4cbd81..7e24799c072 100644 --- a/cl/cltypes/validator.go +++ b/cl/cltypes/validator.go @@ -3,13 +3,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 db96632c84a..7eabef9834b 100644 --- a/cl/cltypes/validator_test.go +++ b/cl/cltypes/validator_test.go @@ -4,10 +4,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 c76b29c6738..c33df06f624 100644 --- a/cl/cltypes/withdrawal.go +++ b/cl/cltypes/withdrawal.go @@ -3,11 +3,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 b7aeb2adaba..870712fbc09 100644 --- a/cl/fork/fork.go +++ b/cl/fork/fork.go @@ -17,11 +17,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 6129e09d311..4e4ae723f43 100644 --- a/cl/merkle_tree/hasher.go +++ b/cl/merkle_tree/hasher.go @@ -3,8 +3,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 c039d1a5691..5b2c7feede4 100644 --- a/cl/merkle_tree/list.go +++ b/cl/merkle_tree/list.go @@ -5,11 +5,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 a1a8b1ad372..ca506cf1fbe 100644 --- a/cl/merkle_tree/merkle_root.go +++ b/cl/merkle_tree/merkle_root.go @@ -7,10 +7,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 c56ea8895bc..a10bf4bee54 100644 --- a/cl/merkle_tree/merkle_root_test.go +++ b/cl/merkle_tree/merkle_root_test.go @@ -4,11 +4,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 0384f4a64dc..433584a50ab 100644 --- a/cl/merkle_tree/primitives.go +++ b/cl/merkle_tree/primitives.go @@ -3,8 +3,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 8fdf2f3b5ac..ea5bcd13a95 100644 --- a/cl/persistence/base_encoding/primitives.go +++ b/cl/persistence/base_encoding/primitives.go @@ -3,7 +3,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 d559ead01ce..c60dc145d01 100644 --- a/cl/persistence/beacon_indicies/indicies.go +++ b/cl/persistence/beacon_indicies/indicies.go @@ -6,14 +6,14 @@ import ( "fmt" "sync" + 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" "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" _ "modernc.org/sqlite" ) diff --git a/cl/persistence/beacon_indicies/indicies_test.go b/cl/persistence/beacon_indicies/indicies_test.go index 3db10d48eca..89fa126f125 100644 --- a/cl/persistence/beacon_indicies/indicies_test.go +++ b/cl/persistence/beacon_indicies/indicies_test.go @@ -4,11 +4,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 49389e8a908..5ba242d7801 100644 --- a/cl/persistence/blob_storage/blob_db.go +++ b/cl/persistence/blob_storage/blob_db.go @@ -12,14 +12,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 85f5fcb10d8..65110c924bc 100644 --- a/cl/persistence/blob_storage/blob_db_test.go +++ b/cl/persistence/blob_storage/blob_db_test.go @@ -4,12 +4,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 ec4f69319c6..359d19b4c12 100644 --- a/cl/persistence/block_store.go +++ b/cl/persistence/block_store.go @@ -4,10 +4,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/db_config/db_config.go b/cl/persistence/db_config/db_config.go index 8845fa4a20a..9c0b791193e 100644 --- a/cl/persistence/db_config/db_config.go +++ b/cl/persistence/db_config/db_config.go @@ -5,8 +5,8 @@ import ( "context" "math" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/ethdb/cbor" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/ethdb/cbor" ) type DatabaseConfiguration struct{ PruneDepth uint64 } diff --git a/cl/persistence/db_config/db_config_test.go b/cl/persistence/db_config/db_config_test.go index 0133f4862a5..3dd9217e1ec 100644 --- a/cl/persistence/db_config/db_config_test.go +++ b/cl/persistence/db_config/db_config_test.go @@ -4,7 +4,7 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/memdb" "github.com/stretchr/testify/require" _ "modernc.org/sqlite" ) diff --git a/cl/persistence/format/snapshot_format/blocks.go b/cl/persistence/format/snapshot_format/blocks.go index 11f68d4b8e5..bcebe1c026d 100644 --- a/cl/persistence/format/snapshot_format/blocks.go +++ b/cl/persistence/format/snapshot_format/blocks.go @@ -6,11 +6,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 eae38978810..a840a51a75c 100644 --- a/cl/persistence/format/snapshot_format/blocks_test.go +++ b/cl/persistence/format/snapshot_format/blocks_test.go @@ -5,10 +5,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 60d6e92179d..68043973130 100644 --- a/cl/persistence/format/snapshot_format/getters/execution_snapshot.go +++ b/cl/persistence/format/snapshot_format/getters/execution_snapshot.go @@ -5,14 +5,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 cd806ecb3c6..4cadf67a4c6 100644 --- a/cl/persistence/format/snapshot_format/test_util.go +++ b/cl/persistence/format/snapshot_format/test_util.go @@ -1,9 +1,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 9ea885558f9..9e38d658a45 100644 --- a/cl/persistence/interface.go +++ b/cl/persistence/interface.go @@ -3,9 +3,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 6c620b9bd61..e2e0ab23695 100644 --- a/cl/persistence/state/epoch_data.go +++ b/cl/persistence/state/epoch_data.go @@ -4,10 +4,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 3a3e2effa18..aaa129179be 100644 --- a/cl/persistence/state/epoch_data_test.go +++ b/cl/persistence/state/epoch_data_test.go @@ -4,9 +4,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 971a2a14d59..a50747acd9e 100644 --- a/cl/persistence/state/historical_states_reader/attesting_indicies.go +++ b/cl/persistence/state/historical_states_reader/attesting_indicies.go @@ -3,14 +3,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 b5992db123f..5937971dda9 100644 --- a/cl/persistence/state/historical_states_reader/historical_states_reader.go +++ b/cl/persistence/state/historical_states_reader/historical_states_reader.go @@ -8,20 +8,20 @@ import ( "io" "sync" + "github.com/erigontech/erigon-lib/common" + "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/phase1/core/state/lru" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "github.com/klauspost/compress/zstd" - "github.com/ledgerwatch/erigon-lib/common" - "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/phase1/core/state/lru" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - libcommon "github.com/ledgerwatch/erigon-lib/common" + + libcommon "github.com/erigontech/erigon-lib/common" ) var buffersPool = sync.Pool{ 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 45ee00b52fb..2f451a839e2 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 @@ -4,17 +4,17 @@ import ( "context" "testing" - 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" "github.com/stretchr/testify/require" ) diff --git a/cl/persistence/state/slot_data.go b/cl/persistence/state/slot_data.go index 2184567f547..e0bb69ba7c5 100644 --- a/cl/persistence/state/slot_data.go +++ b/cl/persistence/state/slot_data.go @@ -5,10 +5,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 2c4090cd9c3..d0b0996ff5d 100644 --- a/cl/persistence/state/slot_data_test.go +++ b/cl/persistence/state/slot_data_test.go @@ -4,8 +4,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 87b407cc548..4e534994e1b 100644 --- a/cl/persistence/state/state_accessors.go +++ b/cl/persistence/state/state_accessors.go @@ -3,13 +3,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 e894ff17add..43944be8308 100644 --- a/cl/persistence/state/static_validator_table.go +++ b/cl/persistence/state/static_validator_table.go @@ -5,9 +5,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 37b7f38af39..2f154114082 100644 --- a/cl/persistence/state/static_validator_table_test.go +++ b/cl/persistence/state/static_validator_table_test.go @@ -4,8 +4,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 e1117b52459..224f0eff492 100644 --- a/cl/persistence/state/validator_events.go +++ b/cl/persistence/state/validator_events.go @@ -4,8 +4,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 b36be719f5a..6ab80abd989 100644 --- a/cl/persistence/state/validator_events_test.go +++ b/cl/persistence/state/validator_events_test.go @@ -3,8 +3,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 7c5c72092c5..ba2ef1ddf39 100644 --- a/cl/phase1/core/checkpoint.go +++ b/cl/phase1/core/checkpoint.go @@ -7,12 +7,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 9c5389f22c5..b937085ccd1 100644 --- a/cl/phase1/core/rawdb/config.go +++ b/cl/phase1/core/rawdb/config.go @@ -4,7 +4,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 7d08c683235..86f4307c1c8 100644 --- a/cl/phase1/core/state/accessors.go +++ b/cl/phase1/core/state/accessors.go @@ -5,14 +5,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 70e05d7bc7e..3c70eac77c1 100644 --- a/cl/phase1/core/state/cache.go +++ b/cl/phase1/core/state/cache.go @@ -6,15 +6,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 e72bcec31d0..2486a1b2a3a 100644 --- a/cl/phase1/core/state/cache_accessors.go +++ b/cl/phase1/core/state/cache_accessors.go @@ -6,15 +6,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 f6a1a7cc11c..f799e044464 100644 --- a/cl/phase1/core/state/cache_getters.go +++ b/cl/phase1/core/state/cache_getters.go @@ -1,7 +1,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 b5ee40db296..df7bcdba4da 100644 --- a/cl/phase1/core/state/cache_mutators.go +++ b/cl/phase1/core/state/cache_mutators.go @@ -3,10 +3,10 @@ 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/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon-lib/common/math" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" ) 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 d4c21813299..31faa125d09 100644 --- a/cl/phase1/core/state/cache_setters.go +++ b/cl/phase1/core/state/cache_setters.go @@ -1,6 +1,6 @@ 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 de4ecd63538..40561513c15 100644 --- a/cl/phase1/core/state/copy.go +++ b/cl/phase1/core/state/copy.go @@ -1,8 +1,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/interface.go b/cl/phase1/core/state/interface.go index eb1e14a3973..6d49d6e5141 100644 --- a/cl/phase1/core/state/interface.go +++ b/cl/phase1/core/state/interface.go @@ -1,6 +1,6 @@ package state -import libcommon "github.com/ledgerwatch/erigon-lib/common" +import libcommon "github.com/erigontech/erigon-lib/common" // BeaconStateReader is an interface for reading the beacon state. // diff --git a/cl/phase1/core/state/lru/lru.go b/cl/phase1/core/state/lru/lru.go index e1d25ba5a4c..e4fe2c7773c 100644 --- a/cl/phase1/core/state/lru/lru.go +++ b/cl/phase1/core/state/lru/lru.go @@ -4,9 +4,9 @@ import ( "fmt" "time" + "github.com/erigontech/erigon-lib/metrics" lru "github.com/hashicorp/golang-lru/v2" "github.com/hashicorp/golang-lru/v2/expirable" - "github.com/ledgerwatch/erigon-lib/metrics" ) // Cache is a wrapper around hashicorp lru but with metric for Get diff --git a/cl/phase1/core/state/mock_services/beacon_state_reader_mock.go b/cl/phase1/core/state/mock_services/beacon_state_reader_mock.go index 94875a81103..f899e7055c6 100644 --- a/cl/phase1/core/state/mock_services/beacon_state_reader_mock.go +++ b/cl/phase1/core/state/mock_services/beacon_state_reader_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/cl/phase1/core/state (interfaces: BeaconStateReader) +// Source: github.com/erigontech/erigon/cl/phase1/core/state (interfaces: BeaconStateReader) // // Generated by this command: // @@ -12,7 +12,7 @@ package mock_services import ( reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" + common "github.com/erigontech/erigon-lib/common" gomock "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/core/state/mutators.go b/cl/phase1/core/state/mutators.go index 2e82f0cf128..26192333e72 100644 --- a/cl/phase1/core/state/mutators.go +++ b/cl/phase1/core/state/mutators.go @@ -1,6 +1,6 @@ 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 6e0e3adac0f..eeed6e1ff44 100644 --- a/cl/phase1/core/state/mutators_test.go +++ b/cl/phase1/core/state/mutators_test.go @@ -3,10 +3,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 86aa9e5e75a..c0aa7a8852a 100644 --- a/cl/phase1/core/state/raw/copy.go +++ b/cl/phase1/core/state/raw/copy.go @@ -1,9 +1,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 ba63353d59f..e8d78b5e9a7 100644 --- a/cl/phase1/core/state/raw/events.go +++ b/cl/phase1/core/state/raw/events.go @@ -1,9 +1,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 d66a81b078c..f45500250ca 100644 --- a/cl/phase1/core/state/raw/getters.go +++ b/cl/phase1/core/state/raw/getters.go @@ -4,11 +4,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 819c653daac..1336c730924 100644 --- a/cl/phase1/core/state/raw/hashing.go +++ b/cl/phase1/core/state/raw/hashing.go @@ -3,11 +3,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 8ad541891df..8fea49cce3f 100644 --- a/cl/phase1/core/state/raw/misc_test.go +++ b/cl/phase1/core/state/raw/misc_test.go @@ -4,7 +4,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 5abb514333f..6f89bc4e548 100644 --- a/cl/phase1/core/state/raw/setters.go +++ b/cl/phase1/core/state/raw/setters.go @@ -1,10 +1,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 166e5d10ce6..49fc56a14c6 100644 --- a/cl/phase1/core/state/raw/setters_test.go +++ b/cl/phase1/core/state/raw/setters_test.go @@ -3,10 +3,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 17e03a0b70a..c4ddd32666d 100644 --- a/cl/phase1/core/state/raw/ssz.go +++ b/cl/phase1/core/state/raw/ssz.go @@ -3,13 +3,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 7e5ec23d3ce..7e074b0ddca 100644 --- a/cl/phase1/core/state/raw/state.go +++ b/cl/phase1/core/state/raw/state.go @@ -5,10 +5,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 dd3746a42b9..0f6556aec14 100644 --- a/cl/phase1/core/state/raw/test_util.go +++ b/cl/phase1/core/state/raw/test_util.go @@ -3,8 +3,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 368404a8fd7..fd370b7815a 100644 --- a/cl/phase1/core/state/root_test.go +++ b/cl/phase1/core/state/root_test.go @@ -3,8 +3,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 ed7d7322d80..9dbed324d87 100644 --- a/cl/phase1/core/state/shuffling/shuffling.go +++ b/cl/phase1/core/state/shuffling/shuffling.go @@ -4,9 +4,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 a664e929095..2b99a478478 100644 --- a/cl/phase1/core/state/shuffling/shuffling_test.go +++ b/cl/phase1/core/state/shuffling/shuffling_test.go @@ -4,15 +4,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 034db5092e4..a64e1ba922f 100644 --- a/cl/phase1/core/state/shuffling/util.go +++ b/cl/phase1/core/state/shuffling/util.go @@ -4,11 +4,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 057666abfa9..c232f3b05a7 100644 --- a/cl/phase1/core/state/ssz.go +++ b/cl/phase1/core/state/ssz.go @@ -1,8 +1,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 1bfffa37173..c5da12256da 100644 --- a/cl/phase1/core/state/ssz_test.go +++ b/cl/phase1/core/state/ssz_test.go @@ -5,10 +5,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 e7f4cae9589..7848604ad72 100644 --- a/cl/phase1/core/state/upgrade.go +++ b/cl/phase1/core/state/upgrade.go @@ -1,11 +1,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 560a3e18ef7..a09b5569894 100644 --- a/cl/phase1/core/state/upgrade_test.go +++ b/cl/phase1/core/state/upgrade_test.go @@ -4,8 +4,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 9a6c684a863..51fd4e38034 100644 --- a/cl/phase1/core/state/util.go +++ b/cl/phase1/core/state/util.go @@ -3,12 +3,12 @@ package state import ( "sort" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/phase1/core/state/lru" - "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" ) 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 8a1ac83e6c3..3aa369868ad 100644 --- a/cl/phase1/core/state/utils_test.go +++ b/cl/phase1/core/state/utils_test.go @@ -4,10 +4,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 4eff3fddf40..42b90869dd4 100644 --- a/cl/phase1/execution_client/block_collector/block_collector.go +++ b/cl/phase1/execution_client/block_collector/block_collector.go @@ -5,17 +5,17 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "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" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/memdb" + "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 0c382ae8286..b22570a8942 100644 --- a/cl/phase1/execution_client/block_collector/block_collector_test.go +++ b/cl/phase1/execution_client/block_collector/block_collector_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "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" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" ) diff --git a/cl/phase1/execution_client/execution_client_direct.go b/cl/phase1/execution_client/execution_client_direct.go index 389442d59cd..06352b11b29 100644 --- a/cl/phase1/execution_client/execution_client_direct.go +++ b/cl/phase1/execution_client/execution_client_direct.go @@ -6,12 +6,12 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "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 1e219b8cee9..36674c8a0a2 100644 --- a/cl/phase1/execution_client/execution_client_rpc.go +++ b/cl/phase1/execution_client/execution_client_rpc.go @@ -8,17 +8,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 cb4171aab9e..a7b7396783e 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 61a87c8be67..dc0cb231cec 100644 --- a/cl/phase1/execution_client/interface.go +++ b/cl/phase1/execution_client/interface.go @@ -4,11 +4,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/forkchoice/blob_sidecars.go b/cl/phase1/forkchoice/blob_sidecars.go index 3570872ff12..767c9aa846a 100644 --- a/cl/phase1/forkchoice/blob_sidecars.go +++ b/cl/phase1/forkchoice/blob_sidecars.go @@ -1,7 +1,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 ffd6986fe83..f202b849cc3 100644 --- a/cl/phase1/forkchoice/checkpoint_state.go +++ b/cl/phase1/forkchoice/checkpoint_state.go @@ -3,16 +3,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 61fc786bd3e..acd6b781ebd 100644 --- a/cl/phase1/forkchoice/fork_choice_test.go +++ b/cl/phase1/forkchoice/fork_choice_test.go @@ -9,24 +9,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 8d1f84eda76..f0af5b87fd4 100644 --- a/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage.go +++ b/cl/phase1/forkchoice/fork_graph/diff_storage/diff_storage.go @@ -6,7 +6,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 305765439de..af1d6943433 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 @@ -4,9 +4,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 d38524b6451..de00bfa4168 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph_disk.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph_disk.go @@ -7,19 +7,19 @@ import ( "sync" "sync/atomic" + 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" "github.com/klauspost/compress/zstd" - 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" "github.com/spf13/afero" ) 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 72a9eabfc82..21b25a0ccde 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph_disk_fs.go @@ -7,10 +7,10 @@ import ( "io" "os" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/phase1/core/state" "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" ) diff --git a/cl/phase1/forkchoice/fork_graph/fork_graph_test.go b/cl/phase1/forkchoice/fork_graph/fork_graph_test.go index 442c814b890..05093166307 100644 --- a/cl/phase1/forkchoice/fork_graph/fork_graph_test.go +++ b/cl/phase1/forkchoice/fork_graph/fork_graph_test.go @@ -4,13 +4,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 5b22c1f231b..aa5b30b55b9 100644 --- a/cl/phase1/forkchoice/fork_graph/interface.go +++ b/cl/phase1/forkchoice/fork_graph/interface.go @@ -1,11 +1,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 933ef73f0d8..400bec6930f 100644 --- a/cl/phase1/forkchoice/forkchoice.go +++ b/cl/phase1/forkchoice/forkchoice.go @@ -6,24 +6,24 @@ 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/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/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 7d5d5aa1d24..f15ab709b51 100644 --- a/cl/phase1/forkchoice/get_head.go +++ b/cl/phase1/forkchoice/get_head.go @@ -5,9 +5,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 e24af7990ff..c996a94cdba 100644 --- a/cl/phase1/forkchoice/interface.go +++ b/cl/phase1/forkchoice/interface.go @@ -3,13 +3,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 ea37ada97eb..6d5a3d9bf95 100644 --- a/cl/phase1/forkchoice/mock_services/forkchoice_mock.go +++ b/cl/phase1/forkchoice/mock_services/forkchoice_mock.go @@ -6,17 +6,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 4056e8c11cb..e92e7e9c943 100644 --- a/cl/phase1/forkchoice/on_attestation.go +++ b/cl/phase1/forkchoice/on_attestation.go @@ -3,10 +3,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 af701d7f918..7fa9444292b 100644 --- a/cl/phase1/forkchoice/on_attester_slashing.go +++ b/cl/phase1/forkchoice/on_attester_slashing.go @@ -4,12 +4,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 0d30c4e29ba..cbac2086656 100644 --- a/cl/phase1/forkchoice/on_block.go +++ b/cl/phase1/forkchoice/on_block.go @@ -6,20 +6,20 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/core/state" - "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-lib/log/v3" + + "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/core/state" + "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 ea11fc22c2d..38e9e959f70 100644 --- a/cl/phase1/forkchoice/on_tick.go +++ b/cl/phase1/forkchoice/on_tick.go @@ -1,8 +1,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/utils.go b/cl/phase1/forkchoice/utils.go index c1ca3772ed0..736017facc2 100644 --- a/cl/phase1/forkchoice/utils.go +++ b/cl/phase1/forkchoice/utils.go @@ -3,12 +3,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 2c8a4a4c6c2..bbb678db09d 100644 --- a/cl/phase1/network/backward_beacon_downloader.go +++ b/cl/phase1/network/backward_beacon_downloader.go @@ -5,17 +5,17 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/net/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/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 0edd6ec4b63..c045160352c 100644 --- a/cl/phase1/network/beacon_downloader.go +++ b/cl/phase1/network/beacon_downloader.go @@ -5,11 +5,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 8d6f5b6d6f3..ae6647839c4 100644 --- a/cl/phase1/network/blobs.go +++ b/cl/phase1/network/blobs.go @@ -4,11 +4,11 @@ import ( "sync/atomic" "time" - "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" "golang.org/x/net/context" ) diff --git a/cl/phase1/network/gossip_manager.go b/cl/phase1/network/gossip_manager.go index 90639e44bf8..e583de6106b 100644 --- a/cl/phase1/network/gossip_manager.go +++ b/cl/phase1/network/gossip_manager.go @@ -7,22 +7,22 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon/cl/beacon/beaconevents" - "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" + "github.com/erigontech/erigon/cl/beacon/beaconevents" + "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" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/types/ssz" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/clparams" ) // 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 445444b3dcc..d70b6306a78 100644 --- a/cl/phase1/network/services/aggregate_and_proof_service.go +++ b/cl/phase1/network/services/aggregate_and_proof_service.go @@ -8,17 +8,17 @@ import ( "time" "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 2b1c02270f4..f70aae4b6c8 100644 --- a/cl/phase1/network/services/aggregate_and_proof_service_test.go +++ b/cl/phase1/network/services/aggregate_and_proof_service_test.go @@ -7,16 +7,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 87afc7f855a..9394b9c6bc9 100644 --- a/cl/phase1/network/services/attestation_service.go +++ b/cl/phase1/network/services/attestation_service.go @@ -8,17 +8,17 @@ import ( "time" "github.com/Giulio2002/bls" - "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/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" ) var ( diff --git a/cl/phase1/network/services/attestation_service_test.go b/cl/phase1/network/services/attestation_service_test.go index 18428bf79ec..debd6cf7829 100644 --- a/cl/phase1/network/services/attestation_service_test.go +++ b/cl/phase1/network/services/attestation_service_test.go @@ -8,17 +8,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" - 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/core/state" - mockState "github.com/ledgerwatch/erigon/cl/phase1/core/state/mock_services" - "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" + 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/core/state" + mockState "github.com/erigontech/erigon/cl/phase1/core/state/mock_services" + "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 4c0f7b30ab1..ca3199c145d 100644 --- a/cl/phase1/network/services/blob_sidecar_service.go +++ b/cl/phase1/network/services/blob_sidecar_service.go @@ -8,16 +8,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 e2768e1ee96..fd806cb25f7 100644 --- a/cl/phase1/network/services/blob_sidecar_service_test.go +++ b/cl/phase1/network/services/blob_sidecar_service_test.go @@ -8,15 +8,15 @@ 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/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/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 573474d9bc4..92350f7fbb6 100644 --- a/cl/phase1/network/services/block_service.go +++ b/cl/phase1/network/services/block_service.go @@ -6,19 +6,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 402912ecb05..6d9511097da 100644 --- a/cl/phase1/network/services/block_service_test.go +++ b/cl/phase1/network/services/block_service_test.go @@ -7,14 +7,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 0f9ba191946..c8fc012592b 100644 --- a/cl/phase1/network/services/bls_to_execution_change_service.go +++ b/cl/phase1/network/services/bls_to_execution_change_service.go @@ -6,14 +6,14 @@ import ( "fmt" "github.com/Giulio2002/bls" - 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/interface.go b/cl/phase1/network/services/interface.go index 62be577b940..a7f1cee31ed 100644 --- a/cl/phase1/network/services/interface.go +++ b/cl/phase1/network/services/interface.go @@ -3,8 +3,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 cfbf36d7525..dec0b59c06f 100644 --- a/cl/phase1/network/services/proposer_slashing_service.go +++ b/cl/phase1/network/services/proposer_slashing_service.go @@ -5,14 +5,14 @@ import ( "fmt" "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/fork" - 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" + "github.com/erigontech/erigon/cl/fork" + 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/sync_committee_messages_service.go b/cl/phase1/network/services/sync_committee_messages_service.go index b1f68e74987..efd02351e01 100644 --- a/cl/phase1/network/services/sync_committee_messages_service.go +++ b/cl/phase1/network/services/sync_committee_messages_service.go @@ -9,14 +9,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 15d99c5e68e..ca397bc3195 100644 --- a/cl/phase1/network/services/sync_committee_messages_service_test.go +++ b/cl/phase1/network/services/sync_committee_messages_service_test.go @@ -4,13 +4,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 0f37daf9924..f03035e4226 100644 --- a/cl/phase1/network/services/sync_contribution_service.go +++ b/cl/phase1/network/services/sync_contribution_service.go @@ -11,18 +11,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 898ba590630..42a19957d9f 100644 --- a/cl/phase1/network/services/sync_contribution_service_test.go +++ b/cl/phase1/network/services/sync_contribution_service_test.go @@ -4,15 +4,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 925ed88e447..cdde70ffe64 100644 --- a/cl/phase1/network/services/voluntary_exit_service.go +++ b/cl/phase1/network/services/voluntary_exit_service.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/Giulio2002/bls" - "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/subnets/subnets.go b/cl/phase1/network/subnets/subnets.go index 1fba86c09ee..6b8bb083108 100644 --- a/cl/phase1/network/subnets/subnets.go +++ b/cl/phase1/network/subnets/subnets.go @@ -1,8 +1,8 @@ package subnets 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" ) // 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 cdb41d65474..ce5f9215a9c 100644 --- a/cl/phase1/stages/clstages.go +++ b/cl/phase1/stages/clstages.go @@ -10,34 +10,34 @@ 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" - "github.com/ledgerwatch/erigon/cl/persistence/db_config" - 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" + "github.com/erigontech/erigon/cl/persistence/db_config" + 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 92e4dd12cd5..9886dd2cafa 100644 --- a/cl/phase1/stages/stage_history_download.go +++ b/cl/phase1/stages/stage_history_download.go @@ -7,21 +7,21 @@ 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/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-lib/log/v3" - - "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/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-lib/log/v3" + + "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 32b0725d085..9a3c96a9319 100644 --- a/cl/pool/operation_pool.go +++ b/cl/pool/operation_pool.go @@ -4,7 +4,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 0cb4da68a0f..0b3411748b7 100644 --- a/cl/pool/operations_pool.go +++ b/cl/pool/operations_pool.go @@ -1,11 +1,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 865df13df65..6cc8eb7bc7b 100644 --- a/cl/pool/operations_pool_test.go +++ b/cl/pool/operations_pool_test.go @@ -3,9 +3,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 2f996a560e4..cb16ecc90a9 100644 --- a/cl/rpc/rpc.go +++ b/cl/rpc/rpc.go @@ -8,22 +8,22 @@ 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" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon-lib/log/v3" "github.com/golang/snappy" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "github.com/ledgerwatch/erigon-lib/log/v3" "go.uber.org/zap/buffer" - "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 5c489e3d755..a690f3fc43c 100644 --- a/cl/sentinel/communication/ssz_snappy/encoding.go +++ b/cl/sentinel/communication/ssz_snappy/encoding.go @@ -22,10 +22,10 @@ import ( "sync" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/types/ssz" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils/eth_clock" "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" ) var writerPool = sync.Pool{ diff --git a/cl/sentinel/config.go b/cl/sentinel/config.go index 7418b48c91f..2ff36504d74 100644 --- a/cl/sentinel/config.go +++ b/cl/sentinel/config.go @@ -18,8 +18,8 @@ import ( "fmt" "net" - "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" "github.com/libp2p/go-libp2p" mplex "github.com/libp2p/go-libp2p-mplex" "github.com/libp2p/go-libp2p/core/crypto" diff --git a/cl/sentinel/discovery.go b/cl/sentinel/discovery.go index 70cb7a7dc9e..8931d04c307 100644 --- a/cl/sentinel/discovery.go +++ b/cl/sentinel/discovery.go @@ -5,10 +5,10 @@ import ( "fmt" "time" - "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" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" diff --git a/cl/sentinel/gossip.go b/cl/sentinel/gossip.go index bd15f94aa51..7399936b613 100644 --- a/cl/sentinel/gossip.go +++ b/cl/sentinel/gossip.go @@ -20,9 +20,9 @@ import ( "sync/atomic" "time" - "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" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/peer" ) diff --git a/cl/sentinel/handlers/blobs.go b/cl/sentinel/handlers/blobs.go index 989e80b5443..b667b88178d 100644 --- a/cl/sentinel/handlers/blobs.go +++ b/cl/sentinel/handlers/blobs.go @@ -1,13 +1,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 d0feb663422..5928d9a4d82 100644 --- a/cl/sentinel/handlers/blobs_test.go +++ b/cl/sentinel/handlers/blobs_test.go @@ -16,20 +16,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 1a1e1b18ede..cde2251a553 100644 --- a/cl/sentinel/handlers/blocks.go +++ b/cl/sentinel/handlers/blocks.go @@ -14,12 +14,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 6c53b598e07..257ceee2669 100644 --- a/cl/sentinel/handlers/blocks_by_range_test.go +++ b/cl/sentinel/handlers/blocks_by_range_test.go @@ -14,15 +14,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 43c99e817c4..408dd2c09bc 100644 --- a/cl/sentinel/handlers/blocks_by_root_test.go +++ b/cl/sentinel/handlers/blocks_by_root_test.go @@ -14,17 +14,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 8fb633ed3e3..ed0042939e0 100644 --- a/cl/sentinel/handlers/handlers.go +++ b/cl/sentinel/handlers/handlers.go @@ -21,20 +21,20 @@ import ( "sync" "time" - "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" "golang.org/x/time/rate" - "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" "github.com/libp2p/go-libp2p/core/host" "github.com/libp2p/go-libp2p/core/network" "github.com/libp2p/go-libp2p/core/protocol" diff --git a/cl/sentinel/handlers/heartbeats.go b/cl/sentinel/handlers/heartbeats.go index ad7a7c9656a..e739cd88917 100644 --- a/cl/sentinel/handlers/heartbeats.go +++ b/cl/sentinel/handlers/heartbeats.go @@ -14,11 +14,11 @@ package handlers import ( - "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" "github.com/libp2p/go-libp2p/core/network" ) diff --git a/cl/sentinel/handlers/heartbeats_test.go b/cl/sentinel/handlers/heartbeats_test.go index 7abf8fae6a7..34cb3e5a896 100644 --- a/cl/sentinel/handlers/heartbeats_test.go +++ b/cl/sentinel/handlers/heartbeats_test.go @@ -6,23 +6,23 @@ import ( "crypto/ecdsa" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/protocol" "github.com/stretchr/testify/require" - 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" + 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 5662883659e..d4aecc34ef0 100644 --- a/cl/sentinel/handlers/light_client.go +++ b/cl/sentinel/handlers/light_client.go @@ -1,10 +1,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 6ffcf412897..74e465ce225 100644 --- a/cl/sentinel/handlers/light_client_test.go +++ b/cl/sentinel/handlers/light_client_test.go @@ -14,16 +14,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 26c5d1dd283..183ae1ed009 100644 --- a/cl/sentinel/handlers/utils_test.go +++ b/cl/sentinel/handlers/utils_test.go @@ -4,15 +4,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 d3eb5e57f2d..0caa6cccd53 100644 --- a/cl/sentinel/handshake/handshake.go +++ b/cl/sentinel/handshake/handshake.go @@ -8,13 +8,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 572b8ea69dc..c96f62a000a 100644 --- a/cl/sentinel/msg_id.go +++ b/cl/sentinel/msg_id.go @@ -1,7 +1,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 eb4f3223501..9f7ea71f7c0 100644 --- a/cl/sentinel/msg_id_test.go +++ b/cl/sentinel/msg_id_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/cl/utils" "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" ) diff --git a/cl/sentinel/peers/pool.go b/cl/sentinel/peers/pool.go index ac1ef0ee7ca..94e579ec0d1 100644 --- a/cl/sentinel/peers/pool.go +++ b/cl/sentinel/peers/pool.go @@ -5,7 +5,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 62b06060b0d..62b237a2b66 100644 --- a/cl/sentinel/sentinel.go +++ b/cl/sentinel/sentinel.go @@ -22,24 +22,24 @@ import ( "sync" "time" + "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/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/go-chi/chi/v5" - "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/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" - - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "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/sentinel" + "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" "github.com/libp2p/go-libp2p" pubsub "github.com/libp2p/go-libp2p-pubsub" "github.com/libp2p/go-libp2p/core/host" diff --git a/cl/sentinel/sentinel_gossip_test.go b/cl/sentinel/sentinel_gossip_test.go index 750178281b2..73f5c889e93 100644 --- a/cl/sentinel/sentinel_gossip_test.go +++ b/cl/sentinel/sentinel_gossip_test.go @@ -6,14 +6,14 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/libp2p/go-libp2p/core/peer" "github.com/stretchr/testify/require" - "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 bbebcff2ee8..5442e721f21 100644 --- a/cl/sentinel/sentinel_requests_test.go +++ b/cl/sentinel/sentinel_requests_test.go @@ -7,28 +7,28 @@ import ( "io" "testing" + "github.com/erigontech/erigon-lib/log/v3" "github.com/golang/snappy" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p/core/peer" "github.com/libp2p/go-libp2p/core/protocol" "github.com/spf13/afero" "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/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/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 c47c19ccaf1..98606e76a22 100644 --- a/cl/sentinel/service/service.go +++ b/cl/sentinel/service/service.go @@ -13,16 +13,16 @@ import ( "time" "unicode" - "github.com/ledgerwatch/erigon/cl/gossip" - "github.com/ledgerwatch/erigon/cl/sentinel" - "github.com/ledgerwatch/erigon/cl/sentinel/httpreqresp" - - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/gossip" + "github.com/erigontech/erigon/cl/sentinel" + "github.com/erigontech/erigon/cl/sentinel/httpreqresp" + + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/gointerfaces" + sentinelrpc "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/utils" "github.com/libp2p/go-libp2p/core/peer" ) diff --git a/cl/sentinel/service/start.go b/cl/sentinel/service/start.go index 14736bed0c7..e07c8a6a37a 100644 --- a/cl/sentinel/service/start.go +++ b/cl/sentinel/service/start.go @@ -7,19 +7,19 @@ 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" - "github.com/ledgerwatch/erigon-lib/direct" - sentinelrpc "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "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/sentinel" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/cltypes" "google.golang.org/grpc" "google.golang.org/grpc/credentials" ) diff --git a/cl/sentinel/utils.go b/cl/sentinel/utils.go index c1594b15266..21f0ea5f947 100644 --- a/cl/sentinel/utils.go +++ b/cl/sentinel/utils.go @@ -20,11 +20,11 @@ import ( "time" "github.com/btcsuite/btcd/btcec/v2" - "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" "github.com/libp2p/go-libp2p/core/crypto" "github.com/libp2p/go-libp2p/core/peer" "github.com/multiformats/go-multiaddr" diff --git a/cl/spectest/consensus_tests/appendix.go b/cl/spectest/consensus_tests/appendix.go index 25e6d1c7a0f..23189b26135 100644 --- a/cl/spectest/consensus_tests/appendix.go +++ b/cl/spectest/consensus_tests/appendix.go @@ -1,11 +1,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 2c1e6247fee..d4bceddfbd0 100644 --- a/cl/spectest/consensus_tests/bls.go +++ b/cl/spectest/consensus_tests/bls.go @@ -1,7 +1,7 @@ package consensus_tests import ( - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" "io/fs" "testing" ) diff --git a/cl/spectest/consensus_tests/eip4844_proofs.go b/cl/spectest/consensus_tests/eip4844_proofs.go index 35a7c981eb9..0f5963f317e 100644 --- a/cl/spectest/consensus_tests/eip4844_proofs.go +++ b/cl/spectest/consensus_tests/eip4844_proofs.go @@ -4,12 +4,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 8fea8841bbd..e6a65d6ec1b 100644 --- a/cl/spectest/consensus_tests/epoch_processing.go +++ b/cl/spectest/consensus_tests/epoch_processing.go @@ -5,12 +5,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 9a1de019a58..716cbaca160 100644 --- a/cl/spectest/consensus_tests/finality.go +++ b/cl/spectest/consensus_tests/finality.go @@ -5,8 +5,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 96644a01ed1..6b2cf081ef2 100644 --- a/cl/spectest/consensus_tests/fork_choice.go +++ b/cl/spectest/consensus_tests/fork_choice.go @@ -7,31 +7,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 39d97f98165..fdbaefc1259 100644 --- a/cl/spectest/consensus_tests/forks.go +++ b/cl/spectest/consensus_tests/forks.go @@ -2,12 +2,12 @@ package consensus_tests import ( "fmt" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" "io/fs" "os" "testing" - "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 370d7fe7948..2e9952e21c0 100644 --- a/cl/spectest/consensus_tests/light_client.go +++ b/cl/spectest/consensus_tests/light_client.go @@ -4,11 +4,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 f2de0d6a784..20794243548 100644 --- a/cl/spectest/consensus_tests/operations.go +++ b/cl/spectest/consensus_tests/operations.go @@ -2,15 +2,15 @@ package consensus_tests import ( "fmt" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/spectest" "io/fs" "os" "testing" - "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 862ac65eb15..c3caff8a623 100644 --- a/cl/spectest/consensus_tests/rewards.go +++ b/cl/spectest/consensus_tests/rewards.go @@ -4,7 +4,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 85f5d0c3b8b..9cd79ab111f 100644 --- a/cl/spectest/consensus_tests/sanity.go +++ b/cl/spectest/consensus_tests/sanity.go @@ -5,10 +5,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 b7a0a9338b0..cd5ca72cea8 100644 --- a/cl/spectest/consensus_tests/shuffling.go +++ b/cl/spectest/consensus_tests/shuffling.go @@ -4,14 +4,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 6a24727a9a1..ea999ea425d 100644 --- a/cl/spectest/consensus_tests/ssz_static.go +++ b/cl/spectest/consensus_tests/ssz_static.go @@ -6,19 +6,19 @@ 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/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/persistence/format/snapshot_format" - "github.com/ledgerwatch/erigon/cl/phase1/core/state" + "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/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 8a6ac6cac78..849ace3f68d 100644 --- a/cl/spectest/consensus_tests/transition.go +++ b/cl/spectest/consensus_tests/transition.go @@ -2,13 +2,13 @@ package consensus_tests import ( "fmt" - "github.com/ledgerwatch/erigon/cl/transition/machine" - "github.com/ledgerwatch/erigon/spectest" + "github.com/erigontech/erigon/cl/transition/machine" + "github.com/erigontech/erigon/spectest" "io/fs" "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/assert" "github.com/stretchr/testify/require" ) diff --git a/cl/spectest/tests_test.go b/cl/spectest/tests_test.go index a556ae7b03e..aef58b13709 100644 --- a/cl/spectest/tests_test.go +++ b/cl/spectest/tests_test.go @@ -4,11 +4,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 1308081adf7..624778ad401 100644 --- a/cl/ssz/decode.go +++ b/cl/ssz/decode.go @@ -5,7 +5,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 38b57a8a11c..460b8222017 100644 --- a/cl/ssz/encode.go +++ b/cl/ssz/encode.go @@ -4,7 +4,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 19f53c699e5..8cc6ea4ab20 100644 --- a/cl/ssz/ssz_test.go +++ b/cl/ssz/ssz_test.go @@ -4,10 +4,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 bb5d6f06185..ced53e75895 100644 --- a/cl/transition/compat.go +++ b/cl/transition/compat.go @@ -1,11 +1,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 4a5ac87a878..5a330b11ecf 100644 --- a/cl/transition/impl/eth2/block_processing_test.go +++ b/cl/transition/impl/eth2/block_processing_test.go @@ -6,11 +6,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 9fc7490c94e..16a93d62564 100644 --- a/cl/transition/impl/eth2/impl.go +++ b/cl/transition/impl/eth2/impl.go @@ -1,6 +1,6 @@ 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 33e6c667968..6402f26bbf1 100644 --- a/cl/transition/impl/eth2/operations.go +++ b/cl/transition/impl/eth2/operations.go @@ -7,23 +7,23 @@ 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 b590ebd69e0..11c83314430 100644 --- a/cl/transition/impl/eth2/statechange/finalization_and_justification.go +++ b/cl/transition/impl/eth2/statechange/finalization_and_justification.go @@ -1,11 +1,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 162707c1fc0..5ebeee6944d 100644 --- a/cl/transition/impl/eth2/statechange/process_effective_balance_update.go +++ b/cl/transition/impl/eth2/statechange/process_effective_balance_update.go @@ -1,9 +1,9 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes/solid" + "github.com/erigontech/erigon/cl/utils" ) // 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 f42c5a1263d..769975018f9 100644 --- a/cl/transition/impl/eth2/statechange/process_epoch.go +++ b/cl/transition/impl/eth2/statechange/process_epoch.go @@ -1,10 +1,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 98970ce9985..4f13d4c1312 100644 --- a/cl/transition/impl/eth2/statechange/process_epoch_test.go +++ b/cl/transition/impl/eth2/statechange/process_epoch_test.go @@ -4,11 +4,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 71700c8a279..22ad4169531 100644 --- a/cl/transition/impl/eth2/statechange/process_historical_roots.go +++ b/cl/transition/impl/eth2/statechange/process_historical_roots.go @@ -1,8 +1,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 0f48fe6bee0..dd0c7fb9e2c 100644 --- a/cl/transition/impl/eth2/statechange/process_historical_roots_update.go +++ b/cl/transition/impl/eth2/statechange/process_historical_roots_update.go @@ -1,11 +1,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 bc81c5de789..d45d6b6ba72 100644 --- a/cl/transition/impl/eth2/statechange/process_inactivity_scores.go +++ b/cl/transition/impl/eth2/statechange/process_inactivity_scores.go @@ -1,9 +1,9 @@ package statechange import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "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/phase1/core/state" + "github.com/erigontech/erigon/cl/utils" ) // 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 ee56a2f0ed2..92b5d7ce9ce 100644 --- a/cl/transition/impl/eth2/statechange/process_registry_updates.go +++ b/cl/transition/impl/eth2/statechange/process_registry_updates.go @@ -3,12 +3,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 63788a2ec8b..4530209e205 100644 --- a/cl/transition/impl/eth2/statechange/process_rewards_and_penalties.go +++ b/cl/transition/impl/eth2/statechange/process_rewards_and_penalties.go @@ -1,10 +1,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 745994ceada..fccb3fe2845 100644 --- a/cl/transition/impl/eth2/statechange/process_slashings.go +++ b/cl/transition/impl/eth2/statechange/process_slashings.go @@ -1,10 +1,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 b1d38bb60c8..9781aa44e65 100644 --- a/cl/transition/impl/eth2/statechange/process_sync_committee_update.go +++ b/cl/transition/impl/eth2/statechange/process_sync_committee_update.go @@ -1,8 +1,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 79f646e1c19..eca7ecc351b 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 @@ -2,13 +2,13 @@ package statechange_test import ( "encoding/binary" - "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" "testing" - "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 de2d1861ae6..e44f597813d 100644 --- a/cl/transition/impl/eth2/statechange/resets.go +++ b/cl/transition/impl/eth2/statechange/resets.go @@ -1,8 +1,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 88ebbb6f9fd..9acecf6acf2 100644 --- a/cl/transition/impl/eth2/utils.go +++ b/cl/transition/impl/eth2/utils.go @@ -3,10 +3,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 7153a1f1c11..7ae51ab53b1 100644 --- a/cl/transition/impl/eth2/validation.go +++ b/cl/transition/impl/eth2/validation.go @@ -4,10 +4,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 9dfad4b82af..8b0535c39e8 100644 --- a/cl/transition/impl/funcmap/impl.go +++ b/cl/transition/impl/funcmap/impl.go @@ -1,10 +1,10 @@ package funcmap import ( - "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/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 89593f6e614..57807014c5f 100644 --- a/cl/transition/machine/block.go +++ b/cl/transition/machine/block.go @@ -4,12 +4,12 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon/cl/abstract" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon/cl/abstract" - "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 b3a45c36c2b..542b29f01d2 100644 --- a/cl/transition/machine/helpers.go +++ b/cl/transition/machine/helpers.go @@ -1,10 +1,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/phase1/core/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cl/abstract" + "github.com/erigontech/erigon/cl/cltypes" + "github.com/erigontech/erigon/cl/phase1/core/state" ) func executionEnabled(s abstract.BeaconState, payload *cltypes.Eth1Block) bool { diff --git a/cl/transition/machine/machine.go b/cl/transition/machine/machine.go index 509235212a4..32c5e1f15d8 100644 --- a/cl/transition/machine/machine.go +++ b/cl/transition/machine/machine.go @@ -2,9 +2,9 @@ package machine import ( - "github.com/ledgerwatch/erigon/cl/abstract" - "github.com/ledgerwatch/erigon/cl/cltypes" - "github.com/ledgerwatch/erigon/cl/cltypes/solid" + "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 89462cccbf6..ab4d9141723 100644 --- a/cl/transition/machine/transition.go +++ b/cl/transition/machine/transition.go @@ -1,8 +1,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 ead272c215f..43eb5b7fcf3 100644 --- a/cl/utils/blob.go +++ b/cl/utils/blob.go @@ -1,7 +1,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 9284df09f93..72b06c9015b 100644 --- a/cl/utils/bytes.go +++ b/cl/utils/bytes.go @@ -17,7 +17,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 2978c78d20e..7caabe8d46c 100644 --- a/cl/utils/bytes_test.go +++ b/cl/utils/bytes_test.go @@ -3,10 +3,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 ec9b80681a3..35203402510 100644 --- a/cl/utils/crypto_test.go +++ b/cl/utils/crypto_test.go @@ -3,7 +3,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 eaf5aca5e5c..0ade6aeea38 100644 --- a/cl/utils/eth_clock/ethereum_clock.go +++ b/cl/utils/eth_clock/ethereum_clock.go @@ -5,9 +5,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 47c8e4e869a..a003cf81ec4 100644 --- a/cl/utils/eth_clock/ethereum_clock_test.go +++ b/cl/utils/eth_clock/ethereum_clock_test.go @@ -3,8 +3,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 6b4a801ed9e..e928961353f 100644 --- a/cl/utils/math_test.go +++ b/cl/utils/math_test.go @@ -4,7 +4,7 @@ import ( "math" "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 a1d667975d9..16558bde251 100644 --- a/cl/utils/merkle.go +++ b/cl/utils/merkle.go @@ -1,7 +1,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 b87f72c9fd9..1b2d4e10aa5 100644 --- a/cl/validator/attestation_producer/attestation_producer.go +++ b/cl/validator/attestation_producer/attestation_producer.go @@ -3,13 +3,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 f61b03af517..6faa0c57ac8 100644 --- a/cl/validator/attestation_producer/attestation_producer_test.go +++ b/cl/validator/attestation_producer/attestation_producer_test.go @@ -3,9 +3,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 09415fc39d3..410489d42d6 100644 --- a/cl/validator/attestation_producer/interface.go +++ b/cl/validator/attestation_producer/interface.go @@ -1,8 +1,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 1bee4b05cbe..d943943dc54 100644 --- a/cl/validator/committee_subscription/committee_subscription.go +++ b/cl/validator/committee_subscription/committee_subscription.go @@ -6,17 +6,17 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - "github.com/ledgerwatch/erigon-lib/kv" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon-lib/kv" + "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 43ffac4074a..66653f75697 100644 --- a/cl/validator/committee_subscription/interface.go +++ b/cl/validator/committee_subscription/interface.go @@ -3,8 +3,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 db021b333db..0e15ac4598f 100644 --- a/cl/validator/sync_contribution_pool/interface.go +++ b/cl/validator/sync_contribution_pool/interface.go @@ -1,9 +1,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 e3e59f13eb6..4b8734244cd 100644 --- a/cl/validator/sync_contribution_pool/sync_contribution_pool.go +++ b/cl/validator/sync_contribution_pool/sync_contribution_pool.go @@ -6,12 +6,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 7def33ed56c..b48bf343ac8 100644 --- a/cl/validator/sync_contribution_pool/sync_contribution_pool_test.go +++ b/cl/validator/sync_contribution_pool/sync_contribution_pool_test.go @@ -4,12 +4,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 2118c104c22..ccf8bf77924 100644 --- a/cl/validator/validator_params/validator_params.go +++ b/cl/validator/validator_params/validator_params.go @@ -3,7 +3,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 8b002605686..f477bddf1be 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -25,18 +25,18 @@ import ( "regexp" "strings" - "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/urfave/cli/v2" - "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 d3ea50e2e6f..6d097a4bcc6 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -24,15 +24,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 41b05812462..d46d6de3086 100644 --- a/cmd/capcli/cli.go +++ b/cmd/capcli/cli.go @@ -13,56 +13,56 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/turbo/debug" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/turbo/debug" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" lg "github.com/anacrolix/log" - "github.com/ledgerwatch/erigon-lib/direct" - downloader3 "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/metrics" - state2 "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/direct" + downloader3 "github.com/erigontech/erigon-lib/downloader" + "github.com/erigontech/erigon-lib/metrics" + state2 "github.com/erigontech/erigon-lib/state" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/downloader" - - "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/utils/eth_clock" - "github.com/ledgerwatch/erigon/cmd/caplin/caplin1" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/snapshotsync" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cl/persistence/beacon_indicies" - "github.com/ledgerwatch/erigon/cl/persistence/db_config" - "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" - - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/downloader" + + "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/utils/eth_clock" + "github.com/erigontech/erigon/cmd/caplin/caplin1" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/snapshotsync" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/downloader/downloadercfg" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cl/persistence/beacon_indicies" + "github.com/erigontech/erigon/cl/persistence/db_config" + "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" + + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/afero" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" ) var CLI struct { diff --git a/cmd/caplin/caplin1/run.go b/cmd/caplin/caplin1/run.go index 07c74e76d92..9edab2e3d76 100644 --- a/cmd/caplin/caplin1/run.go +++ b/cmd/caplin/caplin1/run.go @@ -9,52 +9,52 @@ import ( "google.golang.org/grpc/credentials" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "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/downloader" + "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/db_config" - "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/db_config" + "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/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/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 fa99c02bdd8..f0a58e2a742 100644 --- a/cmd/caplin/caplincli/config.go +++ b/cmd/caplin/caplincli/config.go @@ -7,14 +7,14 @@ import ( "strings" "time" - "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" "github.com/urfave/cli/v2" ) diff --git a/cmd/caplin/caplinflags/flags.go b/cmd/caplin/caplinflags/flags.go index 84c858edbde..6bdd7ef3590 100644 --- a/cmd/caplin/caplinflags/flags.go +++ b/cmd/caplin/caplinflags/flags.go @@ -1,7 +1,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 730363e03fc..90e7417ad20 100644 --- a/cmd/caplin/main.go +++ b/cmd/caplin/main.go @@ -16,26 +16,26 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon/cl/beacon/beacon_router_configuration" - "github.com/ledgerwatch/erigon/cl/persistence/db_config" - "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/erigontech/erigon-lib/common/disk" + "github.com/erigontech/erigon-lib/common/mem" + "github.com/erigontech/erigon/cl/beacon/beacon_router_configuration" + "github.com/erigontech/erigon/cl/persistence/db_config" + "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/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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/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/devnet/README.md b/cmd/devnet/README.md index 15969924c06..44f456994aa 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/devel/DEV_CHAIN.md) for a manual version. +See [DEV_CHAIN](https://github.com/erigontech/erigon/blob/devel/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 097ca74daf5..219a553962e 100644 --- a/cmd/devnet/accounts/accounts.go +++ b/cmd/devnet/accounts/accounts.go @@ -3,9 +3,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 3547c2363c8..76a054eb3dc 100644 --- a/cmd/devnet/accounts/steps/steps.go +++ b/cmd/devnet/accounts/steps/steps.go @@ -6,17 +6,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 798107cf63c..d3642679a12 100644 --- a/cmd/devnet/admin/ping.go +++ b/cmd/devnet/admin/ping.go @@ -3,8 +3,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 1bbf714562c..0ba94fa780e 100644 --- a/cmd/devnet/args/node_args.go +++ b/cmd/devnet/args/node_args.go @@ -9,13 +9,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 ec9a717cc95..d4ce680121c 100644 --- a/cmd/devnet/args/node_args_test.go +++ b/cmd/devnet/args/node_args_test.go @@ -6,7 +6,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 3f143a69f03..ec7c3906b9c 100644 --- a/cmd/devnet/blocks/checks.go +++ b/cmd/devnet/blocks/checks.go @@ -4,9 +4,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 a4820849a73..77263dd81bd 100644 --- a/cmd/devnet/blocks/fees.go +++ b/cmd/devnet/blocks/fees.go @@ -4,8 +4,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 341f248d699..3af5c3ee7b4 100644 --- a/cmd/devnet/blocks/generator.go +++ b/cmd/devnet/blocks/generator.go @@ -6,12 +6,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 128e731e61b..16491ba058e 100644 --- a/cmd/devnet/blocks/waiter.go +++ b/cmd/devnet/blocks/waiter.go @@ -3,14 +3,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 950e6db078d..e51c48c8665 100644 --- a/cmd/devnet/contracts/backend.go +++ b/cmd/devnet/contracts/backend.go @@ -5,15 +5,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 74cb162a02f..dc3457000a6 100644 --- a/cmd/devnet/contracts/steps/l1l2transfers.go +++ b/cmd/devnet/contracts/steps/l1l2transfers.go @@ -8,19 +8,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 59481c8d022..f622806ae28 100644 --- a/cmd/devnet/contracts/steps/l2l1transfers.go +++ b/cmd/devnet/contracts/steps/l2l1transfers.go @@ -6,19 +6,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 4c4cae9e6aa..3dd981213a4 100644 --- a/cmd/devnet/contracts/steps/subscriber.go +++ b/cmd/devnet/contracts/steps/subscriber.go @@ -5,23 +5,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 c9f0f173a77..68700937794 100644 --- a/cmd/devnet/contracts/util.go +++ b/cmd/devnet/contracts/util.go @@ -3,15 +3,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 e905cad3abf..0e49bb99f35 100644 --- a/cmd/devnet/devnet/context.go +++ b/cmd/devnet/devnet/context.go @@ -4,7 +4,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 194fb42a58f..f0b23ae2c03 100644 --- a/cmd/devnet/devnet/devnet.go +++ b/cmd/devnet/devnet/devnet.go @@ -6,7 +6,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 242b6e22b56..50ab7dfff0d 100644 --- a/cmd/devnet/devnet/network.go +++ b/cmd/devnet/devnet/network.go @@ -10,16 +10,16 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon/cmd/utils" - - "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/cmd/utils" + + "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" "github.com/urfave/cli/v2" ) diff --git a/cmd/devnet/devnet/node.go b/cmd/devnet/devnet/node.go index 7896d0a7700..75d497b576c 100644 --- a/cmd/devnet/devnet/node.go +++ b/cmd/devnet/devnet/node.go @@ -8,18 +8,18 @@ import ( "sync" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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/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 a41a10da9c5..a8d084260bd 100644 --- a/cmd/devnet/devnetutils/utils.go +++ b/cmd/devnet/devnetutils/utils.go @@ -11,11 +11,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 c53f1eed7b3..9245f1666c0 100644 --- a/cmd/devnet/main.go +++ b/cmd/devnet/main.go @@ -11,27 +11,27 @@ import ( "syscall" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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/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 0cb7dd8ff55..18c77238670 100644 --- a/cmd/devnet/networks/devnet_bor.go +++ b/cmd/devnet/networks/devnet_bor.go @@ -4,18 +4,18 @@ import ( "strconv" "time" - "github.com/ledgerwatch/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/log/v3" + + "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 044c3f26834..6d712ee8501 100644 --- a/cmd/devnet/networks/devnet_dev.go +++ b/cmd/devnet/networks/devnet_dev.go @@ -3,13 +3,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 247bb6c9f35..c0eeb9fd1ba 100644 --- a/cmd/devnet/requests/account.go +++ b/cmd/devnet/requests/account.go @@ -5,10 +5,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 eca0309b08b..a660c4d3325 100644 --- a/cmd/devnet/requests/admin.go +++ b/cmd/devnet/requests/admin.go @@ -3,7 +3,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 67c86c7d716..d597a5faea3 100644 --- a/cmd/devnet/requests/block.go +++ b/cmd/devnet/requests/block.go @@ -5,14 +5,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 2e50a500f8e..e34d0d560aa 100644 --- a/cmd/devnet/requests/event.go +++ b/cmd/devnet/requests/event.go @@ -5,12 +5,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 6385876c4d1..2ee20e2227c 100644 --- a/cmd/devnet/requests/nopgenerator.go +++ b/cmd/devnet/requests/nopgenerator.go @@ -5,14 +5,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 2a2741c3c87..d416bd1c087 100644 --- a/cmd/devnet/requests/request_generator.go +++ b/cmd/devnet/requests/request_generator.go @@ -13,16 +13,16 @@ import ( "sync" "time" - 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" "github.com/valyala/fastjson" ) diff --git a/cmd/devnet/requests/trace.go b/cmd/devnet/requests/trace.go index 415cfb2ea11..3d98cc49116 100644 --- a/cmd/devnet/requests/trace.go +++ b/cmd/devnet/requests/trace.go @@ -5,12 +5,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 e463265e010..095064a5747 100644 --- a/cmd/devnet/requests/transaction.go +++ b/cmd/devnet/requests/transaction.go @@ -7,15 +7,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 bbd21c15f1a..ee62898a4e2 100644 --- a/cmd/devnet/scenarios/context.go +++ b/cmd/devnet/scenarios/context.go @@ -4,7 +4,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 1017f5ee30a..4dcd35b4e40 100644 --- a/cmd/devnet/scenarios/run.go +++ b/cmd/devnet/scenarios/run.go @@ -4,7 +4,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 5d4b9106876..81cd2612520 100644 --- a/cmd/devnet/scenarios/scenario.go +++ b/cmd/devnet/scenarios/scenario.go @@ -10,8 +10,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 a3e1c4b3d4c..9fbc5f74b89 100644 --- a/cmd/devnet/scenarios/suite.go +++ b/cmd/devnet/scenarios/suite.go @@ -7,8 +7,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 ff4e1b82d1c..f9d2e523e40 100644 --- a/cmd/devnet/services/accounts/faucet.go +++ b/cmd/devnet/services/accounts/faucet.go @@ -7,13 +7,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 625cdb6ce38..bf2780f515e 100644 --- a/cmd/devnet/services/context.go +++ b/cmd/devnet/services/context.go @@ -3,9 +3,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 206d1d3a1a5..3d4a6b64ea8 100644 --- a/cmd/devnet/services/polygon/checkpoint.go +++ b/cmd/devnet/services/polygon/checkpoint.go @@ -10,18 +10,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 40a2d7fc630..68c7cd3c474 100644 --- a/cmd/devnet/services/polygon/heimdall.go +++ b/cmd/devnet/services/polygon/heimdall.go @@ -13,20 +13,20 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/log/v3" "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" + + 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 97854dba2e7..2fb9fd8f19b 100644 --- a/cmd/devnet/services/polygon/heimdall_test.go +++ b/cmd/devnet/services/polygon/heimdall_test.go @@ -10,7 +10,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/proofgenerator.go b/cmd/devnet/services/polygon/proofgenerator.go index 1dc24e77a0a..1f617460428 100644 --- a/cmd/devnet/services/polygon/proofgenerator.go +++ b/cmd/devnet/services/polygon/proofgenerator.go @@ -10,22 +10,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 cf5d100e184..8880de213c0 100644 --- a/cmd/devnet/services/polygon/proofgenerator_test.go +++ b/cmd/devnet/services/polygon/proofgenerator_test.go @@ -10,36 +10,36 @@ import ( "sync" "testing" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/pion/randutil" - "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/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 6c79c92c1f2..eab29190587 100644 --- a/cmd/devnet/services/polygon/statesync.go +++ b/cmd/devnet/services/polygon/statesync.go @@ -7,9 +7,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 2c5f2799313..4b845bcecc4 100644 --- a/cmd/devnet/services/polygon/util.go +++ b/cmd/devnet/services/polygon/util.go @@ -7,10 +7,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 b91515358e4..65da56d2254 100644 --- a/cmd/devnet/services/subscriptions.go +++ b/cmd/devnet/services/subscriptions.go @@ -4,12 +4,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 bf6a4834fe8..8782c35ba77 100644 --- a/cmd/devnet/tests/bor_devnet_test.go +++ b/cmd/devnet/tests/bor_devnet_test.go @@ -8,11 +8,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 294f851845c..400990add02 100644 --- a/cmd/devnet/tests/context.go +++ b/cmd/devnet/tests/context.go @@ -7,14 +7,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 c3aeda071e3..128dc5b706d 100644 --- a/cmd/devnet/tests/generic_devnet_test.go +++ b/cmd/devnet/tests/generic_devnet_test.go @@ -9,12 +9,12 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cmd/devnet/accounts" - "github.com/ledgerwatch/erigon/cmd/devnet/admin" - "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" + "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 470bc0d994b..9304e75c1cc 100644 --- a/cmd/devnet/transactions/block.go +++ b/cmd/devnet/transactions/block.go @@ -5,16 +5,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 d995edf4c83..279901fc213 100644 --- a/cmd/devnet/transactions/tx.go +++ b/cmd/devnet/transactions/tx.go @@ -6,20 +6,20 @@ import ( "strings" "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/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 a9056ecc949..72479f4978a 100644 --- a/cmd/diag/db/db.go +++ b/cmd/diag/db/db.go @@ -4,11 +4,11 @@ import ( "fmt" "os" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/cmd/diag/flags" + "github.com/erigontech/erigon/cmd/diag/util" "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" ) diff --git a/cmd/diag/downloader/diag_downloader.go b/cmd/diag/downloader/diag_downloader.go index 671ff96906e..ca6da36c591 100644 --- a/cmd/diag/downloader/diag_downloader.go +++ b/cmd/diag/downloader/diag_downloader.go @@ -4,12 +4,12 @@ import ( "fmt" "time" + "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" "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" ) diff --git a/cmd/diag/main.go b/cmd/diag/main.go index f7eb2aa32ad..3061b594784 100644 --- a/cmd/diag/main.go +++ b/cmd/diag/main.go @@ -10,15 +10,15 @@ 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..ab5319e0833 100644 --- a/cmd/diag/readme.md +++ b/cmd/diag/readme.md @@ -1,80 +1,91 @@ -# Diagnostics commands +# Diagnostics commands ## Diagnostics command architecture -Diagnostics command is implemented to retrieve information from the Erigon node on a headless machine. It makes it easier to run and get information from the node as it runs on the same machine and doesn't require a PIN-secured remote connection. This is done to make the diagnostics process quicker to set up and make the entire process less resistant. +Diagnostics command is implemented to retrieve information from the Erigon node on a headless machine. It makes it easier to run and get information from the node as it runs on the same machine and doesn't require a PIN-secured remote connection. This is done to make the diagnostics process quicker to set up and make the entire process less resistant. ### 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 -| | | -|--|--| -|databases|Displays information about databases. [Details](#databases)| -|downloader|Displays info about the snapshot download process| -|stages|Displays the current status of node synchronization| -|ui|Serves local UI interface to browse through all info collected by diagnostics| -||| + +| | | +| ---------- | ----------------------------------------------------------------------------- | +| databases | Displays information about databases. [Details](#databases) | +| downloader | Displays info about the snapshot download process | +| stages | Displays the current status of node synchronization | +| ui | Serves local UI interface to browse through all info collected by diagnostics | +| | | ### Global flags -||||| -|--|--|--|--| -|Flag|Default Value|Allowed Values|Description| -|debug.addr|"localhost:6060"|string|Address of diagnostics endpoint in Erigon node. This endpoint must match the values of `diagnostics.endpoint.addr:diagnostics.endpoint.port`. By default, it is `localhost:6060`.| -|output|`text`|`text`, `json`|Defines the output format for diagnostics data. It can be either `text` or `json`. `text` means that the output will be prettified, `json` means that the output will be in JSON format. By default, the output is in `text` format.| -|help|||Shows details about the command| -||||| +| | | | | +| ---------- | ---------------- | -------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Flag | Default Value | Allowed Values | Description | +| debug.addr | "localhost:6060" | string | Address of diagnostics endpoint in Erigon node. This endpoint must match the values of `diagnostics.endpoint.addr:diagnostics.endpoint.port`. By default, it is `localhost:6060`. | +| output | `text` | `text`, `json` | Defines the output format for diagnostics data. It can be either `text` or `json`. `text` means that the output will be prettified, `json` means that the output will be in JSON format. By default, the output is in `text` format. | +| help | | | Shows details about the command | +| | | | | ### Databases + `./build/bin/diag databases` + #### Available flags: -||||| -|--|--|--|--| -|Flag|Default Value|Allowed Values|Description| -|db.appearance.populated|false|boolean|Print only for populated tables content.| -|db.name|""|string|DB name to print info about. If not set, all DBs will be printed.| -|||| + +| | | | | +| ----------------------- | ------------- | -------------- | ----------------------------------------------------------------- | +| Flag | Default Value | Allowed Values | Description | +| db.appearance.populated | false | boolean | Print only for populated tables content. | +| db.name | "" | string | DB name to print info about. If not set, all DBs will be printed. | +| | | | Examples: + - `./build/bin/diag databases` -![img](./_images/dbs/example_databases.png) + ![img](./_images/dbs/example_databases.png) - `./build/bin/diag databases --db.name=caplin/indexing/beacon_indicies` -![img](./_images/dbs/example_databases_name.png) + ![img](./_images/dbs/example_databases_name.png) - `./build/bin/diag databases --db.name=caplin/indexing/beacon_indicies --db.appearance.populated` -![img](./_images/dbs/example_databases_name_populated.png) + ![img](./_images/dbs/example_databases_name_populated.png) ### Downloader + `./build/bin/diag downloader` Display Snapshot download status #### Available subcommands: -||| -|--|--| -|files|Displays status for each file along with overall download status| -||| + +| | | +| ----- | ---------------------------------------------------------------- | +| files | Displays status for each file along with overall download status | +| | | #### Available flags: -||||| -|--|--|--|--| -|Flag|Default Value|Allowed Values|Description| -|downloader.file.filter|`all`|`all`, `active`, `inactive`, `downloaded`, `queued`|Filter files to display.| -|downloader.file.name|""|string|File name to print details about.| -|||| + +| | | | | +| ---------------------- | ------------- | --------------------------------------------------- | --------------------------------- | +| Flag | Default Value | Allowed Values | Description | +| downloader.file.filter | `all` | `all`, `active`, `inactive`, `downloaded`, `queued` | Filter files to display. | +| downloader.file.name | "" | string | File name to print details about. | +| | | | Examples: + - `./build/bin/diag downloader` -![img](./_images/downloader/example_downloader.png) + ![img](./_images/downloader/example_downloader.png) - `./build/bin/diag downloader files` -![img](./_images/downloader/example_downloader_files.png) + ![img](./_images/downloader/example_downloader_files.png) - `./build/bin/diag downloader files --downloader.file.filter=downloaded` -![img](./_images/downloader/example_downloader_files_downloaded.png) + ![img](./_images/downloader/example_downloader_files_downloaded.png) - `./build/bin/diag downloader files --downloader.file.name=v1-005400-005500-transactions.seg` -![img](./_images/downloader/example_downloader_files_filename.png) + ![img](./_images/downloader/example_downloader_files_filename.png) ### Stages + `./build/bin/diag stages current` Display node synchronization status @@ -83,14 +94,16 @@ Example output: ![img](./_images/stages/example_stages.png) ### UI + `./build/bin/diag ui` Serve diagnostics ui locally #### Available flags: -||||| -|--|--|--|--| -|Flag|Default Value|Allowed Values|Description| -|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 +| | | | | +| ------- | ---------------- | -------------- | -------------------------------- | +| Flag | Default Value | Allowed Values | Description | +| 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/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. diff --git a/cmd/diag/stages/stages.go b/cmd/diag/stages/stages.go index f73b2959f79..76b389d8e7c 100644 --- a/cmd/diag/stages/stages.go +++ b/cmd/diag/stages/stages.go @@ -4,10 +4,10 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon/cmd/diag/flags" + "github.com/erigontech/erigon/cmd/diag/util" "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" ) diff --git a/cmd/diag/sysinfo/sysinfo.go b/cmd/diag/sysinfo/sysinfo.go index 862b9a195cb..0204e008f26 100644 --- a/cmd/diag/sysinfo/sysinfo.go +++ b/cmd/diag/sysinfo/sysinfo.go @@ -24,10 +24,10 @@ import ( "github.com/jedib0t/go-pretty/v6/table" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/sysutils" - "github.com/ledgerwatch/erigon/cmd/diag/flags" - "github.com/ledgerwatch/erigon/cmd/diag/util" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/sysutils" + "github.com/erigontech/erigon/cmd/diag/flags" + "github.com/erigontech/erigon/cmd/diag/util" ) var ( diff --git a/cmd/diag/ui/ui.go b/cmd/diag/ui/ui.go index 8ee1df2a006..4507dd0ca2c 100644 --- a/cmd/diag/ui/ui.go +++ b/cmd/diag/ui/ui.go @@ -8,13 +8,13 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigonwatch" + "github.com/erigontech/erigonwatch" + "github.com/erigontech/erigon/cmd/diag/flags" "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" ) diff --git a/cmd/downloader/downloadernat/nat.go b/cmd/downloader/downloadernat/nat.go index 173641e7ea8..9d7bda2e33c 100644 --- a/cmd/downloader/downloadernat/nat.go +++ b/cmd/downloader/downloadernat/nat.go @@ -2,8 +2,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 0d53e7ebb1a..65f10bb8c68 100644 --- a/cmd/downloader/main.go +++ b/cmd/downloader/main.go @@ -13,24 +13,24 @@ import ( "strings" "time" - _ "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/anacrolix/torrent/metainfo" "github.com/c2h5oh/datasize" + "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/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/downloader" - "github.com/ledgerwatch/erigon-lib/downloader/downloadercfg" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/pelletier/go-toml/v2" "github.com/spf13/cobra" "google.golang.org/grpc" @@ -40,14 +40,14 @@ import ( "google.golang.org/grpc/keepalive" "google.golang.org/grpc/reflection" - "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/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/downloader/readme.md b/cmd/downloader/readme.md index 8146934d6e9..d724475f821 100644 --- a/cmd/downloader/readme.md +++ b/cmd/downloader/readme.md @@ -10,20 +10,20 @@ built-into Erigon or run as separated process. ```shell # 1. Downloader by default run inside Erigon, by `--snapshots` flag: -erigon --snapshots --datadir= +erigon --snapshots --datadir= ``` ```shell # 2. It's possible to start Downloader as independent process, by `--snapshots --downloader.api.addr=127.0.0.1:9093` flags: -make erigon downloader +make erigon downloader # Start downloader (can limit network usage by 512mb/sec: --torrent.download.rate=512mb --torrent.upload.rate=512mb) downloader --downloader.api.addr=127.0.0.1:9093 --torrent.port=42068 --datadir= # --downloader.api.addr - is for internal communication with Erigon -# --torrent.port=42068 - is for public BitTorrent protocol listen +# --torrent.port=42068 - is for public BitTorrent protocol listen # Erigon on startup does send list of .torrent files to Downloader and wait for 100% download accomplishment -erigon --snapshots --downloader.api.addr=127.0.0.1:9093 --datadir= +erigon --snapshots --downloader.api.addr=127.0.0.1:9093 --datadir= ``` Use `--snap.keepblocks=true` to don't delete retired blocks from DB @@ -31,7 +31,7 @@ Use `--snap.keepblocks=true` to don't delete retired blocks from DB Any network/chain can start with snapshot sync: - node will download only snapshots registered in next - repo https://github.com/ledgerwatch/erigon-snapshot + repo https://github.com/erigontech/erigon-snapshot - node will move old blocks from DB to snapshots of 1K blocks size, then merge snapshots to bigger range, until snapshots of 500K blocks, then automatically start seeding new snapshot @@ -42,15 +42,15 @@ Flag `--snapshots` is compatible with `--prune` flag ```shell # Need create new snapshots and start seeding them - + # Create new snapshots (can change snapshot size by: --from=0 --to=1_000_000 --segment.size=500_000) # It will dump blocks from Database to .seg files: -erigon snapshots retire --datadir= +erigon snapshots retire --datadir= # Create .torrent files (you can think about them as "checksum") downloader torrent_create --datadir= -# output format is compatible with https://github.com/ledgerwatch/erigon-snapshot +# output format is compatible with https://github.com/erigontech/erigon-snapshot downloader torrent_hashes --datadir= # Start downloader (read all .torrent files, and download/seed data) @@ -60,18 +60,18 @@ downloader --downloader.api.addr=127.0.0.1:9093 --datadir= Additional info: ```shell -# Snapshots creation does not require fully-synced Erigon - few first stages enough. For example: -STOP_AFTER_STAGE=Senders ./build/bin/erigon --snapshots=false --datadir= +# Snapshots creation does not require fully-synced Erigon - few first stages enough. For example: +STOP_AFTER_STAGE=Senders ./build/bin/erigon --snapshots=false --datadir= # But for security - better have fully-synced Erigon # Erigon can use snapshots only after indexing them. Erigon will automatically index them but also can run (this step is not required for seeding): -erigon snapshots index --datadir= +erigon snapshots index --datadir= ``` ## Architecture -Downloader works based on /snapshots/*.torrent files. Such files +Downloader works based on /snapshots/\*.torrent files. Such files can be created 4 ways: - Erigon can do grpc call downloader.Download(list_of_hashes), it will trigger @@ -86,7 +86,7 @@ can be created 4 ways: Erigon does: - connect to Downloader -- share list of hashes (see https://github.com/ledgerwatch/erigon-snapshot ) +- share list of hashes (see https://github.com/erigontech/erigon-snapshot ) - wait for download of all snapshots - when .seg available - automatically create .idx files - secondary indices, for example to find block by hash @@ -145,7 +145,7 @@ downloader --datadir= --chain=mainnet --webseed= # See also: `downloader --help` of `--webseed` flag. There is an option to pass it by `datadir/webseed.toml` file ``` ---------- +--- ## Utilities @@ -158,7 +158,9 @@ downloader torrent_clean --datadir # remote all .torrent files in data ``` ## Remote manifest verify + To check that remote webseeds has available manifest and all manifested files are available, has correct format of ETag, does not have dangling torrents etc. + ``` downloader manifest-verify --chain [--webseeds 'a','b','c'] ``` @@ -179,4 +181,3 @@ crontab -e ``` It does push to branch `auto`, before release - merge `auto` to `main` manually - diff --git a/cmd/downloader/torrent_hashes_update.sh b/cmd/downloader/torrent_hashes_update.sh index 0cb7f712452..1b5a1de1ec8 100755 --- a/cmd/downloader/torrent_hashes_update.sh +++ b/cmd/downloader/torrent_hashes_update.sh @@ -39,5 +39,5 @@ fi # /dev/null to avoid logging of insecure git output #SSH_CMD='echo ${GH_TOKEN} | ssh -i /dev/stdin -o IdentitiesOnly=yes' SSH_CMD="ssh -i ${GH_TOKEN_FILE} -o IdentitiesOnly=yes" -GIT_SSH_COMMAND=${SSH_CMD} git push git@github.com:ledgerwatch/erigon-snapshot.git auto >/dev/null 2>&1 +GIT_SSH_COMMAND=${SSH_CMD} git push git@github.com:erigontech/erigon-snapshot.git auto >/dev/null 2>&1 echo "Done" diff --git a/cmd/erigon/main.go b/cmd/erigon/main.go index 92df7c234f5..ba1ca0a9d0c 100644 --- a/cmd/erigon/main.go +++ b/cmd/erigon/main.go @@ -5,18 +5,18 @@ import ( "net/http" "os" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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/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 1870785fc27..7b704c5428e 100644 --- a/cmd/erigoncustom/main.go +++ b/cmd/erigoncustom/main.go @@ -6,8 +6,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 dd055b52c45..6b480a43022 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -23,7 +23,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 f45115adbfa..99ded736192 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -24,7 +24,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 57ceffd2b47..6fca34bc326 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,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 96550bd1a87..963a7ff57a1 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -20,17 +20,17 @@ import ( "encoding/binary" "math/big" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" "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/common" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "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/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 fa0886e7f83..bba5749a19d 100644 --- a/cmd/evm/internal/t8ntool/flags.go +++ b/cmd/evm/internal/t8ntool/flags.go @@ -22,8 +22,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 af30326e1e1..9be2ac8d853 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 98dc6f6d2a0..e9e69db0abd 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -27,32 +27,32 @@ import ( "path" "path/filepath" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "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" - "github.com/ledgerwatch/erigon/eth/stagedsync" - 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/ledgerwatch/erigon/turbo/trie" + "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" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "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" + "github.com/erigontech/erigon/eth/stagedsync" + 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" + "github.com/erigontech/erigon/turbo/trie" ) const ( diff --git a/cmd/evm/main.go b/cmd/evm/main.go index a85828e1c86..099a05f1786 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,13 +22,13 @@ import ( "math/big" "os" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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 d51f1746177..5fe6838a868 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -29,26 +29,26 @@ import ( "testing" "time" + "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/kvcfg" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/utils/flags" + "github.com/erigontech/erigon/core/types" "github.com/holiman/uint256" - "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/kvcfg" - "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/urfave/cli/v2" - "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/core" + "github.com/erigontech/erigon/core/state" + "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 9b6fa41acd3..0ef0cd9a20d 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -25,17 +25,17 @@ import ( "path/filepath" "github.com/c2h5oh/datasize" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" mdbx2 "github.com/erigontech/mdbx-go/mdbx" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers/logger" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/tracers/logger" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/trie" ) var stateTestCommand = cli.Command{ diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index e3484fb4584..aefbf2a14c7 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -9,7 +9,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 6e32367d4ce..67230f27730 100644 --- a/cmd/hack/db/lmdb.go +++ b/cmd/hack/db/lmdb.go @@ -13,10 +13,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 e36b3fb27cf..e335c755115 100644 --- a/cmd/hack/flow/flow.go +++ b/cmd/hack/flow/flow.go @@ -14,11 +14,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 bac4a13ee3c..38e6be2dc2b 100644 --- a/cmd/hack/hack.go +++ b/cmd/hack/hack.go @@ -19,44 +19,44 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/RoaringBitmap/roaring/roaring64" + "github.com/erigontech/erigon-lib/log/v3" "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/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "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/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb" - "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" + + 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" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "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/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb" + "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 8bcff3561ca..b24f77da22b 100644 --- a/cmd/hack/tool/fromdb/tool.go +++ b/cmd/hack/tool/fromdb/tool.go @@ -3,11 +3,11 @@ package fromdb import ( "context" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "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-lib/kv/kvcfg" + "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 dfd2f4d8709..249ce2819ac 100644 --- a/cmd/hack/tool/tool.go +++ b/cmd/hack/tool/tool.go @@ -3,9 +3,9 @@ package tool import ( "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 67a48319176..a411b97563d 100644 --- a/cmd/integration/commands/flags.go +++ b/cmd/integration/commands/flags.go @@ -3,10 +3,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 ea0d7871061..5232b323178 100644 --- a/cmd/integration/commands/refetence_db.go +++ b/cmd/integration/commands/refetence_db.go @@ -11,13 +11,13 @@ import ( "sync/atomic" "time" - 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" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/turbo/debug" + 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/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/turbo/debug" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/cmd/integration/commands/reset_state.go b/cmd/integration/commands/reset_state.go index 63e46dea4b7..bc602831a99 100644 --- a/cmd/integration/commands/reset_state.go +++ b/cmd/integration/commands/reset_state.go @@ -8,22 +8,22 @@ import ( "os" "text/tabwriter" - "github.com/ledgerwatch/erigon-lib/kv/backup" - "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/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/kv/backup" + "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/kvcfg" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" "github.com/spf13/cobra" - "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/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 13dc40130a3..dfca7ffbada 100644 --- a/cmd/integration/commands/root.go +++ b/cmd/integration/commands/root.go @@ -7,19 +7,19 @@ import ( "path/filepath" "strings" - "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/spf13/cobra" "golang.org/x/sync/semaphore" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + 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 bcde575fad5..6ba1f136297 100644 --- a/cmd/integration/commands/stages.go +++ b/cmd/integration/commands/stages.go @@ -12,53 +12,53 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/mdbx-go/mdbx" + "github.com/erigontech/secp256k1" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/secp256k1" "github.com/spf13/cobra" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - common2 "github.com/ledgerwatch/erigon-lib/common" - libcommon "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/dir" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "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/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" + common2 "github.com/erigontech/erigon-lib/common" + libcommon "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/dir" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "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/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_stages.go b/cmd/integration/commands/state_stages.go index b71e0898283..95b7cf61f6e 100644 --- a/cmd/integration/commands/state_stages.go +++ b/cmd/integration/commands/state_stages.go @@ -10,37 +10,37 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/wrap" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/wrap" "github.com/c2h5oh/datasize" - 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/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/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/common/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" - "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/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/integrity" - "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/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/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/integrity" + "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 dcc76fa1ddf..09ae2af0876 100644 --- a/cmd/integration/main.go +++ b/cmd/integration/main.go @@ -4,11 +4,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 09052e58e4f..6bd8458360d 100644 --- a/cmd/observer/database/db_retrier.go +++ b/cmd/observer/database/db_retrier.go @@ -5,8 +5,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 d8065f992ed..16bdc7cacc8 100644 --- a/cmd/observer/database/db_sqlite.go +++ b/cmd/observer/database/db_sqlite.go @@ -5,7 +5,7 @@ import ( "database/sql" "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "net" "strings" "time" diff --git a/cmd/observer/main.go b/cmd/observer/main.go index 9194ab9a4f9..52766f679d5 100644 --- a/cmd/observer/main.go +++ b/cmd/observer/main.go @@ -6,13 +6,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 1ee14a2f23b..e320e20a27f 100644 --- a/cmd/observer/observer/command.go +++ b/cmd/observer/observer/command.go @@ -9,10 +9,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 13bc46b7cb6..60a5964e9f1 100644 --- a/cmd/observer/observer/crawler.go +++ b/cmd/observer/observer/crawler.go @@ -8,16 +8,16 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/semaphore" - "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/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 47029cb74da..2b0733f1d12 100644 --- a/cmd/observer/observer/diplomacy.go +++ b/cmd/observer/observer/diplomacy.go @@ -8,10 +8,10 @@ import ( "sync/atomic" "time" - "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/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" "golang.org/x/sync/semaphore" ) diff --git a/cmd/observer/observer/diplomat.go b/cmd/observer/observer/diplomat.go index 4c81676cc45..b83f4db933d 100644 --- a/cmd/observer/observer/diplomat.go +++ b/cmd/observer/observer/diplomat.go @@ -6,10 +6,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 c975e5086c0..2c7ce076517 100644 --- a/cmd/observer/observer/handshake.go +++ b/cmd/observer/observer/handshake.go @@ -9,17 +9,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 f2b64c1c17e..1f4303393c9 100644 --- a/cmd/observer/observer/handshake_test.go +++ b/cmd/observer/observer/handshake_test.go @@ -7,11 +7,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 80fc733f6b3..315f7456550 100644 --- a/cmd/observer/observer/interrogator.go +++ b/cmd/observer/observer/interrogator.go @@ -8,11 +8,11 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "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" + "github.com/erigontech/erigon-lib/log/v3" + "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" "golang.org/x/sync/semaphore" ) diff --git a/cmd/observer/observer/keygen.go b/cmd/observer/observer/keygen.go index ab9c972df94..ed1303aee1b 100644 --- a/cmd/observer/observer/keygen.go +++ b/cmd/observer/observer/keygen.go @@ -5,9 +5,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 9cc18cabf8c..cfaf51b2f47 100644 --- a/cmd/observer/observer/keygen_test.go +++ b/cmd/observer/observer/keygen_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/crypto" "github.com/stretchr/testify/assert" ) diff --git a/cmd/observer/observer/node_utils/node_addr.go b/cmd/observer/observer/node_utils/node_addr.go index e59b762c5fa..26dfe506c72 100644 --- a/cmd/observer/observer/node_utils/node_addr.go +++ b/cmd/observer/observer/node_utils/node_addr.go @@ -4,10 +4,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 ae9dedb7e8b..b00e83c076c 100644 --- a/cmd/observer/observer/node_utils/node_id.go +++ b/cmd/observer/observer/node_utils/node_id.go @@ -5,8 +5,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 456da212feb..6a464e25f2d 100644 --- a/cmd/observer/observer/sentry_candidates/intake.go +++ b/cmd/observer/observer/sentry_candidates/intake.go @@ -5,12 +5,12 @@ import ( "fmt" "time" - "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" "github.com/nxadm/tail" ) diff --git a/cmd/observer/observer/sentry_candidates/log.go b/cmd/observer/observer/sentry_candidates/log.go index f8b5129de05..9b4518d1ddc 100644 --- a/cmd/observer/observer/sentry_candidates/log.go +++ b/cmd/observer/observer/sentry_candidates/log.go @@ -9,7 +9,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 d98e0e1f733..77784451d6d 100644 --- a/cmd/observer/observer/server.go +++ b/cmd/observer/observer/server.go @@ -8,19 +8,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 a6a5028dde3..7b19203556a 100644 --- a/cmd/observer/observer/status_logger.go +++ b/cmd/observer/observer/status_logger.go @@ -5,9 +5,9 @@ import ( "errors" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cmd/observer/database" - "github.com/ledgerwatch/erigon/cmd/observer/utils" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cmd/observer/database" + "github.com/erigontech/erigon/cmd/observer/utils" ) 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 7081dba8b3e..479d7f3b895 100644 --- a/cmd/observer/reports/clients_estimate_report.go +++ b/cmd/observer/reports/clients_estimate_report.go @@ -6,7 +6,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 2de87a7a84c..b26e2bd92d2 100644 --- a/cmd/observer/reports/clients_report.go +++ b/cmd/observer/reports/clients_report.go @@ -5,8 +5,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 c8e6610690a..a5a755d59a5 100644 --- a/cmd/observer/reports/command.go +++ b/cmd/observer/reports/command.go @@ -6,7 +6,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 1c9ecc1b6f9..a70e68ee7f2 100644 --- a/cmd/observer/reports/sentry_candidates_report.go +++ b/cmd/observer/reports/sentry_candidates_report.go @@ -7,8 +7,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 11c80063982..226ced27be6 100644 --- a/cmd/observer/reports/status_report.go +++ b/cmd/observer/reports/status_report.go @@ -5,7 +5,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 94a596f1590..5c23b3f2bff 100644 --- a/cmd/observer/utils/pubkey_hex.go +++ b/cmd/observer/utils/pubkey_hex.go @@ -5,8 +5,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 6d9aaa8f850..8733865d90e 100644 --- a/cmd/observer/utils/retry.go +++ b/cmd/observer/utils/retry.go @@ -4,7 +4,7 @@ import ( "context" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func Retry( diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index 790173dcc63..e1e5d3e58e3 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -44,18 +44,18 @@ 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/ledgerwatch/erigon/turbo/logging" + "github.com/erigontech/erigon/turbo/logging" "github.com/urfave/cli/v2" - "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 356ca5d8a08..bf2734abd66 100644 --- a/cmd/pics/pics.go +++ b/cmd/pics/pics.go @@ -7,11 +7,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 76a0ac2d9fe..a2946ef1197 100644 --- a/cmd/pics/state.go +++ b/cmd/pics/state.go @@ -11,23 +11,23 @@ import ( "path/filepath" "strings" + 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/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" - "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 7472d5d03ac..a13e7f2792f 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -26,7 +26,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 4629b79180b..efd04d74fdc 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 6cae2c96205..ebbe99cd0c2 100644 --- a/cmd/rpcdaemon/cli/config.go +++ b/cmd/rpcdaemon/cli/config.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" @@ -24,57 +24,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/dir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - 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" - 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/aura" - "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/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/dir" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/kvcfg" + 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" + 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/aura" + "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/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{ @@ -115,7 +115,7 @@ func RootCommand() (*cobra.Command, *httpcfg.HttpCfg) { rootCmd.PersistentFlags().StringVar(&cfg.TLSKeyFile, "tls.key", "", "key file for client side TLS handshake for GRPC") rootCmd.PersistentFlags().StringVar(&cfg.TLSCACert, "tls.cacert", "", "CA certificate for client side TLS handshake for GRPC") - rootCmd.PersistentFlags().StringSliceVar(&cfg.API, "http.api", []string{"eth", "erigon"}, "API's offered over the RPC interface: eth,erigon,web3,net,debug,trace,txpool,db. Supported methods: https://github.com/ledgerwatch/erigon/tree/devel/cmd/rpcdaemon") + rootCmd.PersistentFlags().StringSliceVar(&cfg.API, "http.api", []string{"eth", "erigon"}, "API's offered over the RPC interface: eth,erigon,web3,net,debug,trace,txpool,db. Supported methods: https://github.com/erigontech/erigon/tree/devel/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 d66522bbe0b..1a7440a4ea7 100644 --- a/cmd/rpcdaemon/cli/httpcfg/http_cfg.go +++ b/cmd/rpcdaemon/cli/httpcfg/http_cfg.go @@ -1,13 +1,13 @@ package httpcfg import ( - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/rpchelper" "time" - "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 dbf6fbff88a..c3b98bab69a 100644 --- a/cmd/rpcdaemon/cli/rpc_allow_list.go +++ b/cmd/rpcdaemon/cli/rpc_allow_list.go @@ -6,7 +6,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 d1cfe32e753..924af79b683 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" ) diff --git a/cmd/rpcdaemon/graphql/graph/helpers.go b/cmd/rpcdaemon/graphql/graph/helpers.go index 77b90c38607..7b943bf05ff 100644 --- a/cmd/rpcdaemon/graphql/graph/helpers.go +++ b/cmd/rpcdaemon/graphql/graph/helpers.go @@ -3,16 +3,16 @@ package graph import ( "encoding/hex" "fmt" - hexutil2 "github.com/ledgerwatch/erigon-lib/common/hexutil" + hexutil2 "github.com/erigontech/erigon-lib/common/hexutil" "reflect" "strconv" "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 542ff100a96..2bc1906c7b7 100644 --- a/cmd/rpcdaemon/graphql/graph/schema.resolvers.go +++ b/cmd/rpcdaemon/graphql/graph/schema.resolvers.go @@ -11,10 +11,10 @@ import ( "strconv" "strings" - "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/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 64826f37951..2b4af3b23f1 100644 --- a/cmd/rpcdaemon/graphql/graphql.go +++ b/cmd/rpcdaemon/graphql/graphql.go @@ -7,9 +7,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 93e8d71fc7e..e06f9383910 100644 --- a/cmd/rpcdaemon/health/check_block.go +++ b/cmd/rpcdaemon/health/check_block.go @@ -4,7 +4,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 f410a171790..7324a3c9966 100644 --- a/cmd/rpcdaemon/health/check_synced.go +++ b/cmd/rpcdaemon/health/check_synced.go @@ -4,7 +4,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 e78f8aee858..ec1b217e17b 100644 --- a/cmd/rpcdaemon/health/check_time.go +++ b/cmd/rpcdaemon/health/check_time.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/ledgerwatch/erigon/rpc" + "github.com/erigontech/erigon/rpc" ) var ( diff --git a/cmd/rpcdaemon/health/health.go b/cmd/rpcdaemon/health/health.go index 6652c023a58..6198e746ddb 100644 --- a/cmd/rpcdaemon/health/health.go +++ b/cmd/rpcdaemon/health/health.go @@ -10,9 +10,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 f46146a4feb..3eccb4b8767 100644 --- a/cmd/rpcdaemon/health/health_test.go +++ b/cmd/rpcdaemon/health/health_test.go @@ -11,9 +11,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 2fabf8d5de4..6283bb71f3e 100644 --- a/cmd/rpcdaemon/health/interfaces.go +++ b/cmd/rpcdaemon/health/interfaces.go @@ -2,9 +2,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 21e003e5a59..14a4ae9b888 100644 --- a/cmd/rpcdaemon/health/parse_api.go +++ b/cmd/rpcdaemon/health/parse_api.go @@ -1,7 +1,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 ff75ed802c4..7de801041a0 100644 --- a/cmd/rpcdaemon/main.go +++ b/cmd/rpcdaemon/main.go @@ -6,15 +6,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 6f583ec7447..14a509b6b29 100644 --- a/cmd/rpcdaemon/rpcdaemontest/test_util.go +++ b/cmd/rpcdaemon/rpcdaemontest/test_util.go @@ -14,26 +14,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "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 d6139f26a88..032c266c342 100644 --- a/cmd/rpcdaemon/rpcservices/eth_backend.go +++ b/cmd/rpcdaemon/rpcservices/eth_backend.go @@ -9,23 +9,23 @@ import ( "io" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/grpc" "google.golang.org/grpc/status" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "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/common" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 caa5c51af86..5c3ef5751b0 100644 --- a/cmd/rpcdaemon/rpcservices/eth_mining.go +++ b/cmd/rpcdaemon/rpcservices/eth_mining.go @@ -4,10 +4,10 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/ethdb/privateapi" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/ethdb/privateapi" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/cmd/rpcdaemon/rpcservices/eth_txpool.go b/cmd/rpcdaemon/rpcservices/eth_txpool.go index aa696fcd3e7..1b6b81661b5 100644 --- a/cmd/rpcdaemon/rpcservices/eth_txpool.go +++ b/cmd/rpcdaemon/rpcservices/eth_txpool.go @@ -5,11 +5,11 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - txpooproto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "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/txpool" + "github.com/erigontech/erigon-lib/log/v3" + txpool2 "github.com/erigontech/erigon-lib/txpool" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/cmd/rpctest/main.go b/cmd/rpctest/main.go index 885594ba587..7d6289fdd11 100644 --- a/cmd/rpctest/main.go +++ b/cmd/rpctest/main.go @@ -7,9 +7,9 @@ import ( "os/signal" "syscall" - "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" "github.com/spf13/cobra" ) diff --git a/cmd/rpctest/rpctest/account_range_verify.go b/cmd/rpctest/rpctest/account_range_verify.go index 82f7827f6f1..66595b056cd 100644 --- a/cmd/rpctest/rpctest/account_range_verify.go +++ b/cmd/rpctest/rpctest/account_range_verify.go @@ -11,13 +11,13 @@ import ( "time" "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 0577a4e84b5..3c5c55848e9 100644 --- a/cmd/rpctest/rpctest/bench1.go +++ b/cmd/rpctest/rpctest/bench1.go @@ -9,9 +9,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 7dd73402800..347d7eb826b 100644 --- a/cmd/rpctest/rpctest/bench2.go +++ b/cmd/rpctest/rpctest/bench2.go @@ -5,9 +5,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 5d4c959b809..b669bbf30a2 100644 --- a/cmd/rpctest/rpctest/bench3.go +++ b/cmd/rpctest/rpctest/bench3.go @@ -6,9 +6,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 347490ce5a5..65be69d1a8b 100644 --- a/cmd/rpctest/rpctest/bench4.go +++ b/cmd/rpctest/rpctest/bench4.go @@ -5,7 +5,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 f9fcc3c57ae..568671bdf69 100644 --- a/cmd/rpctest/rpctest/bench6.go +++ b/cmd/rpctest/rpctest/bench6.go @@ -5,7 +5,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 2a6dd6b49d5..ed0bd5a3331 100644 --- a/cmd/rpctest/rpctest/bench7.go +++ b/cmd/rpctest/rpctest/bench7.go @@ -5,7 +5,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 9c06fef9697..4f252547ea5 100644 --- a/cmd/rpctest/rpctest/bench9.go +++ b/cmd/rpctest/rpctest/bench9.go @@ -5,9 +5,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 7c1b1953769..2b0c9f3569e 100644 --- a/cmd/rpctest/rpctest/bench_tracecallmany.go +++ b/cmd/rpctest/rpctest/bench_tracecallmany.go @@ -7,10 +7,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 927c93e5004..6bd6c02f0de 100644 --- a/cmd/rpctest/rpctest/bench_tracefilter.go +++ b/cmd/rpctest/rpctest/bench_tracefilter.go @@ -8,7 +8,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 927c0ee9b2e..54fdf4ea520 100644 --- a/cmd/rpctest/rpctest/request_generator.go +++ b/cmd/rpctest/rpctest/request_generator.go @@ -7,12 +7,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 99173249a85..08025d11fab 100644 --- a/cmd/rpctest/rpctest/request_generator_test.go +++ b/cmd/rpctest/rpctest/request_generator_test.go @@ -3,7 +3,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 268fc2c2b16..3d65a98cfe8 100644 --- a/cmd/rpctest/rpctest/type.go +++ b/cmd/rpctest/rpctest/type.go @@ -3,12 +3,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 be7160f9f74..b3c5007368a 100644 --- a/cmd/rpctest/rpctest/utils.go +++ b/cmd/rpctest/rpctest/utils.go @@ -11,12 +11,12 @@ import ( "strings" "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/valyala/fastjson" - "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 7139bed00a3..3a3f34ed677 100644 --- a/cmd/sentinel/main.go +++ b/cmd/sentinel/main.go @@ -16,20 +16,20 @@ import ( "fmt" "os" - "github.com/ledgerwatch/erigon-lib/common/disk" - "github.com/ledgerwatch/erigon-lib/common/mem" - "github.com/ledgerwatch/erigon/cl/clparams" - "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/clparams" + "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/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - 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 a8722c451d6..ff2aa9925c4 100644 --- a/cmd/sentinel/sentinelcli/cliSettings.go +++ b/cmd/sentinel/sentinelcli/cliSettings.go @@ -3,17 +3,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 4a59050d270..3981459636f 100644 --- a/cmd/sentinel/sentinelflags/flags.go +++ b/cmd/sentinel/sentinelflags/flags.go @@ -1,7 +1,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 abd86dca1a9..f907ffba31f 100644 --- a/cmd/sentry/main.go +++ b/cmd/sentry/main.go @@ -4,16 +4,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 96fbde0d845..ba92e60db66 100644 --- a/cmd/silkworm_api/snapshot_idx.go +++ b/cmd/silkworm_api/snapshot_idx.go @@ -5,15 +5,15 @@ import ( "os" "time" - "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" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" ) diff --git a/cmd/snapshots/cmp/cmp.go b/cmd/snapshots/cmp/cmp.go index cd1ebcc8a17..d2afbf92408 100644 --- a/cmd/snapshots/cmp/cmp.go +++ b/cmd/snapshots/cmp/cmp.go @@ -12,23 +12,23 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "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/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 c5f4df13dad..ba4b1f7115d 100644 --- a/cmd/snapshots/copy/copy.go +++ b/cmd/snapshots/copy/copy.go @@ -10,12 +10,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 4230cdabafa..528e56eb198 100644 --- a/cmd/snapshots/main.go +++ b/cmd/snapshots/main.go @@ -8,21 +8,21 @@ import ( "path/filepath" "syscall" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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/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 fe36be79c27..1034e5cb5c9 100644 --- a/cmd/snapshots/manifest/manifest.go +++ b/cmd/snapshots/manifest/manifest.go @@ -14,11 +14,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 e0ef7f87569..88c27de5545 100644 --- a/cmd/snapshots/sync/context.go +++ b/cmd/snapshots/sync/context.go @@ -3,7 +3,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 bba4838b352..77a3e40d32e 100644 --- a/cmd/snapshots/sync/sync.go +++ b/cmd/snapshots/sync/sync.go @@ -17,20 +17,20 @@ import ( "github.com/anacrolix/torrent/metainfo" "github.com/anacrolix/torrent/storage" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" - "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/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 a0a69547bd6..7fc42e6a4ad 100644 --- a/cmd/snapshots/sync/util.go +++ b/cmd/snapshots/sync/util.go @@ -4,7 +4,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 86ad24cb259..754885921af 100644 --- a/cmd/snapshots/torrents/torrents.go +++ b/cmd/snapshots/torrents/torrents.go @@ -11,15 +11,15 @@ 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/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" "github.com/urfave/cli/v2" "golang.org/x/sync/errgroup" ) diff --git a/cmd/snapshots/verify/verify.go b/cmd/snapshots/verify/verify.go index d3547c6f716..07e2756f434 100644 --- a/cmd/snapshots/verify/verify.go +++ b/cmd/snapshots/verify/verify.go @@ -8,11 +8,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/check_change_sets.go b/cmd/state/commands/check_change_sets.go index b6ef244b1b9..616aab061dc 100644 --- a/cmd/state/commands/check_change_sets.go +++ b/cmd/state/commands/check_change_sets.go @@ -11,30 +11,30 @@ import ( "syscall" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" - 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/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + 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/hexutility" + "github.com/erigontech/erigon-lib/kv" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/systemcontracts" - "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/stagedsync/stages" - "github.com/ledgerwatch/erigon/node/nodecfg" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/systemcontracts" + "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/stagedsync/stages" + "github.com/erigontech/erigon/node/nodecfg" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/services" ) var ( diff --git a/cmd/state/commands/check_enc.go b/cmd/state/commands/check_enc.go index 220e0fc92d1..edee7de413c 100644 --- a/cmd/state/commands/check_enc.go +++ b/cmd/state/commands/check_enc.go @@ -1,7 +1,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 2c229a78f49..3d80adc24f5 100644 --- a/cmd/state/commands/check_index.go +++ b/cmd/state/commands/check_index.go @@ -1,8 +1,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 dd81e19aee6..02ceeeed123 100644 --- a/cmd/state/commands/global_flags_vars.go +++ b/cmd/state/commands/global_flags_vars.go @@ -3,10 +3,10 @@ package commands import ( "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/utils" - "github.com/ledgerwatch/erigon/common/paths" + "github.com/erigontech/erigon/cmd/utils" + "github.com/erigontech/erigon/common/paths" ) var ( diff --git a/cmd/state/commands/index_stats.go b/cmd/state/commands/index_stats.go index 907f2fbe3cf..8e24ee12447 100644 --- a/cmd/state/commands/index_stats.go +++ b/cmd/state/commands/index_stats.go @@ -1,7 +1,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 a16f19c0a69..26c2fd61deb 100644 --- a/cmd/state/commands/opcode_tracer.go +++ b/cmd/state/commands/opcode_tracer.go @@ -13,28 +13,28 @@ import ( "syscall" "time" + datadir2 "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - datadir2 "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/spf13/cobra" - 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/kvcfg" - "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" + 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/kvcfg" + "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 a088005f1b9..59b7b1b1883 100644 --- a/cmd/state/commands/root.go +++ b/cmd/state/commands/root.go @@ -6,17 +6,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/state_root.go b/cmd/state/commands/state_root.go index 97fdf885361..4b025a2db5f 100644 --- a/cmd/state/commands/state_root.go +++ b/cmd/state/commands/state_root.go @@ -9,27 +9,27 @@ import ( "path/filepath" "syscall" - chain2 "github.com/ledgerwatch/erigon-lib/chain" - 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/kvcfg" - kv2 "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core" - "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" + chain2 "github.com/erigontech/erigon-lib/chain" + 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/kvcfg" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core" + "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" "github.com/spf13/cobra" - "github.com/ledgerwatch/erigon/consensus/ethash" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/turbo/debug" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/consensus/ethash" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/turbo/debug" + "github.com/erigontech/erigon/turbo/trie" ) func init() { diff --git a/cmd/state/commands/verify_txlookup.go b/cmd/state/commands/verify_txlookup.go index 8dd27671015..04f6d0de42a 100644 --- a/cmd/state/commands/verify_txlookup.go +++ b/cmd/state/commands/verify_txlookup.go @@ -1,8 +1,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/exec22/txtask.go b/cmd/state/exec22/txtask.go index 9225d260fd9..9362c1e178e 100644 --- a/cmd/state/exec22/txtask.go +++ b/cmd/state/exec22/txtask.go @@ -6,14 +6,14 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/state" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "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/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/cmd/state/exec3/calltracer_v3.go b/cmd/state/exec3/calltracer_v3.go index 951e114dfa8..a2422ccd524 100644 --- a/cmd/state/exec3/calltracer_v3.go +++ b/cmd/state/exec3/calltracer_v3.go @@ -1,9 +1,9 @@ package exec3 import ( + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/vm" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" ) type CallTracer struct { diff --git a/cmd/state/exec3/state.go b/cmd/state/exec3/state.go index eef143ebf64..10edbc93423 100644 --- a/cmd/state/exec3/state.go +++ b/cmd/state/exec3/state.go @@ -5,23 +5,23 @@ import ( "math/big" "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - - "github.com/ledgerwatch/erigon/cmd/state/exec22" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + + "github.com/erigontech/erigon/cmd/state/exec22" + "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/core/vm/evmtypes" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/services" ) type Worker struct { diff --git a/cmd/state/exec3/state_recon.go b/cmd/state/exec3/state_recon.go index 0e0ccb474a3..4fc6ebddb81 100644 --- a/cmd/state/exec3/state_recon.go +++ b/cmd/state/exec3/state_recon.go @@ -7,24 +7,24 @@ import ( "sync" "github.com/RoaringBitmap/roaring/roaring64" - "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/etl" - "github.com/ledgerwatch/erigon-lib/kv" - libstate "github.com/ledgerwatch/erigon-lib/state" + "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/ledgerwatch/erigon/cmd/state/exec22" - "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/cmd/state/exec22" + "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/main.go b/cmd/state/main.go index 1343b42ba12..e191489f9df 100644 --- a/cmd/state/main.go +++ b/cmd/state/main.go @@ -1,7 +1,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 0b275436c3c..54617db8086 100644 --- a/cmd/state/stats/index_stats.go +++ b/cmd/state/stats/index_stats.go @@ -12,12 +12,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 e094155dc2f..7dcab553fbe 100644 --- a/cmd/state/verify/check_changeset_enc.go +++ b/cmd/state/verify/check_changeset_enc.go @@ -9,9 +9,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 bc13606f8d4..ad8c871d0db 100644 --- a/cmd/state/verify/check_indexes.go +++ b/cmd/state/verify/check_indexes.go @@ -3,13 +3,13 @@ package verify import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "time" - "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 dcb86652b32..b1dd8945707 100644 --- a/cmd/state/verify/verify_txlookup.go +++ b/cmd/state/verify/verify_txlookup.go @@ -10,16 +10,16 @@ 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/kvcfg" - "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/kvcfg" + "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 31afcefd8fe..4c9327a05df 100644 --- a/cmd/txpool/main.go +++ b/cmd/txpool/main.go @@ -8,31 +8,31 @@ import ( "path/filepath" "time" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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/txpoolutil" - "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/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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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/txpoolutil" + "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/spf13/cobra" - "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/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 12b1f2bdaff..b0c2e68872b 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, has Apache license - 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 @@ -28,10 +28,10 @@ make txpool # --sentry.api.addr - connect to Sentry's grpc api # --txpool.api.addr - other services to connect TxPool's grpc api # Increase limits flags: --txpool.globalslots, --txpool.globalbasefeeslots, --txpool.globalqueue -# --txpool.trace.senders - print more logs about Txs with senders in this list +# --txpool.trace.senders - print more logs about Txs with senders in this list ./build/bin/txpool --private.api.addr=localhost:9090 --sentry.api.addr=localhost:9091 --txpool.api.addr=localhost:9094 --datadir= -# Add flag `--txpool.api.addr` to RPCDaemon +# Add flag `--txpool.api.addr` to RPCDaemon ``` ## ToDo list @@ -41,4 +41,3 @@ make txpool [] Add pool (db table) - where store recently mined txs - for faster unwind/reorg. [] Save history of local transactions - with 1 day expiration [] move tx.rlp field to separated map, to make tx immutable - diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 7ac153d17d5..b4eb8695c25 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -28,41 +28,41 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" "github.com/spf13/pflag" "github.com/urfave/cli/v2" - "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/cmp" - "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/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + libcommon "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/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 be0a8a396b7..0c5bf028288 100644 --- a/cmd/utils/flags/flags.go +++ b/cmd/utils/flags/flags.go @@ -28,7 +28,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 2e75f0bb71c..bc22208a03c 100644 --- a/cmd/verkle/main.go +++ b/cmd/verkle/main.go @@ -8,20 +8,20 @@ import ( "os" "time" - "github.com/ledgerwatch/erigon/cl/utils" + "github.com/erigontech/erigon/cl/utils" "github.com/c2h5oh/datasize" - 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" "go.uber.org/zap/buffer" - "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 ccdb6570c53..ae245d3cd12 100644 --- a/cmd/verkle/verkletrie/incrementAccount.go +++ b/cmd/verkle/verkletrie/incrementAccount.go @@ -6,14 +6,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" + 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/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/types/accounts" + "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 975a2d552e5..326e75f38c5 100644 --- a/cmd/verkle/verkletrie/incrementStorage.go +++ b/cmd/verkle/verkletrie/incrementStorage.go @@ -5,16 +5,16 @@ import ( "sync" "time" + 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/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" + + "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 6908e8761ad..12e514fe129 100644 --- a/cmd/verkle/verkletrie/pedersen_hashstate.go +++ b/cmd/verkle/verkletrie/pedersen_hashstate.go @@ -7,14 +7,14 @@ import ( "sync" "time" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - 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/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 a979623fefc..2a53a220944 100644 --- a/cmd/verkle/verkletrie/verkle_marker.go +++ b/cmd/verkle/verkletrie/verkle_marker.go @@ -3,8 +3,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 6c37a383947..d30c542c858 100644 --- a/cmd/verkle/verkletrie/verkle_tree_writer.go +++ b/cmd/verkle/verkletrie/verkle_tree_writer.go @@ -6,17 +6,17 @@ import ( "time" "github.com/anacrolix/sync" + 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/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" - "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 6be189ae1f6..752a8f1d9ee 100644 --- a/cmd/verkle/verkletrie/workers.go +++ b/cmd/verkle/verkletrie/workers.go @@ -3,11 +3,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 94f6c3b2b2e..aa180e2476f 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -21,9 +21,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 728ccd0fe23..75663e14272 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -20,7 +20,7 @@ package common 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 723f23fa79c..b4f19e295c8 100644 --- a/common/bytes_test.go +++ b/common/bytes_test.go @@ -18,7 +18,7 @@ package common import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "testing" ) diff --git a/common/changeset/accs.go b/common/changeset/accs.go index edc7e4955cf..a12ac675b12 100644 --- a/common/changeset/accs.go +++ b/common/changeset/accs.go @@ -1,14 +1,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 bed671ebbc5..28eb46ff120 100644 --- a/common/changeset/storage_changeset_test.go +++ b/common/changeset/storage_changeset_test.go @@ -3,20 +3,20 @@ package changeset import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "math/rand" "reflect" "strconv" "testing" - 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 d5c8e0867e2..6c0aa9d120c 100644 --- a/common/compiler/solidity.go +++ b/common/compiler/solidity.go @@ -26,7 +26,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.go b/common/debug.go index 8bd0f99a6be..ad0d18ce294 100644 --- a/common/debug.go +++ b/common/debug.go @@ -29,7 +29,7 @@ import ( // Report gives off a warning requesting the user to submit an issue to the github tracker. func Report(extra ...interface{}) { - fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/ledgerwatch/erigon/issues") + fmt.Fprintln(os.Stderr, "You've encountered a sought after, hard to reproduce bug. Please report this to the developers <3 https://github.com/erigontech/erigon/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/debug/log_panic.go b/common/debug/log_panic.go index a90e9e1468f..04ceaf14c60 100644 --- a/common/debug/log_panic.go +++ b/common/debug/log_panic.go @@ -5,8 +5,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 ff6431244c0..93bd5e1f652 100644 --- a/common/debug/memstats.go +++ b/common/debug/memstats.go @@ -4,7 +4,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 ade3e65d1f0..8117870c1df 100644 --- a/common/debugprint/receipts.go +++ b/common/debugprint/receipts.go @@ -3,7 +3,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 5ef9e13d3ba..ce6a046ec26 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -19,7 +19,7 @@ package math import ( "bytes" "encoding/hex" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" "math/big" "testing" ) 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 066861e33d8..d5b793f191d 100644 --- a/common/paths/paths.go +++ b/common/paths/paths.go @@ -7,8 +7,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 9e51849b13f..99e9edfaaef 100644 --- a/common/prque/lazyqueue.go +++ b/common/prque/lazyqueue.go @@ -20,7 +20,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 70113fb80a7..6111da77acb 100644 --- a/common/prque/lazyqueue_test.go +++ b/common/prque/lazyqueue_test.go @@ -22,7 +22,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 21d58434ccd..b3323f63807 100644 --- a/common/types.go +++ b/common/types.go @@ -22,13 +22,13 @@ import ( "encoding/json" "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "reflect" "strings" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "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/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 0e2f9e78d55..b53da32f787 100644 --- a/common/types_test.go +++ b/common/types_test.go @@ -26,7 +26,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 345d5fae800..95dad31fc25 100644 --- a/consensus/aura/aura.go +++ b/consensus/aura/aura.go @@ -24,21 +24,21 @@ import ( "sync/atomic" "time" + "github.com/erigontech/erigon-lib/log/v3" "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/kv" - - "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/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/kv" + + "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/types" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" ) const DEBUG_LOG_FROM = 999_999_999 diff --git a/consensus/aura/aura_test.go b/consensus/aura/aura_test.go index 0219a05ad5c..5733c9aa93a 100644 --- a/consensus/aura/aura_test.go +++ b/consensus/aura/aura_test.go @@ -7,17 +7,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 40cc0d2ba7f..a2aa2ba373f 100644 --- a/consensus/aura/aurainterfaces/interface.go +++ b/consensus/aura/aurainterfaces/interface.go @@ -1,9 +1,9 @@ package aurainterfaces import ( + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" ) // see openethereum/crates/ethcore/res/contracts/block_reward.json diff --git a/consensus/aura/config.go b/consensus/aura/config.go index 00c12b4da27..fb55d7a8360 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 a910625fd9a..58aeb4e1d3a 100644 --- a/consensus/aura/config_test.go +++ b/consensus/aura/config_test.go @@ -6,9 +6,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 4fff77a2df3..015f35c60b1 100644 --- a/consensus/aura/contract_abi.go +++ b/consensus/aura/contract_abi.go @@ -6,11 +6,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 c2f5173e432..5c2e318be8e 100644 --- a/consensus/aura/empty_step.go +++ b/consensus/aura/empty_step.go @@ -5,12 +5,12 @@ import ( "sort" "sync" - "github.com/ledgerwatch/secp256k1" + "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 9871d1430bc..dc36af86c84 100644 --- a/consensus/aura/epoch.go +++ b/consensus/aura/epoch.go @@ -3,10 +3,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 a09e55e8a73..dabe0d8fc48 100644 --- a/consensus/aura/finality_test.go +++ b/consensus/aura/finality_test.go @@ -3,7 +3,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 a2df8f11fd5..aa82a18aeb8 100644 --- a/consensus/aura/gaslimit_override.go +++ b/consensus/aura/gaslimit_override.go @@ -3,15 +3,15 @@ package aura import ( lru "github.com/hashicorp/golang-lru/v2" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/chain" "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/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 e5a3eac27ac..1f31d925d09 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 62ab6ea4bc5..6a291dd8d38 100644 --- a/consensus/aura/types.go +++ b/consensus/aura/types.go @@ -3,8 +3,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 170f075306b..4976045f22a 100644 --- a/consensus/aura/unassemble.go +++ b/consensus/aura/unassemble.go @@ -2,7 +2,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 cbb5b3df61d..bac66da27c5 100644 --- a/consensus/aura/validators.go +++ b/consensus/aura/validators.go @@ -9,19 +9,19 @@ import ( "sync" "sync/atomic" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" 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" + + "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 e5312734761..7610dde1a57 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/chain_reader.go b/consensus/chain_reader.go index fb5070f8950..7e318d408f7 100644 --- a/consensus/chain_reader.go +++ b/consensus/chain_reader.go @@ -4,14 +4,14 @@ import ( "context" "math/big" - "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/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/turbo/services" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" ) // Implements consensus.ChainReader diff --git a/consensus/clique/api.go b/consensus/clique/api.go index b4b298a6ae4..ac34a71d5a5 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.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" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/services" + 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/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 261a943e86b..fad814e8138 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -28,29 +28,29 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/goccy/go-json" 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/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - "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/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/ledgerwatch/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/common" + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/consensus" + "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/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" + "github.com/erigontech/erigon/turbo/services" ) const ( diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index eed22ddd3c7..1755b6f2f0f 100644 --- a/consensus/clique/clique_test.go +++ b/consensus/clique/clique_test.go @@ -20,19 +20,19 @@ import ( "math/big" "testing" + 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" "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" ) // 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 cfb773dcc21..08329154058 100644 --- a/consensus/clique/keys.go +++ b/consensus/clique/keys.go @@ -3,7 +3,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 4b84d60297b..51b361aaab9 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -24,18 +24,18 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" "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/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 45063999050..033acb6b0ef 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -23,21 +23,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, @@ -374,7 +374,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 e7443744104..0b3b8ed8c09 100644 --- a/consensus/clique/verifier.go +++ b/consensus/clique/verifier.go @@ -5,13 +5,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 fae1846d164..5884e46ec9f 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,17 +20,17 @@ package consensus import ( "math/big" + "github.com/erigontech/erigon-lib/log/v3" "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/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" - "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/core/state" + "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 b3fab9d8e14..59ad14c963b 100644 --- a/consensus/ethash/algorithm.go +++ b/consensus/ethash/algorithm.go @@ -27,17 +27,17 @@ import ( "time" "unsafe" - common2 "github.com/ledgerwatch/erigon-lib/common" + common2 "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" "golang.org/x/crypto/sha3" - "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 d9fa5b1d400..9b19944b50a 100644 --- a/consensus/ethash/algorithm_test.go +++ b/consensus/ethash/algorithm_test.go @@ -19,12 +19,12 @@ package ethash import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "io" "reflect" "testing" - "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 0ecd3a819d2..537fc094600 100644 --- a/consensus/ethash/api.go +++ b/consensus/ethash/api.go @@ -18,11 +18,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 e8c239edf2d..7f5e6d54c71 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -25,21 +25,21 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" + "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/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/ethash/ethashcfg" "golang.org/x/crypto/sha3" - "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/types" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" + "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/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 1528c866f52..0742a2714ac 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -24,13 +24,13 @@ import ( "path/filepath" "testing" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" "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/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 91751c1cc77..49d3eb70186 100644 --- a/consensus/ethash/difficulty.go +++ b/consensus/ethash/difficulty.go @@ -19,8 +19,8 @@ package ethash import ( "math/big" + "github.com/erigontech/erigon/core/types" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/core/types" ) const ( diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index 6a48ab111c6..d8d3ec8d4ef 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -34,13 +34,13 @@ 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 db987c51276..90e794e26b0 100644 --- a/consensus/ethash/ethash_test.go +++ b/consensus/ethash/ethash_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - 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/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 c3ba77abfa8..c4b6c87fc12 100644 --- a/consensus/ethash/ethashcfg/ethashcfg.go +++ b/consensus/ethash/ethashcfg/ethashcfg.go @@ -1,7 +1,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 144ee424d35..8325082a7fb 100644 --- a/consensus/ethash/fake.go +++ b/consensus/ethash/fake.go @@ -4,12 +4,12 @@ import ( "time" 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 a75b5c1f06e..62978ce18cc 100644 --- a/consensus/ethash/meter.go +++ b/consensus/ethash/meter.go @@ -6,7 +6,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 048b79f4760..773e4d47514 100644 --- a/consensus/ethash/sealer.go +++ b/consensus/ethash/sealer.go @@ -30,12 +30,12 @@ import ( "github.com/goccy/go-json" - 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/consensus" - "github.com/ledgerwatch/erigon/core/types" + "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 916c84e87c0..92b8cdf08bd 100644 --- a/consensus/ethash/sealer_test.go +++ b/consensus/ethash/sealer_test.go @@ -25,15 +25,15 @@ import ( "testing" "time" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" "github.com/goccy/go-json" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/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 92ab9c8e7e7..bff972b02d1 100644 --- a/consensus/merge/merge.go +++ b/consensus/merge/merge.go @@ -8,17 +8,17 @@ 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/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/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 aee7810cd2f..607b8efb7a1 100644 --- a/consensus/merge/merge_test.go +++ b/consensus/merge/merge_test.go @@ -4,11 +4,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 934a94577df..b3d65d240e4 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,12 +21,12 @@ import ( "errors" "math/big" + "github.com/erigontech/erigon-lib/chain" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/core/state" + "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 f07e80f6236..697dfc7f770 100644 --- a/consensus/misc/eip1559.go +++ b/consensus/misc/eip1559.go @@ -20,16 +20,16 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - libcommon "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" + libcommon "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 c937880ffa0..ba51e4fde67 100644 --- a/consensus/misc/eip1559_test.go +++ b/consensus/misc/eip1559_test.go @@ -20,11 +20,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 39b3d9b8e9a..46d16f2e53f 100644 --- a/consensus/misc/eip2935.go +++ b/consensus/misc/eip2935.go @@ -1,16 +1,16 @@ package misc import ( + "github.com/erigontech/erigon-lib/log/v3" "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/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 a60fc02a0d3..0f850ef434a 100644 --- a/consensus/misc/eip4788.go +++ b/consensus/misc/eip4788.go @@ -1,11 +1,11 @@ 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/params" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/params" ) func ApplyBeaconRootEip4788(parentBeaconBlockRoot *libcommon.Hash, syscall consensus.SystemCall) { diff --git a/consensus/misc/eip4844.go b/consensus/misc/eip4844.go index 9b4eb159fb6..ca40c89d1dd 100644 --- a/consensus/misc/eip4844.go +++ b/consensus/misc/eip4844.go @@ -21,10 +21,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/eip6110.go b/consensus/misc/eip6110.go index 4c4258a5851..be2d06ab050 100644 --- a/consensus/misc/eip6110.go +++ b/consensus/misc/eip6110.go @@ -19,10 +19,10 @@ package misc import ( "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/accounts/abi" - "github.com/ledgerwatch/erigon/core/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/accounts/abi" + "github.com/erigontech/erigon/core/types" ) const ( diff --git a/consensus/misc/eip7002.go b/consensus/misc/eip7002.go index de3d5f12951..ae2272cc36a 100644 --- a/consensus/misc/eip7002.go +++ b/consensus/misc/eip7002.go @@ -1,11 +1,11 @@ package misc import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func DequeueWithdrawalRequests7002(syscall consensus.SystemCall) *types.FlatRequest { diff --git a/consensus/misc/eip7251.go b/consensus/misc/eip7251.go index 01509bc7869..e756b53bd27 100644 --- a/consensus/misc/eip7251.go +++ b/consensus/misc/eip7251.go @@ -1,11 +1,11 @@ package misc import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/params" ) func DequeueConsolidationRequests7251(syscall consensus.SystemCall) *types.FlatRequest { diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go index 16fab48373c..7b2c0ca22cf 100644 --- a/consensus/misc/gaslimit.go +++ b/consensus/misc/gaslimit.go @@ -19,7 +19,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 ce6bdc5585f..cdae4ffcef7 100644 --- a/consensus/misc/pos.go +++ b/consensus/misc/pos.go @@ -1,8 +1,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 bb78d2c92de..83a9fdad76d 100644 --- a/consensus/result.go +++ b/consensus/result.go @@ -3,9 +3,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 28295cfd176..8f3f2db50d3 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,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 05faed18f65..ad4c44c3853 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -23,8 +23,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 936724c2624..84165b86bbd 100644 --- a/core/block_builder_parameters.go +++ b/core/block_builder_parameters.go @@ -1,9 +1,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 57dd9bbb3e7..7c9f935e06f 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -17,7 +17,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 5e94a42aa70..9c8ac6781ab 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -20,17 +20,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 e4f6720a7ad..93dcf5d31f2 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -23,25 +23,25 @@ import ( "slices" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/crypto/sha3" - "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/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/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/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 630cb9b3a0f..2feceba651c 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -17,7 +17,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 9611cb78385..386b9cd4b7a 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -22,22 +22,22 @@ import ( "fmt" "math/big" - "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" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/vm" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/trie" + "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" + "github.com/erigontech/erigon-lib/log/v3" + + "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/vm" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/trie" ) // BlockGen creates blocks for testing. diff --git a/core/error.go b/core/error.go index 9cb7ade5000..48dbe158435 100644 --- a/core/error.go +++ b/core/error.go @@ -19,7 +19,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 f37d7c0a34c..823bd2cbd92 100644 --- a/core/events.go +++ b/core/events.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" ) // NewTxsEvent is posted when a batch of transactions enter the transaction pool. diff --git a/core/evm.go b/core/evm.go index d03158f4f0e..7534cfc1e13 100644 --- a/core/evm.go +++ b/core/evm.go @@ -22,12 +22,12 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/consensus/merge" - "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/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 857f45caf50..6d2f80742b1 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -27,10 +27,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 f9776ad8e8f..32927395a86 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -21,11 +21,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 b7bc3029835..18a8c4b9a8c 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -7,22 +7,22 @@ import ( "os" "testing" + "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/turbo/rpchelper" "github.com/holiman/uint256" - "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/turbo/rpchelper" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/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 9020e898184..e6e223003e4 100644 --- a/core/genesis_write.go +++ b/core/genesis_write.go @@ -28,28 +28,28 @@ import ( "sync" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/config3" - "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/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - - "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/types" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/trie" + + "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/hexutil" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + + "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/types" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/trie" ) // CommitGenesisBlock writes or updates the genesis block in db. diff --git a/core/mkalloc.go b/core/mkalloc.go index bc131af16f5..46ecf400837 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -32,8 +32,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_account.go b/core/rawdb/accessors_account.go index 0607f04648e..327e56d0a0b 100644 --- a/core/rawdb/accessors_account.go +++ b/core/rawdb/accessors_account.go @@ -17,10 +17,10 @@ package rawdb import ( - 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" ) func ReadAccount(db kv.Getter, addr libcommon.Address, acc *accounts.Account) (bool, error) { diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index 2633bc54613..14e0e34cab2 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -27,22 +27,22 @@ import ( "math/big" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon/core/rawdb/utils" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/ethdb/cbor" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon/core/rawdb/utils" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/ethdb/cbor" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon-lib/log/v3" "github.com/gballet/go-verkle" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + + "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/common/hexutility" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" ) // 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 62b57cbc089..1c8ecba65c9 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -24,19 +24,19 @@ import ( "math/big" "testing" - "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/memdb" - "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/params" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "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/memdb" + "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/params" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/stages/mock" "github.com/stretchr/testify/require" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index d661e8ebb05..1468df49665 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -19,11 +19,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 fa3dbbf1c32..81d25df17f6 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -21,14 +21,14 @@ import ( "math/big" "testing" + 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" "github.com/holiman/uint256" - 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" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index c3b0500228b..3c89e26c639 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -21,12 +21,12 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "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 57ed301a3df..1e8e3bfa612 100644 --- a/core/rawdb/blockio/block_writer.go +++ b/core/rawdb/blockio/block_writer.go @@ -4,17 +4,17 @@ import ( "context" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv/backup" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - "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-lib/log/v3" - "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/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-lib/log/v3" + "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 cd1f260c6b2..32364aaa8af 100644 --- a/core/rawdb/bor_receipts.go +++ b/core/rawdb/bor_receipts.go @@ -5,16 +5,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 ee8ecd8c79e..0c60aaf7541 100644 --- a/core/rawdb/rawdbhelpers/rawdbhelpers.go +++ b/core/rawdb/rawdbhelpers/rawdbhelpers.go @@ -3,8 +3,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 aaab2011191..8c0323959d3 100644 --- a/core/rawdb/rawdbreset/reset_stages.go +++ b/core/rawdb/rawdbreset/reset_stages.go @@ -4,21 +4,21 @@ import ( "context" "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/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/backup" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core" - "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/kv/kvcfg" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core" + "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 f849b0146c7..1915238f5cf 100644 --- a/core/rawdb/state_version.go +++ b/core/rawdb/state_version.go @@ -3,7 +3,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/rawdb/utils/block_max_heap.go b/core/rawdb/utils/block_max_heap.go index 1e8332256b7..a626e4dd833 100644 --- a/core/rawdb/utils/block_max_heap.go +++ b/core/rawdb/utils/block_max_heap.go @@ -3,7 +3,7 @@ package utils import ( "container/heap" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // blockMaxHeap stores a (limited-length) priority queue of blocks. diff --git a/core/rawdb/utils/block_max_heap_test.go b/core/rawdb/utils/block_max_heap_test.go index c5523f3be8d..49e013c1fdc 100644 --- a/core/rawdb/utils/block_max_heap_test.go +++ b/core/rawdb/utils/block_max_heap_test.go @@ -4,8 +4,8 @@ import ( "container/heap" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/rawdb/utils" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/rawdb/utils" ) func TestPush(t *testing.T) { diff --git a/core/rlp_test.go b/core/rlp_test.go index d7baff5e4a9..8d59d3f5c69 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -22,18 +22,18 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/crypto/sha3" - "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 55d38fc15ec..ef8d9607b14 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 c34584aa3b7..6a76fb5e8c0 100644 --- a/core/snaptype/block_types.go +++ b/core/snaptype/block_types.go @@ -7,22 +7,22 @@ import ( "fmt" "path/filepath" + "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" "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" ) func init() { diff --git a/core/snaptype/block_types_test.go b/core/snaptype/block_types_test.go index ec704a7a3a9..adf1a76d13e 100644 --- a/core/snaptype/block_types_test.go +++ b/core/snaptype/block_types_test.go @@ -3,7 +3,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 72f9e9a4c75..6341de4c43c 100644 --- a/core/state/access_list.go +++ b/core/state/access_list.go @@ -17,7 +17,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 10b6dab49f9..90d34b7937b 100644 --- a/core/state/access_list_test.go +++ b/core/state/access_list_test.go @@ -3,8 +3,8 @@ package state import ( "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/memdb" ) func verifyAddrs(t *testing.T, s *IntraBlockState, astrings ...string) { diff --git a/core/state/cached_reader.go b/core/state/cached_reader.go index 196d3823344..67c21141524 100644 --- a/core/state/cached_reader.go +++ b/core/state/cached_reader.go @@ -3,10 +3,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_reader2.go b/core/state/cached_reader2.go index 915544319c8..8d614376285 100644 --- a/core/state/cached_reader2.go +++ b/core/state/cached_reader2.go @@ -3,13 +3,13 @@ package state import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" - "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" ) // CachedReader2 is a wrapper for an instance of type StateReader diff --git a/core/state/cached_writer.go b/core/state/cached_writer.go index 1cd916ae382..9f1ad7e621d 100644 --- a/core/state/cached_writer.go +++ b/core/state/cached_writer.go @@ -1,11 +1,11 @@ package state import ( + "github.com/erigontech/erigon-lib/common" "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/core/types/accounts" + "github.com/erigontech/erigon/turbo/shards" ) // CachedWriter is a wrapper for an instance of type StateWriter diff --git a/core/state/change_set_writer.go b/core/state/change_set_writer.go index 59de3a85f86..9f4df879399 100644 --- a/core/state/change_set_writer.go +++ b/core/state/change_set_writer.go @@ -5,13 +5,13 @@ 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/dbutils" - historyv22 "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" + 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" + historyv22 "github.com/erigontech/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) // ChangeSetWriter is a mock StateWriter that accumulates changes in-memory into ChangeSets. 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 651581ebfd3..5e20866166e 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -18,10 +18,10 @@ package state import ( + "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/types/accounts" ) const ( diff --git a/core/state/database_test.go b/core/state/database_test.go index 534605ec278..d7d514f0bbd 100644 --- a/core/state/database_test.go +++ b/core/state/database_test.go @@ -23,28 +23,28 @@ import ( "math/big" "testing" + "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/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/kv/memdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/state/contracts" - "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/ledgerwatch/erigon/turbo/stages/mock" - "github.com/ledgerwatch/erigon/turbo/trie" + "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/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/state/contracts" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/stages/mock" + "github.com/erigontech/erigon/turbo/trie" ) // Create revival problem diff --git a/core/state/db_state_reader.go b/core/state/db_state_reader.go index 11ba22559b8..eb70b6f1df1 100644 --- a/core/state/db_state_reader.go +++ b/core/state/db_state_reader.go @@ -3,13 +3,13 @@ package state import ( "bytes" "encoding/binary" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/VictoriaMetrics/fastcache" - 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" ) // Implements StateReader by wrapping database only, without trie diff --git a/core/state/db_state_writer.go b/core/state/db_state_writer.go index 33c3c762091..f489bd25a61 100644 --- a/core/state/db_state_writer.go +++ b/core/state/db_state_writer.go @@ -8,16 +8,16 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - dbutils2 "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/ethdb" - "github.com/ledgerwatch/erigon/turbo/trie" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + dbutils2 "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/ethdb" + "github.com/erigontech/erigon/turbo/trie" ) // This type is now used in GenerateChain to generate blockchains for the tests (core/chain_makers.go) diff --git a/core/state/dump.go b/core/state/dump.go index 90c255b53db..56d90f08090 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -20,18 +20,18 @@ import ( "bytes" "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - 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" + "github.com/erigontech/erigon-lib/kv/dbutils" + + 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 f3021a79cf5..3de352b7747 100644 --- a/core/state/history_reader_inc.go +++ b/core/state/history_reader_inc.go @@ -4,11 +4,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 661b849aeb3..9dab1f0af98 100644 --- a/core/state/history_reader_v3.go +++ b/core/state/history_reader_v3.go @@ -4,10 +4,10 @@ import ( "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/core/types/accounts" ) // HistoryReaderV3 Implements StateReader and StateWriter diff --git a/core/state/history_test.go b/core/state/history_test.go index eb6e75154dd..600a95ddaaf 100644 --- a/core/state/history_test.go +++ b/core/state/history_test.go @@ -8,24 +8,24 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/davecgh/go-spew/spew" + 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" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" "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/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/state/historyv2read" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/state/historyv2read" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/trie" ) func TestMutationDeleteTimestamp(t *testing.T) { diff --git a/core/state/history_walk.go b/core/state/history_walk.go index 686d3e8905e..855bd7f40f8 100644 --- a/core/state/history_walk.go +++ b/core/state/history_walk.go @@ -4,16 +4,16 @@ import ( "bytes" "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "github.com/RoaringBitmap/roaring/roaring64" - 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" + 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" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/ethdb" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/ethdb" ) // startKey is the concatenation of address and incarnation (BigEndian 8 byte) diff --git a/core/state/historyv2read/history.go b/core/state/historyv2read/history.go index b33680397ae..5e9355db493 100644 --- a/core/state/historyv2read/history.go +++ b/core/state/historyv2read/history.go @@ -3,11 +3,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 51250e430fa..67a377240a1 100644 --- a/core/state/intra_block_state.go +++ b/core/state/intra_block_state.go @@ -23,14 +23,14 @@ import ( "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/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "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/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/turbo/trie" ) type revision struct { diff --git a/core/state/intra_block_state_test.go b/core/state/intra_block_state_test.go index 4a909986a5e..9de4028136e 100644 --- a/core/state/intra_block_state_test.go +++ b/core/state/intra_block_state_test.go @@ -31,10 +31,10 @@ import ( "testing" "testing/quick" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/core/types" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/core/types" ) func TestSnapshotRandom(t *testing.T) { diff --git a/core/state/journal.go b/core/state/journal.go index 4b018dcbfca..8b55bc30011 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -17,8 +17,8 @@ package state import ( + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/plain_readonly.go b/core/state/plain_readonly.go index 127d8a6e2b8..439584f2975 100644 --- a/core/state/plain_readonly.go +++ b/core/state/plain_readonly.go @@ -22,18 +22,18 @@ import ( "fmt" "sort" + "github.com/erigontech/erigon-lib/log/v3" "github.com/google/btree" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - 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/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" + 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/dbutils" + "github.com/erigontech/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon/core/state/historyv2read" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/core/state/historyv2read" + "github.com/erigontech/erigon/core/types/accounts" ) type storageItem struct { diff --git a/core/state/plain_state_reader.go b/core/state/plain_state_reader.go index 0db63b4dcdb..c6400a7c9a7 100644 --- a/core/state/plain_state_reader.go +++ b/core/state/plain_state_reader.go @@ -3,12 +3,12 @@ package state 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 eb3361e58ae..8948b6b6d40 100644 --- a/core/state/plain_state_writer.go +++ b/core/state/plain_state_writer.go @@ -5,12 +5,12 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" - "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" ) var _ WriterWithChangeSets = (*PlainStateWriter)(nil) diff --git a/core/state/recon_state.go b/core/state/recon_state.go index 1bc8fa8a19e..d0c8a061431 100644 --- a/core/state/recon_state.go +++ b/core/state/recon_state.go @@ -10,9 +10,9 @@ import ( "sync" "github.com/RoaringBitmap/roaring/roaring64" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/cmd/state/exec22" "github.com/google/btree" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/cmd/state/exec22" btree2 "github.com/tidwall/btree" ) diff --git a/core/state/recon_writer_inc.go b/core/state/recon_writer_inc.go index a6faade2c8d..19a53fbe352 100644 --- a/core/state/recon_writer_inc.go +++ b/core/state/recon_writer_inc.go @@ -2,14 +2,14 @@ package state import ( "bytes" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + libstate "github.com/erigontech/erigon-lib/state" "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" + "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 43582b40f7e..6333a1225b9 100644 --- a/core/state/rw_v3.go +++ b/core/state/rw_v3.go @@ -10,23 +10,23 @@ import ( "time" "unsafe" + "github.com/erigontech/erigon-lib/kv/temporal" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - "github.com/ledgerwatch/erigon-lib/log/v3" btree2 "github.com/tidwall/btree" - "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/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/metrics" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/cmd/state/exec22" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/shards" + "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/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/metrics" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/cmd/state/exec22" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/shards" ) const CodeSizeTable = "CodeSize" diff --git a/core/state/state_object.go b/core/state/state_object.go index 9d681b6749e..a1392411372 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -22,13 +22,13 @@ import ( "io" "math/big" + 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/crypto" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/trie" + "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 36042fd36d7..f3656cdf3f4 100644 --- a/core/state/state_object_test.go +++ b/core/state/state_object_test.go @@ -20,9 +20,9 @@ import ( "bytes" "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" ) func BenchmarkCutOriginal(b *testing.B) { diff --git a/core/state/state_test.go b/core/state/state_test.go index f0f2242ab25..843bd64e2be 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,16 +21,16 @@ import ( "context" "testing" + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/memdb" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/memdb" checker "gopkg.in/check.v1" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" ) var toAddr = common.BytesToAddress diff --git a/core/state/transient_storage.go b/core/state/transient_storage.go index 39b2535fdf5..92a536fe52e 100644 --- a/core/state/transient_storage.go +++ b/core/state/transient_storage.go @@ -19,7 +19,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_processor.go b/core/state_processor.go index c5b81a49786..c65a7582ad3 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -17,15 +17,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 a0b04a5d714..cfeb100c073 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -22,22 +22,22 @@ import ( "fmt" "slices" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "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/consensus/misc" - "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" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/fixedgas" + "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/consensus/misc" + "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 dc0805a1940..3197193d721 100644 --- a/core/system_contract_lookup.go +++ b/core/system_contract_lookup.go @@ -4,14 +4,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 e9d6d005539..ac4bc4c8ccf 100644 --- a/core/systemcontracts/upgrade.go +++ b/core/systemcontracts/upgrade.go @@ -1,7 +1,7 @@ package systemcontracts import ( - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) var ( diff --git a/core/tx_cacher.go b/core/tx_cacher.go index e4c8cf05781..6be5bb57f02 100644 --- a/core/tx_cacher.go +++ b/core/tx_cacher.go @@ -19,9 +19,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 5746910f9d9..e377436b47e 100644 --- a/core/types/access_list_tx.go +++ b/core/types/access_list_tx.go @@ -26,12 +26,12 @@ 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/rlp" + "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 c89150c7429..78c7d9712ad 100644 --- a/core/types/accounts/account.go +++ b/core/types/accounts/account.go @@ -6,12 +6,12 @@ import ( "math/bits" "sync" + libcommon "github.com/erigontech/erigon-lib/common" + rlp2 "github.com/erigontech/erigon-lib/rlp" "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" + "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 626ece3ebe0..5f5ab7b4f2c 100644 --- a/core/types/accounts/account_benchmark_test.go +++ b/core/types/accounts/account_benchmark_test.go @@ -5,10 +5,10 @@ import ( "io" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "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 9239e6b3fcf..4e5ac31e915 100644 --- a/core/types/accounts/account_proof.go +++ b/core/types/accounts/account_proof.go @@ -1,9 +1,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 25eb2038876..e808244fab6 100644 --- a/core/types/accounts/account_test.go +++ b/core/types/accounts/account_test.go @@ -3,10 +3,10 @@ package accounts import ( "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) func TestEmptyAccount(t *testing.T) { diff --git a/core/types/authorization.go b/core/types/authorization.go index e171e095415..5d6f681b83e 100644 --- a/core/types/authorization.go +++ b/core/types/authorization.go @@ -8,13 +8,13 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - libcrypto "github.com/ledgerwatch/erigon-lib/crypto" - rlp2 "github.com/ledgerwatch/erigon-lib/rlp" - "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" + libcrypto "github.com/erigontech/erigon-lib/crypto" + rlp2 "github.com/erigontech/erigon-lib/rlp" + "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 ba0f6d15735..438fe6a1d85 100644 --- a/core/types/blacklist.go +++ b/core/types/blacklist.go @@ -1,7 +1,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 fd715230a7e..1116c6e3627 100644 --- a/core/types/blob_tx.go +++ b/core/types/blob_tx.go @@ -8,13 +8,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 93f11bec775..bfe6f645021 100644 --- a/core/types/blob_tx_wrapper.go +++ b/core/types/blob_tx_wrapper.go @@ -9,13 +9,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 66632bd66c4..8fea9be4296 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -29,12 +29,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 f0d043d34e4..7a8f01d8808 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -24,21 +24,21 @@ import ( "reflect" "testing" + 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/go-test/deep" "github.com/holiman/uint256" - 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/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "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 07ba1f9583b..1c2ebe910f2 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -21,10 +21,10 @@ import ( "fmt" "math/big" - "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 d6e2a469254..474b360a89c 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -21,10 +21,10 @@ import ( "math/big" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) func TestBloom(t *testing.T) { diff --git a/core/types/dynamic_fee_tx.go b/core/types/dynamic_fee_tx.go index 7e92999fc3f..0a5ad3d9951 100644 --- a/core/types/dynamic_fee_tx.go +++ b/core/types/dynamic_fee_tx.go @@ -24,12 +24,12 @@ 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/rlp" + "github.com/erigontech/erigon/rlp" ) type DynamicFeeTransaction struct { diff --git a/core/types/eip7685_requests.go b/core/types/eip7685_requests.go index 6fbdf935e64..bb5c31a10ac 100644 --- a/core/types/eip7685_requests.go +++ b/core/types/eip7685_requests.go @@ -19,7 +19,7 @@ package types import ( "crypto/sha256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) const DepositRequestType byte = 0x00 diff --git a/core/types/encdec_test.go b/core/types/encdec_test.go index f5f8d553a11..5e210c24ebe 100644 --- a/core/types/encdec_test.go +++ b/core/types/encdec_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" + "github.com/erigontech/erigon/rlp" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/rlp" ) const RUNS = 100 // for local tests increase this number diff --git a/core/types/gen_aura_seal.go b/core/types/gen_aura_seal.go index 98d57809650..04d95486605 100644 --- a/core/types/gen_aura_seal.go +++ b/core/types/gen_aura_seal.go @@ -5,8 +5,8 @@ package types import ( "encoding/json" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon/common/math" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon/common/math" ) // MarshalJSON marshals as JSON. 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 d4370665ef1..d0086166ca4 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 842a41e6be1..89b0110fb29 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutility" "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" ) 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 89658f575f5..f85a9063c2e 100644 --- a/core/types/genesis.go +++ b/core/types/genesis.go @@ -24,13 +24,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 eb363872531..1ef1fcfffb4 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -21,14 +21,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 56d5e8235d4..014f8b7b804 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -5,11 +5,11 @@ import ( "fmt" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/turbo/trie" + "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 4a28719791b..24c6e99c3c2 100644 --- a/core/types/legacy_tx.go +++ b/core/types/legacy_tx.go @@ -22,13 +22,13 @@ import ( "io" "math/big" + "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/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/rlp" + "github.com/erigontech/erigon/rlp" ) type CommonTx struct { diff --git a/core/types/log.go b/core/types/log.go index 54d3c71d31e..baf8d77c6b6 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -17,13 +17,13 @@ package types import ( - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "io" - 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 199a72390f2..e3e829a0412 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -22,10 +22,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 0e8cd9993ef..2b27cbed305 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -23,11 +23,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 @@ -37,7 +37,7 @@ import ( // - https://github.com/ugorji/go/commit/8286c2dc986535d23e3fad8d3e816b9dd1e5aea6 // however updating the lib has caused us issues in the past, and we don't have good unit test coverage for updating atm // we also use this for storing Receipts and Logs in the DB - we won't be doing that in Erigon 3 -// do not regen, more context: https://github.com/ledgerwatch/erigon/pull/10105#pullrequestreview-2027423601 +// do not regen, more context: https://github.com/erigontech/erigon/pull/10105#pullrequestreview-2027423601 // go:generate codecgen -o receipt_codecgen_gen.go -r "^Receipts$|^Receipt$|^Logs$|^Log$" -st "codec" -j=false -nx=true -ta=true -oe=false -d 2 receipt.go log.go var ( diff --git a/core/types/receipt_codecgen_gen.go b/core/types/receipt_codecgen_gen.go index e2bc7db9db1..9df90203930 100644 --- a/core/types/receipt_codecgen_gen.go +++ b/core/types/receipt_codecgen_gen.go @@ -7,7 +7,7 @@ package types import ( "errors" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" codec1978 "github.com/ugorji/go/codec" pkg2_big "math/big" "runtime" diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go index 4eb2f1a9d67..8886c188018 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -24,14 +24,14 @@ import ( "reflect" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "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" + "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/set_code_tx.go b/core/types/set_code_tx.go index 7d4c92d3995..55aaa915be1 100644 --- a/core/types/set_code_tx.go +++ b/core/types/set_code_tx.go @@ -7,13 +7,13 @@ import ( "io" "math/big" + "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/params" + "github.com/erigontech/erigon/rlp" "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/params" - "github.com/ledgerwatch/erigon/rlp" ) const DelegateDesignationCodeSize = 23 diff --git a/core/types/state_data.go b/core/types/state_data.go index 03d1a221137..21bb3a3ed4b 100644 --- a/core/types/state_data.go +++ b/core/types/state_data.go @@ -1,7 +1,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 bec6d13cf9f..f1f5974cd7b 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -24,18 +24,18 @@ import ( "math/big" "sync/atomic" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/protolambda/ztyp/codec" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - libcrypto "github.com/ledgerwatch/erigon-lib/crypto" - 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" + libcrypto "github.com/erigontech/erigon-lib/crypto" + types2 "github.com/erigontech/erigon-lib/types" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/rlp" ) var ( diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index 16065df6d87..63511454cdd 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -6,14 +6,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 dadc1a69bca..9c9a918602e 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,15 +22,15 @@ import ( "fmt" "math/big" + "github.com/erigontech/secp256k1" "github.com/holiman/uint256" - "github.com/ledgerwatch/secp256k1" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - libcrypto "github.com/ledgerwatch/erigon-lib/crypto" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + libcrypto "github.com/erigontech/erigon-lib/crypto" - "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 6c669f5f9fd..63e199f0d5b 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "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 141394978e2..0117cd83eda 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -33,18 +33,18 @@ 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" - types2 "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" + types2 "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 286a6e75fce..4535492de94 100644 --- a/core/types/withdrawal.go +++ b/core/types/withdrawal.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/types/clonable" - "github.com/ledgerwatch/erigon/rlp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutil" + "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_test.go b/core/types/withdrawal_test.go index 65824cc3a67..19f2c29f0e5 100644 --- a/core/types/withdrawal_test.go +++ b/core/types/withdrawal_test.go @@ -3,7 +3,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 8392c602bcf..896923a16ca 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -19,10 +19,10 @@ package vm import ( "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/crypto" + "github.com/erigontech/erigon/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 46009cd3ffb..06dd051a5b0 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -19,8 +19,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 7d6d7daa6ba..593993b69c6 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -17,8 +17,8 @@ package vm import ( + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 7cc287334e9..1fe2ebde6d2 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -28,18 +28,18 @@ 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" - libcrypto "github.com/ledgerwatch/erigon-lib/crypto" - "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" + libcrypto "github.com/erigontech/erigon-lib/crypto" + "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 99bfb8d0d10..e5fbd30e3c9 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -24,9 +24,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 244d5dfc41a..6f6905c2f9d 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -22,10 +22,10 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/params" ) var activators = map[int]func(*JumpTable){ diff --git a/core/vm/evm.go b/core/vm/evm.go index 5dc5a8627ce..cd0e2a92565 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -21,13 +21,13 @@ 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/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/common/u256" + "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 9ef0efa7ed4..733e0be5643 100644 --- a/core/vm/evm_test.go +++ b/core/vm/evm_test.go @@ -4,9 +4,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 c67ddab0d37..bb8c2b1d4f5 100644 --- a/core/vm/evmtypes/evmtypes.go +++ b/core/vm/evmtypes/evmtypes.go @@ -5,11 +5,11 @@ 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/types" + "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 90b39100c3e..d6b4b9f61e6 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -21,11 +21,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 8f52ace30e3..ef7f2294eb4 100644 --- a/core/vm/gas_table_test.go +++ b/core/vm/gas_table_test.go @@ -23,18 +23,18 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/kv/memdb" "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/core/state" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + + "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 c906959dbd0..19f8518b441 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -20,15 +20,15 @@ import ( "fmt" "math" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "golang.org/x/crypto/sha3" - "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/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/common" + "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 62f5304e267..0808afbf9dd 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -27,16 +27,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 58ecf4f559f..46027006428 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,11 +19,11 @@ package vm import ( "math/big" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" "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/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 78e7fb2a6c2..bb315d6f650 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -20,12 +20,12 @@ import ( "hash" "sync" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/math" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/math" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/vm/stack" + "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 9097e9cd71b..16bba0b2f5f 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -19,8 +19,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 5677233f97a..b38b9cb472a 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -17,10 +17,10 @@ package vm import ( + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "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 0207f792bc9..cda2d2b82ae 100644 --- a/core/vm/memory_table.go +++ b/core/vm/memory_table.go @@ -16,7 +16,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 f304e9eb256..103d7947f3c 100644 --- a/core/vm/memory_test.go +++ b/core/vm/memory_test.go @@ -5,7 +5,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 de0a632f454..bf4f451a001 100644 --- a/core/vm/mock_vm.go +++ b/core/vm/mock_vm.go @@ -4,10 +4,10 @@ import ( "fmt" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/core/state" ) type readonlyGetSetter interface { diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index 6a7fe1a45ec..886aeb78000 100644 --- a/core/vm/operations_acl.go +++ b/core/vm/operations_acl.go @@ -19,12 +19,12 @@ package vm import ( "errors" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/math" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/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" ) func makeGasSStoreFunc(clearingRefund uint64) gasFunc { diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 14489a78dd7..f470f473d97 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,10 +17,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 e401a7e6133..eb7d894c28e 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -22,14 +22,14 @@ import ( "math/big" "time" + "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/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" "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/kv/memdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/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 753e3f97f4c..8a34819a976 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -18,9 +18,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 29812de17c2..1c7088ed6ef 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -24,20 +24,20 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - - "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/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/kv/memdb" + + "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/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 TestDefaults(t *testing.T) { diff --git a/core/vm/stack/stack.go b/core/vm/stack/stack.go index 1ae60181d8d..b53eae6964b 100644 --- a/core/vm/stack/stack.go +++ b/core/vm/stack/stack.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" ) var stackPool = sync.Pool{ diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 1642e0d4905..af187f89099 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -17,7 +17,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 ff575dc6c15..69b204543bd 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -32,12 +32,12 @@ 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/crypto/cryptopool" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon/common/math" + "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 c5167d70754..3c7de4cb928 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -26,10 +26,10 @@ import ( "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" + "github.com/erigontech/erigon/common" ) 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 0ea11872ad2..e572d788984 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -23,8 +23,8 @@ import ( "crypto/elliptic" "fmt" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/secp256k1" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/secp256k1" ) // Ecrecover returns the uncompressed public key that created the given signature. diff --git a/crypto/signature_test.go b/crypto/signature_test.go index 98336d43505..fd5f873fddf 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -19,12 +19,12 @@ package crypto import ( "bytes" "crypto/ecdsa" - "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" "reflect" "testing" - "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 8b9bde12910..e1ac598dbd6 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 5cb84d44cac..e4dc2af8fd1 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 6aeab140103..78a629a8068 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 6eaae544cd3..02a508fd89e 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 7a38d8b19e5..6c3a3d2f914 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 65a2cff29f5..4df77268a46 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 46b54a61de3..3e89ac973e4 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 d788d1cc06d..23706bee398 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 7931463e10a..6fb4ec5f21c 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 8dba8c4d626..b3b231d9e17 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/profile.go b/diagnostics/profile.go index 20ed970102d..4a9a16e3bfd 100644 --- a/diagnostics/profile.go +++ b/diagnostics/profile.go @@ -22,7 +22,7 @@ import ( "runtime/pprof" "strings" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" + diaglib "github.com/erigontech/erigon-lib/diagnostics" ) func SetupProfileAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient) { diff --git a/diagnostics/setup.go b/diagnostics/setup.go index 461dccebad0..2462bd0e50e 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 69e5018b5af..9fa810820d3 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/sysinfo.go b/diagnostics/sysinfo.go index 25bf705bd9e..402eaad688b 100644 --- a/diagnostics/sysinfo.go +++ b/diagnostics/sysinfo.go @@ -22,8 +22,8 @@ import ( "net/http" "runtime/pprof" - diaglib "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/sysutils" + diaglib "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/sysutils" ) func SetupSysInfoAccess(metricsMux *http.ServeMux, diag *diaglib.DiagnosticClient) { diff --git a/diagnostics/version.go b/diagnostics/version.go index 520ea05dc01..e35f6f3f104 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/db_faq.md b/docs/programmers_guide/db_faq.md index a7f84a1e440..df2c64f3a37 100644 --- a/docs/programmers_guide/db_faq.md +++ b/docs/programmers_guide/db_faq.md @@ -5,7 +5,7 @@ There are 2 options exist: 1. call --private.api.addr there is grpc interface with low-level data access methods - can read any data in any order, - etc... Interface is here: https://github.com/ledgerwatch/interfaces/blob/master/remote/kv.proto + etc... Interface is here: https://github.com/erigontech/interfaces/blob/master/remote/kv.proto Go/C++/Rust libs already exist. Names of buckets and their format you can find in `bucket.go` You can do such calls by network. 2. Read Erigon's db while Erigon is running - it's also ok - just need be careful - do not run too long read @@ -30,7 +30,6 @@ Rationale and Architecture of DB interface: [./../../ethdb/Readme.md](../../ethd MDBX: [docs](https://libmdbx.website.yandexcloud.net) and [mdbx.h](https://github.com/erigontech/libmdbx/blob/master/mdbx.h) - ### How RAM used Erigon will use all available RAM, but this RAM will not belong to Erigon’s process. OS will own all this @@ -44,4 +43,3 @@ from RAM not from Disk). Shared memory. This also means - if you restart Erigon - PageCache will stay alive. Because it doesn’t belongs to Erigon. After machine reboot - warmup takes ~10min - Erigon will getting faster during this time (but we don’t have special code to warmup) - Erigon will just do usual work. - diff --git a/docs/programmers_guide/dupsort.md b/docs/programmers_guide/dupsort.md index d652d6f82c4..f0fee786f18 100644 --- a/docs/programmers_guide/dupsort.md +++ b/docs/programmers_guide/dupsort.md @@ -1,5 +1,4 @@ -DupSort feature explanation -=========================== +# DupSort feature explanation If KV database has no concept of "Buckets/Tables/Collections" then all keys must have "Prefix". For example to store Block bodies and headers need use `b` and `h` prefixes: @@ -30,8 +29,7 @@ Let's look at ChangeSets. If block N changed account A from value X to Y: - `A` - key inside Sub-Table - `X` - value inside Sub-Table -MDBX supports -------------- +## MDBX supports MDBX supports "tables" (it uses name DBI) and supports "sub-tables" (DupSort DBI). @@ -40,7 +38,7 @@ MDBX supports "tables" (it uses name DBI) and supports "sub-tables" (DupSort DBI Duplicate keys may be used in the database. (Or, from another perspective, keys may have multiple data items, stored in sorted order.) By default keys must be unique and may have only a single data item. -``` +``` MDBX stores keys in Tree(B+Tree), and keys of sub-tables in sub-Tree (which is linked to Tree of table). @@ -56,7 +54,7 @@ Common pattern to iterate over whole 'normal' table (without sub-table) in a pse cursor := transaction.OpenCursor(tableName) for k, v := cursor.Seek(key); k != nil; k, v = cursor.Next() { // logic works with 'k' and 'v' variables -} +} ``` Iterate over table with sub-table: @@ -65,13 +63,12 @@ Iterate over table with sub-table: cursor := transaction.OpenCursor(tableName) for k, _ := cursor.SeekDup(subTableName, keyInSubTable); k != nil; k, _ = cursor.Next() { // logic works with 'k1', 'k' and 'v' variables -} +} ``` Enough straight forward. No performance penalty (only profit from smaller database size). -MDBX in-depth -------------- +## MDBX in-depth Max key size: 2022byte (same for key of sub-Table) Let's look at ChangeSets. If block N changed account A from value X to Y: @@ -86,12 +83,12 @@ Let's look at ChangeSets. If block N changed account A from value X to Y: ------------------------------------------------------------------------------------------ table | sub-table-name | keyAndValueJoinedTogether (no 'value' column) ------------------------------------------------------------------------------------------ - 'ChangeSets' | - | {1} | {A}+{X} + 'ChangeSets' | + | {1} | {A}+{X} | | {A2}+{X2} - | {2} | {A3}+{X3} + | {2} | {A3}+{X3} | | {A4}+{X4} - | ... | ... + | ... | ... ``` It's a bit unexpected, but doesn't change much. All operations are still work: @@ -112,20 +109,19 @@ Loc - location hash (key of storage) ------------------------------------------------------------------------------------------ table | sub-table-name | keyAndValueJoinedTogether (no 'value' column) ------------------------------------------------------------------------------------------ -'StorageChanges' | +'StorageChanges' | | {1}+{A}+{inc1} | {Loc1}+{X} | | {Loc2}+{X2} | | {Loc3}+{X3} | {2}+{A}+{inc1} | {Loc4}+{X4} | | {Loc5}+{X5} | | {Loc6}+{X6} - | | ... - ``` + | | ... +``` Because column "keyAndValueJoinedTogether" is stored as key - it has same size limit: 551byte -MDBX, can you do better? ------------------------- +## MDBX, can you do better? By default, for each key MDBX does store small metadata (size of data). Indices by nature - store much-much keys. @@ -147,14 +143,10 @@ It means in 1 db call you can Get/Put up to 4Kb of sub-table keys. [see mdbx.h](https://github.com/erigontech/libmdbx/blob/master/mdbx.h) -Erigon ---------- +## Erigon 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 662b52a7e78..f09447675e0 100644 --- a/erigon-lib/Makefile +++ b/erigon-lib/Makefile @@ -61,11 +61,11 @@ protoc-clean: grpc: protoc-all go mod vendor - PATH="$(GOBIN):$(PATH)" protoc --proto_path=vendor/github.com/ledgerwatch/interfaces --go_out=gointerfaces -I=$(PROTOC_INCLUDE) \ + PATH="$(GOBIN):$(PATH)" protoc --proto_path=vendor/github.com/erigontech/interfaces --go_out=gointerfaces -I=$(PROTOC_INCLUDE) \ types/types.proto - PATH="$(GOBIN):$(PATH)" protoc --proto_path=vendor/github.com/ledgerwatch/interfaces --go_out=gointerfaces --go-grpc_out=gointerfaces -I=$(PROTOC_INCLUDE) \ - --go_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon-lib/gointerfaces/types \ - --go-grpc_opt=Mtypes/types.proto=github.com/ledgerwatch/erigon-lib/gointerfaces/types \ + PATH="$(GOBIN):$(PATH)" protoc --proto_path=vendor/github.com/erigontech/interfaces --go_out=gointerfaces --go-grpc_out=gointerfaces -I=$(PROTOC_INCLUDE) \ + --go_opt=Mtypes/types.proto=github.com/erigontech/erigon-lib/gointerfaces/types \ + --go-grpc_opt=Mtypes/types.proto=github.com/erigontech/erigon-lib/gointerfaces/types \ p2psentry/sentry.proto p2psentinel/sentinel.proto \ remote/kv.proto remote/ethbackend.proto \ downloader/downloader.proto execution/execution.proto \ diff --git a/erigon-lib/chain/aura_config.go b/erigon-lib/chain/aura_config.go index a8fa90190f2..01b6059e10d 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 4f3313105af..7dc9bd7a914 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 990202dd1c7..36cfaa9775e 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 6b41d708c6a..0304e63c73f 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 5fa28e03037..16721775c8b 100644 --- a/erigon-lib/chain/snapcfg/util.go +++ b/erigon-lib/chain/snapcfg/util.go @@ -10,10 +10,10 @@ import ( "strconv" "strings" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - snapshothashes "github.com/ledgerwatch/erigon-snapshot" - "github.com/ledgerwatch/erigon-snapshot/webseed" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/downloader/snaptype" + snapshothashes "github.com/erigontech/erigon-snapshot" + "github.com/erigontech/erigon-snapshot/webseed" "github.com/pelletier/go-toml/v2" "github.com/tidwall/btree" ) @@ -22,8 +22,6 @@ var ( Mainnet = fromToml(snapshothashes.Mainnet) // Holesky = fromToml(snapshothashes.Holesky) Sepolia = fromToml(snapshothashes.Sepolia) - Goerli = fromToml(snapshothashes.Goerli) - Mumbai = fromToml(snapshothashes.Mumbai) Amoy = fromToml(snapshothashes.Amoy) BorMainnet = fromToml(snapshothashes.BorMainnet) Gnosis = fromToml(snapshothashes.Gnosis) @@ -383,8 +381,6 @@ var knownPreverified = map[string]Preverified{ networkname.MainnetChainName: Mainnet, // networkname.HoleskyChainName: HoleskyChainSnapshotCfg, networkname.SepoliaChainName: Sepolia, - networkname.GoerliChainName: Goerli, - networkname.MumbaiChainName: Mumbai, networkname.AmoyChainName: Amoy, networkname.BorMainnetChainName: BorMainnet, networkname.GnosisChainName: Gnosis, @@ -458,8 +454,6 @@ func VersionedCfg(networkName string, preferred snaptype.Version, min snaptype.V var KnownWebseeds = map[string][]string{ networkname.MainnetChainName: webseedsParse(webseed.Mainnet), networkname.SepoliaChainName: webseedsParse(webseed.Sepolia), - networkname.GoerliChainName: webseedsParse(webseed.Goerli), - networkname.MumbaiChainName: webseedsParse(webseed.Mumbai), networkname.AmoyChainName: webseedsParse(webseed.Amoy), networkname.BorMainnetChainName: webseedsParse(webseed.BorMainnet), networkname.GnosisChainName: webseedsParse(webseed.Gnosis), diff --git a/erigon-lib/chain/snapcfg/util_test.go b/erigon-lib/chain/snapcfg/util_test.go index bb53b26a017..d169b267683 100644 --- a/erigon-lib/chain/snapcfg/util_test.go +++ b/erigon-lib/chain/snapcfg/util_test.go @@ -1,7 +1,7 @@ package snapcfg import ( - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/downloader/snaptype" "testing" ) diff --git a/erigon-lib/commitment/bin_patricia_hashed.go b/erigon-lib/commitment/bin_patricia_hashed.go index dbde37440a9..84d6c848d72 100644 --- a/erigon-lib/commitment/bin_patricia_hashed.go +++ b/erigon-lib/commitment/bin_patricia_hashed.go @@ -24,13 +24,13 @@ import ( "io" "math/bits" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "golang.org/x/crypto/sha3" - "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" ) const ( diff --git a/erigon-lib/commitment/bin_patricia_hashed_test.go b/erigon-lib/commitment/bin_patricia_hashed_test.go index 941b638f5d8..de39d880828 100644 --- a/erigon-lib/commitment/bin_patricia_hashed_test.go +++ b/erigon-lib/commitment/bin_patricia_hashed_test.go @@ -8,7 +8,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 a51cfcb59ce..252102be983 100644 --- a/erigon-lib/commitment/commitment.go +++ b/erigon-lib/commitment/commitment.go @@ -10,7 +10,7 @@ import ( "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) // Trie represents commitment variant. diff --git a/erigon-lib/commitment/hex_patricia_hashed.go b/erigon-lib/commitment/hex_patricia_hashed.go index e6dc2918e5f..7f3bb74ae5d 100644 --- a/erigon-lib/commitment/hex_patricia_hashed.go +++ b/erigon-lib/commitment/hex_patricia_hashed.go @@ -26,13 +26,13 @@ import ( "math/bits" "strings" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "golang.org/x/crypto/sha3" - "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 a44d4e7c865..f6742f3ea75 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_bench_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_bench_test.go @@ -5,7 +5,7 @@ import ( "math/rand" "testing" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/common/length" ) func Benchmark_HexPatriciaHahsed_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 e1e772b8385..0373695a24e 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_fuzz_test.go @@ -12,7 +12,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 3798701c7c5..1328986a142 100644 --- a/erigon-lib/commitment/hex_patricia_hashed_test.go +++ b/erigon-lib/commitment/hex_patricia_hashed_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/length" + "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 6bbb71ddb0b..9d20a494052 100644 --- a/erigon-lib/commitment/patricia_state_mock_test.go +++ b/erigon-lib/commitment/patricia_state_mock_test.go @@ -10,8 +10,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 4ad22034520..4befa70acf8 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 2687074ef2a..fbec2d0b38b 100644 --- a/erigon-lib/common/bytes4.go +++ b/erigon-lib/common/bytes4.go @@ -8,8 +8,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 092e451f64e..38b6cac47fd 100644 --- a/erigon-lib/common/bytes48.go +++ b/erigon-lib/common/bytes48.go @@ -8,8 +8,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 bd407e8aaf3..9f1dac476e4 100644 --- a/erigon-lib/common/bytes64.go +++ b/erigon-lib/common/bytes64.go @@ -7,8 +7,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 e15850d2e33..8a0caeb0aaf 100644 --- a/erigon-lib/common/bytes96.go +++ b/erigon-lib/common/bytes96.go @@ -8,8 +8,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 2808b5258e8..b48a5b7c2d8 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 c56faea87eb..58c92b0a91d 100644 --- a/erigon-lib/common/datadir/dirs.go +++ b/erigon-lib/common/datadir/dirs.go @@ -23,8 +23,8 @@ import ( "path/filepath" "syscall" + "github.com/erigontech/erigon-lib/common/dir" "github.com/gofrs/flock" - "github.com/ledgerwatch/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/experiments.go b/erigon-lib/common/dbg/experiments.go index ebf0b64dd11..706846e1618 100644 --- a/erigon-lib/common/dbg/experiments.go +++ b/erigon-lib/common/dbg/experiments.go @@ -25,10 +25,10 @@ import ( "sync" "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/mmap" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/mmap" ) var ( diff --git a/erigon-lib/common/dbg/leak_detector.go b/erigon-lib/common/dbg/leak_detector.go index 728b7c70155..182178f8006 100644 --- a/erigon-lib/common/dbg/leak_detector.go +++ b/erigon-lib/common/dbg/leak_detector.go @@ -7,7 +7,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 2a411b7d044..50281c7150b 100644 --- a/erigon-lib/common/disk/common.go +++ b/erigon-lib/common/disk/common.go @@ -4,7 +4,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 171c4da191c..abfd870f9c0 100644 --- a/erigon-lib/common/disk/disk.go +++ b/erigon-lib/common/disk/disk.go @@ -8,7 +8,7 @@ import ( "github.com/shirou/gopsutil/v4/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 02a9ba6c0c5..4189053cadd 100644 --- a/erigon-lib/common/disk/disk_darwin.go +++ b/erigon-lib/common/disk/disk_darwin.go @@ -5,7 +5,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 96e5b0a9ff5..95d5f0ddc91 100644 --- a/erigon-lib/common/disk/disk_linux.go +++ b/erigon-lib/common/disk/disk_linux.go @@ -6,7 +6,7 @@ import ( "os" "runtime" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" "github.com/shirou/gopsutil/v4/process" ) diff --git a/erigon-lib/common/eth2shuffle/shuffle_bench_test.go b/erigon-lib/common/eth2shuffle/shuffle_bench_test.go index 45fe2027642..4f4e6cbe38e 100644 --- a/erigon-lib/common/eth2shuffle/shuffle_bench_test.go +++ b/erigon-lib/common/eth2shuffle/shuffle_bench_test.go @@ -4,7 +4,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 1f5cfda530c..716d60be832 100644 --- a/erigon-lib/common/eth2shuffle/shuffle_test.go +++ b/erigon-lib/common/eth2shuffle/shuffle_test.go @@ -10,7 +10,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 a2353a4e6b9..4fdfb9302b6 100644 --- a/erigon-lib/common/hash.go +++ b/erigon-lib/common/hash.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/mem/common.go b/erigon-lib/common/mem/common.go index 0402effbed2..d6425c35c78 100644 --- a/erigon-lib/common/mem/common.go +++ b/erigon-lib/common/mem/common.go @@ -8,10 +8,10 @@ import ( "runtime" "time" - "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" "github.com/shirou/gopsutil/v4/process" ) diff --git a/erigon-lib/common/mem/mem_linux.go b/erigon-lib/common/mem/mem_linux.go index 843e3222e6e..a07171f33bb 100644 --- a/erigon-lib/common/mem/mem_linux.go +++ b/erigon-lib/common/mem/mem_linux.go @@ -8,7 +8,7 @@ import ( "github.com/shirou/gopsutil/v4/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 d9772d40b73..b7f776ebdc5 100644 --- a/erigon-lib/common/metrics/block_metrics.go +++ b/erigon-lib/common/metrics/block_metrics.go @@ -3,9 +3,9 @@ package metrics import ( "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/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 3e8f6dc2ff0..d546517f497 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/crypto/secp256k1_test.go b/erigon-lib/crypto/secp256k1_test.go index 717ce7a06fb..a093b4a7f25 100644 --- a/erigon-lib/crypto/secp256k1_test.go +++ b/erigon-lib/crypto/secp256k1_test.go @@ -24,7 +24,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/common/u256" ) func TestTransactionSignatureIsValid(t *testing.T) { 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 7a34f40f3c3..a7fec652caa 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 764b632b2e8..7fb2a39bd32 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_download.go b/erigon-lib/diagnostics/snapshots_download.go index e5a18b12713..8745b836282 100644 --- a/erigon-lib/diagnostics/snapshots_download.go +++ b/erigon-lib/diagnostics/snapshots_download.go @@ -19,7 +19,7 @@ package diagnostics import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func (d *DiagnosticClient) runSnapshotListener(rootCtx context.Context) { diff --git a/erigon-lib/diagnostics/snapshots_indexing.go b/erigon-lib/diagnostics/snapshots_indexing.go index 74dfc4d0bea..4ed032fd380 100644 --- a/erigon-lib/diagnostics/snapshots_indexing.go +++ b/erigon-lib/diagnostics/snapshots_indexing.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func (d *DiagnosticClient) runSegmentIndexingListener(rootCtx context.Context) { diff --git a/erigon-lib/diagnostics/snapshots_test.go b/erigon-lib/diagnostics/snapshots_test.go index f3d1ad3982a..55cb5bd36d3 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 cf5f61a557b..fc18d95c2a4 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 f89d8913093..0e7202119f9 100644 --- a/erigon-lib/diagnostics/sys_info.go +++ b/erigon-lib/diagnostics/sys_info.go @@ -24,10 +24,10 @@ import ( "github.com/shirou/gopsutil/v4/disk" "github.com/shirou/gopsutil/v4/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 0f78c7a4a62..0b97941315c 100644 --- a/erigon-lib/diagnostics/utils.go +++ b/erigon-lib/diagnostics/utils.go @@ -22,8 +22,8 @@ import ( "reflect" "time" - "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 1c5a6d439e7..6393d0566d6 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 319e3bcd1d2..37534c57c74 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/downloader" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloader" "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 7d100a5ee03..5fe84dd9022 100644 --- a/erigon-lib/direct/eth_backend_client.go +++ b/erigon-lib/direct/eth_backend_client.go @@ -20,8 +20,8 @@ import ( "context" "io" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/types" "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 74d56b2281b..5728b26f7ff 100644 --- a/erigon-lib/direct/execution_client.go +++ b/erigon-lib/direct/execution_client.go @@ -19,8 +19,8 @@ package direct import ( "context" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "github.com/erigontech/erigon-lib/gointerfaces/types" "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 c6db989e0cc..9c1eb0bf9f4 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/txpool" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/types" "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 f029ec60f40..7dcf3144006 100644 --- a/erigon-lib/direct/sentinel_client.go +++ b/erigon-lib/direct/sentinel_client.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" + "github.com/erigontech/erigon-lib/gointerfaces/sentinel" "google.golang.org/grpc" ) diff --git a/erigon-lib/direct/sentry_client.go b/erigon-lib/direct/sentry_client.go index 9655d062654..042d0381687 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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon-lib/gointerfaces/types" ) const ( diff --git a/erigon-lib/direct/sentry_client_mock.go b/erigon-lib/direct/sentry_client_mock.go index 3cf18f11298..2493aee4e76 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" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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 8c798c10546..8a30c0fa713 100644 --- a/erigon-lib/direct/state_diff_client.go +++ b/erigon-lib/direct/state_diff_client.go @@ -20,7 +20,7 @@ import ( "context" "io" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/remote" "google.golang.org/grpc" ) diff --git a/erigon-lib/direct/txpool_client.go b/erigon-lib/direct/txpool_client.go index 5e54409b640..056321945f1 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/txpool" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/types" "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 1dbc1e26f18..68edcd38e64 100644 --- a/erigon-lib/diskutils/diskutils.go +++ b/erigon-lib/diskutils/diskutils.go @@ -3,7 +3,7 @@ package diskutils import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) func MountPointForDirPath(dirPath string) string { diff --git a/erigon-lib/diskutils/diskutils_darwin.go b/erigon-lib/diskutils/diskutils_darwin.go index 6ea4b87b577..677c22d370b 100644 --- a/erigon-lib/diskutils/diskutils_darwin.go +++ b/erigon-lib/diskutils/diskutils_darwin.go @@ -8,7 +8,7 @@ import ( "os/exec" "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/README.md b/erigon-lib/downloader/README.md index 9624e0b759d..37a12a06e75 100644 --- a/erigon-lib/downloader/README.md +++ b/erigon-lib/downloader/README.md @@ -6,12 +6,12 @@ The diagram below shows the components used to manage downloads between torrents # Operations -By default the downloader will try to use the underlying bittorrent library to download files from peers and web peers. +By default the downloader will try to use the underlying bittorrent library to download files from peers and web peers. -However this can result in slow or stalled downloads. When this happens [rclone](https://rclone.org/) can be used as an auxiliary process to aid the download process. When it is availible the download library will pass downloads to rclone under the following circumstances: +However this can result in slow or stalled downloads. When this happens [rclone](https://rclone.org/) can be used as an auxiliary process to aid the download process. When it is availible the download library will pass downloads to rclone under the following circumstances: -* There are no torrent peers available for a file -* There is not torrent info available for a file, but a torrent file with a matching info hash can be found on the webseeds +- There are no torrent peers available for a file +- There is not torrent info available for a file, but a torrent file with a matching info hash can be found on the webseeds To enable [rclone](https://rclone.org/) should be installed on the local machine and its executable added to the `PATH` in the environment so that it can be launched by erigon. @@ -19,20 +19,20 @@ For web downloading no additional configuration is necessary as the downloader w # Configuration/Control Files -The sections below describe the roles of the various control structures shown in the diagram above. They combine to perform the following management and control functions: +The sections below describe the roles of the various control structures shown in the diagram above. They combine to perform the following management and control functions: -* Definition of verified well know hashes for segment files - which identifies a known trusted universe of files (**chain.toml**) +- Definition of verified well know hashes for segment files - which identifies a known trusted universe of files (**chain.toml**) -* Management of the competion state of the local download process (**BittorrentInfo**) +- Management of the competion state of the local download process (**BittorrentInfo**) -* Definition of the accepted local hash set which are used to ensure that the local snapshots retain a consistent specified view as other defenitions in the environment changes. i.e. chain.toml gets re-versioned or BittorentInfo gets reset (**snapshot-lock.json**). +- Definition of the accepted local hash set which are used to ensure that the local snapshots retain a consistent specified view as other defenitions in the environment changes. i.e. chain.toml gets re-versioned or BittorentInfo gets reset (**snapshot-lock.json**). -* Ability to override downloaded files with locally defined alternatives, for development or to fix errors and omissions (**snapshot-lock.json**) +- Ability to override downloaded files with locally defined alternatives, for development or to fix errors and omissions (**snapshot-lock.json**) ## chain.toml -This is an embedded file which gets its contents from the [erigon snapshots repository](!https://github.com/ledgerwatch/erigon-snapshot) during the erigon build process. It contains -the `well know` hash for a particular segment file in the following format. +This is an embedded file which gets its contents from the [erigon snapshots repository](!https://github.com/erigontech/erigon-snapshot) during the erigon build process. It contains +the `well know` hash for a particular segment file in the following format. ```toml 'v1-000000-000100-beaconblocks.seg' = 'eaee23c3db187c8be69e332b4ff50aa73380d0ef' @@ -43,38 +43,37 @@ the `well know` hash for a particular segment file in the following format. Where multiple version of files exists there may be several likes per segment and the code in the released Erigon version will select the version that it is interesting. -As this file ise versioned as part of the Erigon release process the file to hash mapping can potentially change between releases. This can potentially cause an issue for running Erigon node which expect the downloads in the snapshots directory to remain constant, which is why a seperate file is used to record the hases used by the process when it originally downloaded its files. +As this file ise versioned as part of the Erigon release process the file to hash mapping can potentially change between releases. This can potentially cause an issue for running Erigon node which expect the downloads in the snapshots directory to remain constant, which is why a seperate file is used to record the hases used by the process when it originally downloaded its files. ## snapshot-lock.json -This is a file which resides in the /snapshots directory for an Erigon node. It is created when the node performs its initial download. It contains the list of downloaded files and their respective hashes. +This is a file which resides in the /snapshots directory for an Erigon node. It is created when the node performs its initial download. It contains the list of downloaded files and their respective hashes. -When a `snapshot-lock` file exists it is used reather than the chain.toml file to determine which files should be downloaded. This means that the directory contents can be maintained event if Erigon is re-versioned and the chain.toml contents change. +When a `snapshot-lock` file exists it is used reather than the chain.toml file to determine which files should be downloaded. This means that the directory contents can be maintained event if Erigon is re-versioned and the chain.toml contents change. ### Deleting snapshot-lock.json -If the snapshot-lock file is deleted it will be reacreated from the `chain.toml` file embeded in the Erigon process. If the hashes change then the associated files will be re-downloaded. +If the snapshot-lock file is deleted it will be reacreated from the `chain.toml` file embeded in the Erigon process. If the hashes change then the associated files will be re-downloaded. ### How to override downloads -As the `snapshot-lock` is used as the master hash list by the executing process the `.seg` file used by the process can be changes by changing its associated hash. there are two models of operation here: +As the `snapshot-lock` is used as the master hash list by the executing process the `.seg` file used by the process can be changes by changing its associated hash. there are two models of operation here: -* If the associated `.seg.` file is deleted and the hash changes and new file will be deleted. +- If the associated `.seg.` file is deleted and the hash changes and new file will be deleted. -* If a replacement file is incerted into the directory and the hash changes to the hash of that file, the file will be used - with no download. - * If no other method to determing the file hash exists, the hash of the new file will be printed by the process on start-up if it does not match the `snapshot-lock` entry and this can be used to insert the hash into the ``snapshot-lock` +- If a replacement file is incerted into the directory and the hash changes to the hash of that file, the file will be used - with no download. + - If no other method to determing the file hash exists, the hash of the new file will be printed by the process on start-up if it does not match the `snapshot-lock` entry and this can be used to insert the hash into the ``snapshot-lock` ## BittorrentInfo (in the downloader db) -This is an internal db table used for managing the state of the download from either the torrent or its associated web host. It has been created to manage the fact that the internal torrent library does not necessarily manage the overall download state of the file assocaited with a has completely consistently. +This is an internal db table used for managing the state of the download from either the torrent or its associated web host. It has been created to manage the fact that the internal torrent library does not necessarily manage the overall download state of the file assocaited with a has completely consistently. It contains the following entries -||| -|----|------| -| Name | The unqualified name of the file being downloaded. e.g. `v1-000000-000500-transactions.seg`. This field is treated as the primary key for the table, there can only be one download per file. | -| Hash | The hash of the file being downloaded. This value can change if the external hash received either from `chain.toml` or `snapshot-lock.json` changes. If the hash changes the entry is treated as a new download and the `Length` and `Completed` fields are reset. -| Length | The length of the file downloaded. This may be avilible from the torrent info - but in general is only completed once the file has been downloaded. | -| Created | The date and time that this record was created, or that the `Hash` field changed, effectively making this an new download. | -| Completed | This is the date and time that the download was completed. The presence of a completion date is also used as an indication of completion. If the field is nil then the download is treated as incomplete | - +| | | +| --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Name | The unqualified name of the file being downloaded. e.g. `v1-000000-000500-transactions.seg`. This field is treated as the primary key for the table, there can only be one download per file. | +| Hash | The hash of the file being downloaded. This value can change if the external hash received either from `chain.toml` or `snapshot-lock.json` changes. If the hash changes the entry is treated as a new download and the `Length` and `Completed` fields are reset. | +| Length | The length of the file downloaded. This may be avilible from the torrent info - but in general is only completed once the file has been downloaded. | +| Created | The date and time that this record was created, or that the `Hash` field changed, effectively making this an new download. | +| Completed | This is the date and time that the download was completed. The presence of a completion date is also used as an indication of completion. If the field is nil then the download is treated as incomplete | diff --git a/erigon-lib/downloader/downloader.go b/erigon-lib/downloader/downloader.go index 232d9c74c23..9867ff2b571 100644 --- a/erigon-lib/downloader/downloader.go +++ b/erigon-lib/downloader/downloader.go @@ -46,22 +46,22 @@ import ( "github.com/anacrolix/torrent/storage" "github.com/anacrolix/torrent/types/infohash" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/tidwall/btree" "golang.org/x/sync/errgroup" "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/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" ) // Downloader - component which downloading historical files. Can use BitTorrent, or other protocols @@ -2580,7 +2580,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 7b964d69ba0..033e12fbc39 100644 --- a/erigon-lib/downloader/downloader_grpc_server.go +++ b/erigon-lib/downloader/downloader_grpc_server.go @@ -24,12 +24,12 @@ import ( "time" "github.com/anacrolix/torrent/metainfo" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloader" + prototypes "github.com/erigontech/erigon-lib/gointerfaces/types" ) var ( diff --git a/erigon-lib/downloader/downloader_test.go b/erigon-lib/downloader/downloader_test.go index 87cde378fce..8517d7020b3 100644 --- a/erigon-lib/downloader/downloader_test.go +++ b/erigon-lib/downloader/downloader_test.go @@ -6,10 +6,10 @@ import ( "testing" lg "github.com/anacrolix/log" - "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" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/downloader/downloadercfg/downloadercfg.go b/erigon-lib/downloader/downloadercfg/downloadercfg.go index ceea74d6edb..328b7787a8c 100644 --- a/erigon-lib/downloader/downloadercfg/downloadercfg.go +++ b/erigon-lib/downloader/downloadercfg/downloadercfg.go @@ -29,10 +29,10 @@ import ( lg "github.com/anacrolix/log" "github.com/anacrolix/torrent" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "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/dir" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/time/rate" ) diff --git a/erigon-lib/downloader/downloadercfg/logger.go b/erigon-lib/downloader/downloadercfg/logger.go index 70b6de87c1c..fbbd1e1b131 100644 --- a/erigon-lib/downloader/downloadercfg/logger.go +++ b/erigon-lib/downloader/downloadercfg/logger.go @@ -21,7 +21,7 @@ import ( "strings" 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 c5a85230f78..71e2ec53112 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/downloader" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloader" + prototypes "github.com/erigontech/erigon-lib/gointerfaces/types" "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 32e38ea4d2d..d779827b10a 100644 --- a/erigon-lib/downloader/mdbx_piece_completion.go +++ b/erigon-lib/downloader/mdbx_piece_completion.go @@ -23,8 +23,8 @@ 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/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" ) const ( diff --git a/erigon-lib/downloader/mdbx_piece_completion_test.go b/erigon-lib/downloader/mdbx_piece_completion_test.go index a594e3dd897..d97a7251db0 100644 --- a/erigon-lib/downloader/mdbx_piece_completion_test.go +++ b/erigon-lib/downloader/mdbx_piece_completion_test.go @@ -19,7 +19,7 @@ package downloader import ( "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/memdb" "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 b6587b137e5..5878b6e52c7 100644 --- a/erigon-lib/downloader/rclone.go +++ b/erigon-lib/downloader/rclone.go @@ -25,10 +25,10 @@ import ( "golang.org/x/time/rate" "github.com/c2h5oh/datasize" - "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" "github.com/spaolacci/murmur3" "golang.org/x/sync/errgroup" ) diff --git a/erigon-lib/downloader/rclone_test.go b/erigon-lib/downloader/rclone_test.go index cc1debcba09..fd2d3bf0b2a 100644 --- a/erigon-lib/downloader/rclone_test.go +++ b/erigon-lib/downloader/rclone_test.go @@ -8,8 +8,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 d4567ea8bd5..ce6803fc87d 100644 --- a/erigon-lib/downloader/snaptype/caplin_types_test.go +++ b/erigon-lib/downloader/snaptype/caplin_types_test.go @@ -3,7 +3,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 7628ff3e1e7..94335fd93f8 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 3568efc18bc..90d3324ca16 100644 --- a/erigon-lib/downloader/snaptype/type.go +++ b/erigon-lib/downloader/snaptype/type.go @@ -12,14 +12,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 4007713c5f9..ae249a0cc01 100644 --- a/erigon-lib/downloader/torrent_files.go +++ b/erigon-lib/downloader/torrent_files.go @@ -12,7 +12,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 b8bde68c0ca..38730c33b67 100644 --- a/erigon-lib/downloader/util.go +++ b/erigon-lib/downloader/util.go @@ -33,17 +33,17 @@ import ( "github.com/anacrolix/torrent" "github.com/anacrolix/torrent/bencode" "github.com/anacrolix/torrent/metainfo" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "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/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" ) // 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 fe08c18bfcc..c8838845b40 100644 --- a/erigon-lib/downloader/webseed.go +++ b/erigon-lib/downloader/webseed.go @@ -16,13 +16,13 @@ import ( "github.com/anacrolix/torrent" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/chain/snapcfg" "golang.org/x/sync/errgroup" "github.com/anacrolix/torrent/bencode" "github.com/anacrolix/torrent/metainfo" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon-lib/log/v3" "github.com/pelletier/go-toml/v2" ) diff --git a/erigon-lib/etl/README.md b/erigon-lib/etl/README.md index 9a97c270673..386811c6d52 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/devel/eth/stagedsync/README.md). +ETL framework is most commonly used in [staged sync](https://github.com/erigontech/erigon/blob/devel/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 a05f1614c08..6bc631dd702 100644 --- a/erigon-lib/etl/buffers.go +++ b/erigon-lib/etl/buffers.go @@ -25,7 +25,7 @@ import ( "strconv" "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 739085fcaf5..1161b133cf0 100644 --- a/erigon-lib/etl/collector.go +++ b/erigon-lib/etl/collector.go @@ -27,11 +27,11 @@ import ( "time" "github.com/c2h5oh/datasize" - "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/common/dir" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/dir" + "github.com/erigontech/erigon-lib/kv" ) type LoadNextFunc func(originalK, k, v []byte) error diff --git a/erigon-lib/etl/dataprovider.go b/erigon-lib/etl/dataprovider.go index 11bafa07b88..84001296b63 100644 --- a/erigon-lib/etl/dataprovider.go +++ b/erigon-lib/etl/dataprovider.go @@ -24,7 +24,7 @@ import ( "os" "path/filepath" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/errgroup" ) diff --git a/erigon-lib/etl/etl.go b/erigon-lib/etl/etl.go index c840c7ff1a6..4beccb5a795 100644 --- a/erigon-lib/etl/etl.go +++ b/erigon-lib/etl/etl.go @@ -23,9 +23,9 @@ import ( "time" "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 8bec18ec345..485dc8a7090 100644 --- a/erigon-lib/etl/etl_test.go +++ b/erigon-lib/etl/etl_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "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" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/go.mod b/erigon-lib/go.mod index 7696c01440e..ceba467508e 100644 --- a/erigon-lib/go.mod +++ b/erigon-lib/go.mod @@ -1,12 +1,11 @@ -module github.com/ledgerwatch/erigon-lib +module github.com/erigontech/erigon-lib go 1.22.0 require ( + github.com/erigontech/interfaces v0.0.0-20241024161200-024ffe1cabff github.com/erigontech/mdbx-go v0.27.24 - github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb - github.com/ledgerwatch/interfaces v0.0.0-20241024161200-024ffe1cabff - github.com/ledgerwatch/secp256k1 v1.0.0 + github.com/erigontech/secp256k1 v1.1.0 github.com/rs/dnscache v0.0.0-20211102005908-e0241e321417 ) @@ -21,6 +20,7 @@ require ( github.com/crate-crypto/go-kzg-4844 v0.7.0 github.com/deckarep/golang-set/v2 v2.3.1 github.com/edsrzf/mmap-go v1.1.0 + github.com/erigontech/erigon-snapshot v0.0.0-00010101000000-000000000000 github.com/go-stack/stack v1.8.1 github.com/gofrs/flock v0.8.1 github.com/google/btree v1.1.2 @@ -144,3 +144,7 @@ require ( ) replace github.com/anacrolix/torrent => github.com/erigontech/torrent v1.54.2-alpha-8 + +replace github.com/erigontech/erigon-snapshot => github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb + +replace github.com/erigontech/interfaces => github.com/ledgerwatch/interfaces v0.0.0-20241024161200-024ffe1cabff diff --git a/erigon-lib/go.sum b/erigon-lib/go.sum index 24a43317cb5..dc2af783e7a 100644 --- a/erigon-lib/go.sum +++ b/erigon-lib/go.sum @@ -143,6 +143,8 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erigontech/mdbx-go v0.27.24 h1:jNsRE/4jC1F3S5SpAbmgT5jrEkfrdFk2MKEL9toVPxo= github.com/erigontech/mdbx-go v0.27.24/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= +github.com/erigontech/secp256k1 v1.1.0 h1:mO3YJMUSoASE15Ya//SoHiisptUhdXExuMUN1M0X9qY= +github.com/erigontech/secp256k1 v1.1.0/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= github.com/erigontech/speedtest v0.0.2/go.mod h1:vulsRNiM51BmSTbVtch4FWxKxx53pS2D35lZTtao0bw= github.com/erigontech/torrent v1.54.2-alpha-8 h1:MQobu6sUZCFbmWpsB7GqAh0IWs7VAZ370POaVxlApIk= @@ -272,8 +274,6 @@ github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb h1:b github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= github.com/ledgerwatch/interfaces v0.0.0-20241024161200-024ffe1cabff h1:9etvVb6JwBGEZS4KqzArjVn7prwTDmNVVH8t63N6Y5c= github.com/ledgerwatch/interfaces v0.0.0-20241024161200-024ffe1cabff/go.mod h1:ugQv1QllJzBny3cKZKxUrSnykkjkBgm27eQM6dnGAcc= -github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= -github.com/ledgerwatch/secp256k1 v1.0.0/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= diff --git a/erigon-lib/gointerfaces/downloader/downloader.pb.go b/erigon-lib/gointerfaces/downloader/downloader.pb.go index e241643f3db..bc89ed4b462 100644 --- a/erigon-lib/gointerfaces/downloader/downloader.pb.go +++ b/erigon-lib/gointerfaces/downloader/downloader.pb.go @@ -7,7 +7,7 @@ package downloader import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/execution/execution.pb.go b/erigon-lib/gointerfaces/execution/execution.pb.go index 1210bdcd30b..29076f0a833 100644 --- a/erigon-lib/gointerfaces/execution/execution.pb.go +++ b/erigon-lib/gointerfaces/execution/execution.pb.go @@ -7,7 +7,7 @@ package execution import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/execution/execution_grpc.pb.go b/erigon-lib/gointerfaces/execution/execution_grpc.pb.go index d00f3ba9491..81839f63a62 100644 --- a/erigon-lib/gointerfaces/execution/execution_grpc.pb.go +++ b/erigon-lib/gointerfaces/execution/execution_grpc.pb.go @@ -8,7 +8,7 @@ package execution import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remote/ethbackend.pb.go b/erigon-lib/gointerfaces/remote/ethbackend.pb.go index c00c5d00c3b..308eb1c0e26 100644 --- a/erigon-lib/gointerfaces/remote/ethbackend.pb.go +++ b/erigon-lib/gointerfaces/remote/ethbackend.pb.go @@ -7,7 +7,7 @@ package remote import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/remote/ethbackend_grpc.pb.go b/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go index be36356ac72..06bac39b71f 100644 --- a/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go +++ b/erigon-lib/gointerfaces/remote/ethbackend_grpc.pb.go @@ -8,7 +8,7 @@ package remote import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remote/kv.pb.go b/erigon-lib/gointerfaces/remote/kv.pb.go index 822f4d19d3e..d969cd5a6b6 100644 --- a/erigon-lib/gointerfaces/remote/kv.pb.go +++ b/erigon-lib/gointerfaces/remote/kv.pb.go @@ -7,7 +7,7 @@ package remote import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/remote/kv_client_mock.go b/erigon-lib/gointerfaces/remote/kv_client_mock.go index 8d0b208e92f..4140506c2b8 100644 --- a/erigon-lib/gointerfaces/remote/kv_client_mock.go +++ b/erigon-lib/gointerfaces/remote/kv_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/remote (interfaces: KVClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/remote (interfaces: KVClient) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/remote/kv_grpc.pb.go b/erigon-lib/gointerfaces/remote/kv_grpc.pb.go index 56977fd552f..f9407979697 100644 --- a/erigon-lib/gointerfaces/remote/kv_grpc.pb.go +++ b/erigon-lib/gointerfaces/remote/kv_grpc.pb.go @@ -8,7 +8,7 @@ package remote import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/remote/kv_state_changes_client_mock.go b/erigon-lib/gointerfaces/remote/kv_state_changes_client_mock.go index 02b061aab16..28bd68183f4 100644 --- a/erigon-lib/gointerfaces/remote/kv_state_changes_client_mock.go +++ b/erigon-lib/gointerfaces/remote/kv_state_changes_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/remote (interfaces: KV_StateChangesClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/remote (interfaces: KV_StateChangesClient) // // Generated by this command: // diff --git a/erigon-lib/gointerfaces/remote/sort.go b/erigon-lib/gointerfaces/remote/sort.go index f61407bf0fd..9e8d5efcbc0 100644 --- a/erigon-lib/gointerfaces/remote/sort.go +++ b/erigon-lib/gointerfaces/remote/sort.go @@ -3,7 +3,7 @@ package remote import ( "strings" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/types" ) func NodeInfoReplyCmp(i, j *types.NodeInfoReply) int { diff --git a/erigon-lib/gointerfaces/remote/sort_test.go b/erigon-lib/gointerfaces/remote/sort_test.go index c9455d9aa9c..7132d27662e 100644 --- a/erigon-lib/gointerfaces/remote/sort_test.go +++ b/erigon-lib/gointerfaces/remote/sort_test.go @@ -4,8 +4,8 @@ import ( "slices" "testing" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/types" "github.com/stretchr/testify/assert" ) diff --git a/erigon-lib/gointerfaces/sentinel/sentinel.pb.go b/erigon-lib/gointerfaces/sentinel/sentinel.pb.go index 1ba10c903b8..85b5ec0e111 100644 --- a/erigon-lib/gointerfaces/sentinel/sentinel.pb.go +++ b/erigon-lib/gointerfaces/sentinel/sentinel.pb.go @@ -7,7 +7,7 @@ package sentinel import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" diff --git a/erigon-lib/gointerfaces/sentry/sentry.pb.go b/erigon-lib/gointerfaces/sentry/sentry.pb.go index 0f2ab5d8714..f41712f45b0 100644 --- a/erigon-lib/gointerfaces/sentry/sentry.pb.go +++ b/erigon-lib/gointerfaces/sentry/sentry.pb.go @@ -7,7 +7,7 @@ package sentry import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/sentry/sentry_client_mock.go b/erigon-lib/gointerfaces/sentry/sentry_client_mock.go index f17b8731e8a..739dd80164b 100644 --- a/erigon-lib/gointerfaces/sentry/sentry_client_mock.go +++ b/erigon-lib/gointerfaces/sentry/sentry_client_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/sentry (interfaces: SentryClient) +// Source: github.com/erigontech/erigon-lib/gointerfaces/sentry (interfaces: SentryClient) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/sentry/sentry_grpc.pb.go b/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go index 30931a2f590..ebc93dd8673 100644 --- a/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go +++ b/erigon-lib/gointerfaces/sentry/sentry_grpc.pb.go @@ -8,7 +8,7 @@ package sentry import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/sentry/sentry_server_mock.go b/erigon-lib/gointerfaces/sentry/sentry_server_mock.go index b8b7c87039c..cfaf1496e12 100644 --- a/erigon-lib/gointerfaces/sentry/sentry_server_mock.go +++ b/erigon-lib/gointerfaces/sentry/sentry_server_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon-lib/gointerfaces/sentry (interfaces: SentryServer) +// Source: github.com/erigontech/erigon-lib/gointerfaces/sentry (interfaces: SentryServer) // // Generated by this command: // @@ -13,7 +13,7 @@ import ( context "context" reflect "reflect" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" gomock "go.uber.org/mock/gomock" emptypb "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/gointerfaces/txpool/mining.pb.go b/erigon-lib/gointerfaces/txpool/mining.pb.go index 284a768d4a2..b40ccce168f 100644 --- a/erigon-lib/gointerfaces/txpool/mining.pb.go +++ b/erigon-lib/gointerfaces/txpool/mining.pb.go @@ -7,7 +7,7 @@ package txpool import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/txpool/mining_grpc.pb.go b/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go index 75e47a608b1..dbb6eab72ed 100644 --- a/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpool/mining_grpc.pb.go @@ -8,7 +8,7 @@ package txpool import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/erigon-lib/gointerfaces/txpool/txpool.pb.go b/erigon-lib/gointerfaces/txpool/txpool.pb.go index c5f08051e25..95def62a49d 100644 --- a/erigon-lib/gointerfaces/txpool/txpool.pb.go +++ b/erigon-lib/gointerfaces/txpool/txpool.pb.go @@ -7,7 +7,7 @@ package txpool import ( - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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/txpool/txpool_grpc.pb.go b/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go index 5abdd5cb588..c551d999fd7 100644 --- a/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go +++ b/erigon-lib/gointerfaces/txpool/txpool_grpc.pb.go @@ -8,7 +8,7 @@ package txpool import ( context "context" - types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types "github.com/erigontech/erigon-lib/gointerfaces/types" 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 e2dd156a551..6b45c1d783b 100644 --- a/erigon-lib/gointerfaces/type_utils.go +++ b/erigon-lib/gointerfaces/type_utils.go @@ -16,8 +16,8 @@ package gointerfaces import ( "encoding/binary" + "github.com/erigontech/erigon-lib/gointerfaces/types" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" ) func ConvertH2048ToBloom(h2048 *types.H2048) [256]byte { diff --git a/erigon-lib/gointerfaces/version.go b/erigon-lib/gointerfaces/version.go index 3adc946022d..06b7a9bff02 100644 --- a/erigon-lib/gointerfaces/version.go +++ b/erigon-lib/gointerfaces/version.go @@ -19,7 +19,7 @@ package gointerfaces import ( "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/types" ) type Version struct { diff --git a/erigon-lib/kv/Readme.md b/erigon-lib/kv/Readme.md index 4075fce0151..1faffde5cc7 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/devel/docs/programmers_guide/dupsort.md) + If your are not familiar with "DupSort" concept, please read [dupsort.md](https://github.com/erigontech/erigon/blob/devel/docs/programmers_guide/dupsort.md) diff --git a/erigon-lib/kv/backup/backup.go b/erigon-lib/kv/backup/backup.go index 11a14263a6a..4d7f9fcba4c 100644 --- a/erigon-lib/kv/backup/backup.go +++ b/erigon-lib/kv/backup/backup.go @@ -11,12 +11,12 @@ import ( "time" "github.com/c2h5oh/datasize" + 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" "github.com/erigontech/mdbx-go/mdbx" - 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" "golang.org/x/exp/maps" "golang.org/x/sync/errgroup" "golang.org/x/sync/semaphore" diff --git a/erigon-lib/kv/bitmapdb/bitmapdb.go b/erigon-lib/kv/bitmapdb/bitmapdb.go index 0311eb60712..1cd99ec4be3 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 b3a4e9bfc02..77641c46966 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/dbutils/composite_keys.go b/erigon-lib/kv/dbutils/composite_keys.go index 2be332fbfee..abac0acd007 100644 --- a/erigon-lib/kv/dbutils/composite_keys.go +++ b/erigon-lib/kv/dbutils/composite_keys.go @@ -5,8 +5,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 619225a1b47..24d35f46b4a 100644 --- a/erigon-lib/kv/dbutils/composite_keys_test.go +++ b/erigon-lib/kv/dbutils/composite_keys_test.go @@ -3,8 +3,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 394cf82feec..59bdf53ffa1 100644 --- a/erigon-lib/kv/dbutils/history_index.go +++ b/erigon-lib/kv/dbutils/history_index.go @@ -1,7 +1,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 3f8ccf7dbc4..c9c2f00dd68 100644 --- a/erigon-lib/kv/helpers.go +++ b/erigon-lib/kv/helpers.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" + "github.com/erigontech/erigon-lib/common" "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/erigon-lib/common" ) // Adapts an RoDB to the RwDB interface (invoking write operations results in error) diff --git a/erigon-lib/kv/iter/iter.go b/erigon-lib/kv/iter/iter.go index 64c825f1d39..1eae94be079 100644 --- a/erigon-lib/kv/iter/iter.go +++ b/erigon-lib/kv/iter/iter.go @@ -20,7 +20,7 @@ import ( "bytes" "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/iter/iter_test.go b/erigon-lib/kv/iter/iter_test.go index 2c0a02a1ba3..e92b05ae2a1 100644 --- a/erigon-lib/kv/iter/iter_test.go +++ b/erigon-lib/kv/iter/iter_test.go @@ -22,10 +22,10 @@ import ( "fmt" "testing" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/order" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/kv_interface.go b/erigon-lib/kv/kv_interface.go index 5a02dc3cd49..d94e3559dd0 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/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" + "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 700029a4fa1..3d6a6ce971e 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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 0f119831afe..8d27f71237c 100644 --- a/erigon-lib/kv/kvcache/cache_test.go +++ b/erigon-lib/kv/kvcache/cache_test.go @@ -22,11 +22,11 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/kvcache/dummy.go b/erigon-lib/kv/kvcache/dummy.go index 68697d0039e..ee6869d674c 100644 --- a/erigon-lib/kv/kvcache/dummy.go +++ b/erigon-lib/kv/kvcache/dummy.go @@ -18,8 +18,8 @@ package kvcache import ( "context" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 5c68771e45d..99f5bb255d4 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 92181ab8440..754f97549b7 100644 --- a/erigon-lib/kv/mdbx/kv_abstract_test.go +++ b/erigon-lib/kv/mdbx/kv_abstract_test.go @@ -23,19 +23,19 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "google.golang.org/grpc" "google.golang.org/grpc/test/bufconn" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "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/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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" ) func TestSequence(t *testing.T) { diff --git a/erigon-lib/kv/mdbx/kv_mdbx.go b/erigon-lib/kv/mdbx/kv_mdbx.go index 7dcc0104444..7fb6176909f 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx.go +++ b/erigon-lib/kv/mdbx/kv_mdbx.go @@ -33,18 +33,18 @@ import ( "unsafe" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/mdbx-go/mdbx" stack2 "github.com/go-stack/stack" - "github.com/ledgerwatch/erigon-lib/log/v3" "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/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "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/iter" + "github.com/erigontech/erigon-lib/kv/order" + "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 691eaace697..3f8016d81d1 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 06c656bdb27..972f353a09e 100644 --- a/erigon-lib/kv/mdbx/kv_mdbx_test.go +++ b/erigon-lib/kv/mdbx/kv_mdbx_test.go @@ -25,12 +25,12 @@ import ( "time" "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" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" ) 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 add2a3a0665..73cb76f4bfe 100644 --- a/erigon-lib/kv/mdbx/kv_migrator_test.go +++ b/erigon-lib/kv/mdbx/kv_migrator_test.go @@ -24,10 +24,10 @@ import ( "time" "github.com/c2h5oh/datasize" - "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" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/mdbx/util.go b/erigon-lib/kv/mdbx/util.go index e9576e68dad..9b3efdb6e7d 100644 --- a/erigon-lib/kv/mdbx/util.go +++ b/erigon-lib/kv/mdbx/util.go @@ -19,8 +19,8 @@ package mdbx import ( "context" - "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 c2b789162cf..18c8b454e36 100644 --- a/erigon-lib/kv/membatch/database_test.go +++ b/erigon-lib/kv/membatch/database_test.go @@ -27,8 +27,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 7dcc7538345..7cb8a8c1337 100644 --- a/erigon-lib/kv/membatch/mapmutation.go +++ b/erigon-lib/kv/membatch/mapmutation.go @@ -9,9 +9,9 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "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 9e816e66e46..110b76dba19 100644 --- a/erigon-lib/kv/membatch/mapmutation_test.go +++ b/erigon-lib/kv/membatch/mapmutation_test.go @@ -5,9 +5,9 @@ import ( "os" "testing" - "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" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation.go b/erigon-lib/kv/membatchwithdb/memory_mutation.go index e14ffc098ce..1d527d2f623 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation.go @@ -19,13 +19,13 @@ import ( "unsafe" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" + "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 MemoryMutation struct { diff --git a/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go b/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go index 0fefa48dac3..bb569eb7bc4 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation_cursor.go @@ -17,8 +17,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 ed8b12fdb73..f3de97bc9a6 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation_diff.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation_diff.go @@ -1,6 +1,6 @@ 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 8f0135cc063..0c3d320f0f9 100644 --- a/erigon-lib/kv/membatchwithdb/memory_mutation_test.go +++ b/erigon-lib/kv/membatchwithdb/memory_mutation_test.go @@ -16,12 +16,12 @@ package membatchwithdb import ( "testing" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/kv/memdb" "github.com/stretchr/testify/assert" "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 initializeDbNonDupSort(rwTx kv.RwTx) { diff --git a/erigon-lib/kv/memdb/memory_database.go b/erigon-lib/kv/memdb/memory_database.go index 5ef4d3ce3ad..7200073d90b 100644 --- a/erigon-lib/kv/memdb/memory_database.go +++ b/erigon-lib/kv/memdb/memory_database.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "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 f01bae47650..db5bb952a0f 100644 --- a/erigon-lib/kv/rawdbv3/txnum.go +++ b/erigon-lib/kv/rawdbv3/txnum.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) type txNums struct{} diff --git a/erigon-lib/kv/remotedb/kv_remote.go b/erigon-lib/kv/remotedb/kv_remote.go index 19f58970022..1dc24c83cc2 100644 --- a/erigon-lib/kv/remotedb/kv_remote.go +++ b/erigon-lib/kv/remotedb/kv_remote.go @@ -24,18 +24,18 @@ import ( "runtime" "unsafe" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/semaphore" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 7bc17ac6413..c6faeb26e25 100644 --- a/erigon-lib/kv/remotedbserver/remotedbserver.go +++ b/erigon-lib/kv/remotedbserver/remotedbserver.go @@ -27,18 +27,18 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "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" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" + "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/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" ) // 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 9def18c4270..047ab6935c6 100644 --- a/erigon-lib/kv/remotedbserver/remotedbserver_test.go +++ b/erigon-lib/kv/remotedbserver/remotedbserver_test.go @@ -21,13 +21,13 @@ import ( "runtime" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" "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/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" ) 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/tables.go b/erigon-lib/kv/tables.go index 86566110cd9..025b71b11a1 100644 --- a/erigon-lib/kv/tables.go +++ b/erigon-lib/kv/tables.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/types" ) // DBSchemaVersion versions list diff --git a/erigon-lib/kv/temporal/historyv2/account_changeset.go b/erigon-lib/kv/temporal/historyv2/account_changeset.go index db09519f5f4..4e87fdb8b6c 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 231ce569284..21be6bcd341 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 4ca0eeadef0..7bf1318f6c3 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 42c895f2f9f..96c7e0ca5df 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 61b435394c2..361c3ab01e3 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 e6be7340fe6..cb8100a1b4b 100644 --- a/erigon-lib/kv/temporal/kv_temporal.go +++ b/erigon-lib/kv/temporal/kv_temporal.go @@ -4,14 +4,14 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/state" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "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 96a440b0553..b59d604f205 100644 --- a/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go +++ b/erigon-lib/kv/temporal/temporaltest/kv_temporal_testdb.go @@ -4,15 +4,15 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "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/common/dir" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "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 051464f3e5a..4a5fe22baf5 100644 --- a/erigon-lib/metrics/setup.go +++ b/erigon-lib/metrics/setup.go @@ -4,7 +4,7 @@ import ( "fmt" "net/http" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/prometheus/client_golang/prometheus" "github.com/prometheus/client_golang/prometheus/promhttp" ) diff --git a/erigon-lib/mmap/total_memory.go b/erigon-lib/mmap/total_memory.go index 75a2f38d7d8..0ea2cce67c2 100644 --- a/erigon-lib/mmap/total_memory.go +++ b/erigon-lib/mmap/total_memory.go @@ -3,7 +3,7 @@ package mmap import ( "runtime/debug" - "github.com/ledgerwatch/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/common/cmp" "github.com/pbnjay/memory" ) diff --git a/erigon-lib/recsplit/eliasfano16/elias_fano.go b/erigon-lib/recsplit/eliasfano16/elias_fano.go index b67a2ab24f4..efd298a2bdb 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 a966aa9c38e..20e5b12273b 100644 --- a/erigon-lib/recsplit/eliasfano32/elias_fano.go +++ b/erigon-lib/recsplit/eliasfano32/elias_fano.go @@ -25,8 +25,8 @@ import ( "sort" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/bitutil" - "github.com/ledgerwatch/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/common/bitutil" + "github.com/erigontech/erigon-lib/kv/iter" ) // 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 5d9cd74f1e9..737ab3ab7e1 100644 --- a/erigon-lib/recsplit/eliasfano32/elias_fano_test.go +++ b/erigon-lib/recsplit/eliasfano32/elias_fano_test.go @@ -22,7 +22,7 @@ import ( "math/bits" "testing" - "github.com/ledgerwatch/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/iter" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/recsplit/golomb_rice.go b/erigon-lib/recsplit/golomb_rice.go index 98221e1bfcd..8e8b164a8fd 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 9d7677fc062..ffc1d50a76e 100644 --- a/erigon-lib/recsplit/index.go +++ b/erigon-lib/recsplit/index.go @@ -29,13 +29,13 @@ import ( "time" "unsafe" - "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" - "github.com/ledgerwatch/erigon-lib/common" - "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/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 bbac1fc393a..dc1d60c8cb4 100644 --- a/erigon-lib/recsplit/index_test.go +++ b/erigon-lib/recsplit/index_test.go @@ -24,7 +24,7 @@ import ( "path/filepath" "testing" - "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/recsplit/recsplit.go b/erigon-lib/recsplit/recsplit.go index 982131c3fb1..f8be3586671 100644 --- a/erigon-lib/recsplit/recsplit.go +++ b/erigon-lib/recsplit/recsplit.go @@ -29,14 +29,14 @@ import ( "path/filepath" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "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/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/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 de7c22d2411..54fd6d3f579 100644 --- a/erigon-lib/recsplit/recsplit_fuzz_test.go +++ b/erigon-lib/recsplit/recsplit_fuzz_test.go @@ -22,7 +22,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 1272eaf6788..cc2513f3223 100644 --- a/erigon-lib/recsplit/recsplit_test.go +++ b/erigon-lib/recsplit/recsplit_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 TestRecSplit2(t *testing.T) { diff --git a/erigon-lib/rlp/encode.go b/erigon-lib/rlp/encode.go index 693db176aae..cf3e6d56ef3 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 b6a27dc29e6..356a700f79e 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 cbe59749a0f..c37b55eea2e 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 00712776868..d7876ad6c6f 100644 --- a/erigon-lib/rlp/parse_test.go +++ b/erigon-lib/rlp/parse_test.go @@ -7,7 +7,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 7e075a7b8c0..87290ac1bbd 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 449277f0917..fdfe0b2489b 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 00712776868..d7876ad6c6f 100644 --- a/erigon-lib/rlp2/parse_test.go +++ b/erigon-lib/rlp2/parse_test.go @@ -7,7 +7,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 07ad0dc015a..f1f8986fd23 100644 --- a/erigon-lib/rlp2/unmarshaler_test.go +++ b/erigon-lib/rlp2/unmarshaler_test.go @@ -3,7 +3,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 86a88423d30..92d2e5a15fa 100644 --- a/erigon-lib/seg/compress.go +++ b/erigon-lib/seg/compress.go @@ -33,12 +33,12 @@ import ( "time" "github.com/c2h5oh/datasize" - "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/common/cmp" - dir2 "github.com/ledgerwatch/erigon-lib/common/dir" - "github.com/ledgerwatch/erigon-lib/etl" + "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" ) // 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 b5866a9cb7a..d838fe36e85 100644 --- a/erigon-lib/seg/compress_fuzz_test.go +++ b/erigon-lib/seg/compress_fuzz_test.go @@ -24,8 +24,8 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/cmp" + "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 a778cc58e2e..485fb08413a 100644 --- a/erigon-lib/seg/compress_test.go +++ b/erigon-lib/seg/compress_test.go @@ -25,7 +25,7 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" ) @@ -195,7 +195,7 @@ func TestCompressDict1(t *testing.T) { if cs := checksum(d.filePath); cs != 3153486123 { // it's ok if hash changed, but need re-generate all existing snapshot hashes - // in https://github.com/ledgerwatch/erigon-snapshot + // in https://github.com/erigontech/erigon-snapshot t.Errorf("result file hash changed, %d", cs) } } @@ -265,7 +265,7 @@ func TestCompressDictCmp(t *testing.T) { if cs := checksum(d.filePath); cs != 3153486123 { // it's ok if hash changed, but need re-generate all existing snapshot hashes - // in https://github.com/ledgerwatch/erigon-snapshot + // in https://github.com/erigontech/erigon-snapshot t.Errorf("result file hash changed, %d", cs) } } diff --git a/erigon-lib/seg/decompress.go b/erigon-lib/seg/decompress.go index 307b56d2ff8..cf00c806463 100644 --- a/erigon-lib/seg/decompress.go +++ b/erigon-lib/seg/decompress.go @@ -27,13 +27,13 @@ import ( "time" "unsafe" - "github.com/ledgerwatch/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/common/assert" "github.com/c2h5oh/datasize" - "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/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 59b429a5c06..5587755d240 100644 --- a/erigon-lib/seg/decompress_fuzz_test.go +++ b/erigon-lib/seg/decompress_fuzz_test.go @@ -8,8 +8,8 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/cmp" + "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 0a5808b88e6..9076304a7ee 100644 --- a/erigon-lib/seg/decompress_test.go +++ b/erigon-lib/seg/decompress_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/seg/parallel_compress.go b/erigon-lib/seg/parallel_compress.go index ca61dae35fe..4647ad0860c 100644 --- a/erigon-lib/seg/parallel_compress.go +++ b/erigon-lib/seg/parallel_compress.go @@ -31,13 +31,13 @@ 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/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/seg/patricia" + "github.com/erigontech/erigon-lib/seg/sais" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) // 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 113854c2e63..7e1f113ce38 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 a39ad0f55eb..bbc10340411 100644 --- a/erigon-lib/seg/silkworm_seg_fuzz_test.go +++ b/erigon-lib/seg/silkworm_seg_fuzz_test.go @@ -12,11 +12,11 @@ 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" - "github.com/ledgerwatch/erigon-lib/common/cmp" + "github.com/erigontech/erigon-lib/common/cmp" ) func makeSegFilePath(path string, suffix string) string { diff --git a/erigon-lib/state/aggregator.go b/erigon-lib/state/aggregator.go index 9d6c14ef613..16138d75476 100644 --- a/erigon-lib/state/aggregator.go +++ b/erigon-lib/state/aggregator.go @@ -29,15 +29,15 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - 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/dbg" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/log/v3" + 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/dbg" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/bitmapdb" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/errgroup" ) diff --git a/erigon-lib/state/aggregator_bench_test.go b/erigon-lib/state/aggregator_bench_test.go index c33a2a7bb11..4ff3b9fd3ec 100644 --- a/erigon-lib/state/aggregator_bench_test.go +++ b/erigon-lib/state/aggregator_bench_test.go @@ -10,12 +10,12 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/recsplit" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/seg" ) func Benchmark_BtreeIndex_Allocation(b *testing.B) { diff --git a/erigon-lib/state/aggregator_files.go b/erigon-lib/state/aggregator_files.go index eac579c2f6a..2552dd01197 100644 --- a/erigon-lib/state/aggregator_files.go +++ b/erigon-lib/state/aggregator_files.go @@ -19,9 +19,9 @@ package state import ( "math/bits" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" ) // StepsInBiggestFile - files of this size are completely frozen/immutable. diff --git a/erigon-lib/state/aggregator_test.go b/erigon-lib/state/aggregator_test.go index 973a8ed6eec..c652e667c28 100644 --- a/erigon-lib/state/aggregator_test.go +++ b/erigon-lib/state/aggregator_test.go @@ -10,13 +10,13 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/seg" ) func Test_EncodeCommitmentState(t *testing.T) { diff --git a/erigon-lib/state/btree_index.go b/erigon-lib/state/btree_index.go index ad734766da9..1ec7f30c0ed 100644 --- a/erigon-lib/state/btree_index.go +++ b/erigon-lib/state/btree_index.go @@ -16,16 +16,16 @@ import ( "github.com/c2h5oh/datasize" "github.com/edsrzf/mmap-go" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/seg" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/seg" ) func logBase(n, base uint64) uint64 { diff --git a/erigon-lib/state/domain.go b/erigon-lib/state/domain.go index bc96da5b67d..372b90929ae 100644 --- a/erigon-lib/state/domain.go +++ b/erigon-lib/state/domain.go @@ -32,16 +32,16 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" 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/kv" - "github.com/ledgerwatch/erigon-lib/recsplit" - "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/recsplit" + "github.com/erigontech/erigon-lib/seg" ) // Domain is a part of the state (examples are Accounts, Storage, Code) diff --git a/erigon-lib/state/domain_committed.go b/erigon-lib/state/domain_committed.go index 903344520bb..45c4953e13d 100644 --- a/erigon-lib/state/domain_committed.go +++ b/erigon-lib/state/domain_committed.go @@ -23,13 +23,13 @@ import ( "hash" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/google/btree" - "github.com/ledgerwatch/erigon-lib/log/v3" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon-lib/commitment" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/commitment" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" ) // Defines how to evaluate commitments diff --git a/erigon-lib/state/domain_test.go b/erigon-lib/state/domain_test.go index ca04f30d159..e262be4c628 100644 --- a/erigon-lib/state/domain_test.go +++ b/erigon-lib/state/domain_test.go @@ -26,14 +26,14 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/recsplit" ) func testDbAndDomain(t *testing.T, logger log.Logger) (string, kv.RwDB, *Domain) { diff --git a/erigon-lib/state/files_item.go b/erigon-lib/state/files_item.go index 1e7e881a041..e0d2779c36d 100644 --- a/erigon-lib/state/files_item.go +++ b/erigon-lib/state/files_item.go @@ -4,9 +4,9 @@ import ( "os" "sync/atomic" - "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" ) // 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 162933b1603..13dbafaa9c3 100644 --- a/erigon-lib/state/gc_test.go +++ b/erigon-lib/state/gc_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "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" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/state/history.go b/erigon-lib/state/history.go index f7e34ab2c18..e710f9e6640 100644 --- a/erigon-lib/state/history.go +++ b/erigon-lib/state/history.go @@ -32,22 +32,22 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" 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/cmp" - "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/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "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/cmp" + "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/iter" + "github.com/erigontech/erigon-lib/kv/order" + "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 90d235dad76..a106703bb5d 100644 --- a/erigon-lib/state/history_test.go +++ b/erigon-lib/state/history_test.go @@ -26,15 +26,15 @@ import ( "testing" "time" - "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/iter" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/log/v3" - "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/iter" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" ) diff --git a/erigon-lib/state/inverted_index.go b/erigon-lib/state/inverted_index.go index 7e906be8879..33b65c5ee18 100644 --- a/erigon-lib/state/inverted_index.go +++ b/erigon-lib/state/inverted_index.go @@ -34,21 +34,21 @@ import ( "github.com/RoaringBitmap/roaring/roaring64" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" btree2 "github.com/tidwall/btree" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "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/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "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/cmp" + "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/iter" + "github.com/erigontech/erigon-lib/kv/order" + "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 07b5718b43c..d35481cc2e5 100644 --- a/erigon-lib/state/inverted_index_test.go +++ b/erigon-lib/state/inverted_index_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "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/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) func testDbAndInvertedIndex(tb testing.TB, aggStep uint64, logger log.Logger) (string, kv.RwDB, *InvertedIndex) { diff --git a/erigon-lib/state/merge.go b/erigon-lib/state/merge.go index 0cadf84a0ec..c4ec976fd6c 100644 --- a/erigon-lib/state/merge.go +++ b/erigon-lib/state/merge.go @@ -26,15 +26,15 @@ import ( "path/filepath" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "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/cmp" + "github.com/erigontech/erigon-lib/recsplit" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/seg" ) func (d *Domain) endTxNumMinimax() uint64 { diff --git a/erigon-lib/state/merge_test.go b/erigon-lib/state/merge_test.go index 25865e65373..abbd9038965 100644 --- a/erigon-lib/state/merge_test.go +++ b/erigon-lib/state/merge_test.go @@ -8,7 +8,7 @@ import ( "github.com/stretchr/testify/require" btree2 "github.com/tidwall/btree" - "github.com/ledgerwatch/erigon-lib/recsplit/eliasfano32" + "github.com/erigontech/erigon-lib/recsplit/eliasfano32" ) func TestFindMergeRangeCornerCases(t *testing.T) { diff --git a/erigon-lib/state/state_recon.go b/erigon-lib/state/state_recon.go index 2b8d0629ac6..f095f34ad8d 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/sysutils/sysutils.go b/erigon-lib/sysutils/sysutils.go index 8696d0ad234..e711e5e8797 100644 --- a/erigon-lib/sysutils/sysutils.go +++ b/erigon-lib/sysutils/sysutils.go @@ -19,7 +19,7 @@ package sysutils import ( "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/shirou/gopsutil/v4/cpu" "github.com/shirou/gopsutil/v4/mem" "github.com/shirou/gopsutil/v4/process" diff --git a/erigon-lib/sysutils/sysutils_test.go b/erigon-lib/sysutils/sysutils_test.go index 3bea1076295..758a3f646f9 100644 --- a/erigon-lib/sysutils/sysutils_test.go +++ b/erigon-lib/sysutils/sysutils_test.go @@ -3,7 +3,7 @@ package sysutils_test import ( "testing" - "github.com/ledgerwatch/erigon-lib/sysutils" + "github.com/erigontech/erigon-lib/sysutils" "github.com/stretchr/testify/require" ) diff --git a/erigon-lib/tools.go b/erigon-lib/tools.go index cc5eef6637f..8a81f1bb0e2 100644 --- a/erigon-lib/tools.go +++ b/erigon-lib/tools.go @@ -17,15 +17,15 @@ package tools // build tag 'trick_go_mod_tidy' - is used to hide warnings of IDEA (because we can't import `main` packages in go) import ( - _ "github.com/ledgerwatch/interfaces" - _ "github.com/ledgerwatch/interfaces/downloader" - _ "github.com/ledgerwatch/interfaces/execution" - _ "github.com/ledgerwatch/interfaces/p2psentinel" - _ "github.com/ledgerwatch/interfaces/p2psentry" - _ "github.com/ledgerwatch/interfaces/remote" - _ "github.com/ledgerwatch/interfaces/txpool" - _ "github.com/ledgerwatch/interfaces/types" - _ "github.com/ledgerwatch/interfaces/web3" + _ "github.com/erigontech/interfaces" + _ "github.com/erigontech/interfaces/downloader" + _ "github.com/erigontech/interfaces/execution" + _ "github.com/erigontech/interfaces/p2psentinel" + _ "github.com/erigontech/interfaces/p2psentry" + _ "github.com/erigontech/interfaces/remote" + _ "github.com/erigontech/interfaces/txpool" + _ "github.com/erigontech/interfaces/types" + _ "github.com/erigontech/interfaces/web3" _ "go.uber.org/mock/mockgen" _ "go.uber.org/mock/mockgen/model" _ "google.golang.org/grpc/cmd/protoc-gen-go-grpc" diff --git a/erigon-lib/tools/licenses_check.sh b/erigon-lib/tools/licenses_check.sh index 6a285c1eff1..4220482359e 100755 --- a/erigon-lib/tools/licenses_check.sh +++ b/erigon-lib/tools/licenses_check.sh @@ -42,7 +42,7 @@ output=$(find "$projectDir" -maxdepth 1 -type 'd' \ | grep -v "github.com/go-llsqlite/crawshaw" `# ISC` \ | grep -v "github.com/consensys/gnark-crypto" `# Apache-2.0` \ | grep -v "github.com/erigontech/mdbx-go" `# Apache-2.0` \ - | grep -v "github.com/ledgerwatch/secp256k1" `# BSD-3-Clause` \ + | grep -v "github.com/erigontech/secp256k1" `# BSD-3-Clause` \ | grep -v "github.com/RoaringBitmap/roaring" `# Apache-2.0` \ | grep -v "github.com/!roaring!bitmap/roaring" `# Apache-2.0` \ | grep -v "pedersen_hash" `# Apache-2.0` \ diff --git a/erigon-lib/txpool/fetch.go b/erigon-lib/txpool/fetch.go index 88337bc4137..75ed3c33935 100644 --- a/erigon-lib/txpool/fetch.go +++ b/erigon-lib/txpool/fetch.go @@ -23,18 +23,18 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common/cmp" - + "github.com/erigontech/erigon-lib/common/cmp" + + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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" "google.golang.org/grpc" "google.golang.org/protobuf/types/known/emptypb" ) diff --git a/erigon-lib/txpool/fetch_test.go b/erigon-lib/txpool/fetch_test.go index 01bebcececd..a769e9cf6ca 100644 --- a/erigon-lib/txpool/fetch_test.go +++ b/erigon-lib/txpool/fetch_test.go @@ -24,20 +24,20 @@ import ( "sync" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - 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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + 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 e3262bc724a..ed1a37d7a51 100644 --- a/erigon-lib/txpool/pool.go +++ b/erigon-lib/txpool/pool.go @@ -35,32 +35,32 @@ import ( gokzg4844 "github.com/crate-crypto/go-kzg-4844" mapset "github.com/deckarep/golang-set/v2" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/log/v3" "github.com/go-stack/stack" "github.com/google/btree" "github.com/hashicorp/golang-lru/v2/simplelru" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "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/assert" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/fixedgas" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - txpoolproto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "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/metrics" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/types" - types2 "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/cmp" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/fixedgas" + "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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + txpoolproto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "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/metrics" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/types" + types2 "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 21c4d5ea80e..a4b00577406 100644 --- a/erigon-lib/txpool/pool_fuzz_test.go +++ b/erigon-lib/txpool/pool_fuzz_test.go @@ -8,22 +8,22 @@ import ( "encoding/binary" "testing" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "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" + "github.com/erigontech/erigon-lib/common/fixedgas" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 8d34190039e..c3eb08bca38 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" - remote "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - kv "github.com/ledgerwatch/erigon-lib/kv" - txpoolcfg "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - types "github.com/ledgerwatch/erigon-lib/types" + remote "github.com/erigontech/erigon-lib/gointerfaces/remote" + 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 75310f96d14..467f3a1ff3a 100644 --- a/erigon-lib/txpool/pool_test.go +++ b/erigon-lib/txpool/pool_test.go @@ -27,23 +27,23 @@ import ( "testing" gokzg4844 "github.com/crate-crypto/go-kzg-4844" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "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" + "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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 55f67c39b86..6163dd49c71 100644 --- a/erigon-lib/txpool/send.go +++ b/erigon-lib/txpool/send.go @@ -21,11 +21,11 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/rlp" + types2 "github.com/erigontech/erigon-lib/types" "google.golang.org/grpc" ) diff --git a/erigon-lib/txpool/test_util.go b/erigon-lib/txpool/test_util.go index 695c23a4a86..5ac78132b55 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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 db9cc693010..a7bc772b8a1 100644 --- a/erigon-lib/txpool/txpool_grpc_server.go +++ b/erigon-lib/txpool/txpool_grpc_server.go @@ -25,11 +25,11 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_recovery "github.com/grpc-ecosystem/go-grpc-middleware/recovery" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/health" @@ -38,12 +38,12 @@ import ( "google.golang.org/grpc/reflection" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 feb7a40fa53..689f7e26de8 100644 --- a/erigon-lib/txpool/txpoolcfg/txpoolcfg.go +++ b/erigon-lib/txpool/txpoolcfg/txpoolcfg.go @@ -24,10 +24,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/txpoolutil/all_components.go b/erigon-lib/txpool/txpoolutil/all_components.go index 63a9c8c6665..f009b5876e0 100644 --- a/erigon-lib/txpool/txpoolutil/all_components.go +++ b/erigon-lib/txpool/txpoolutil/all_components.go @@ -23,17 +23,17 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "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/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/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 6ecae5a1328..0723aa67b60 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 2be8b58498a..c0d6e536378 100644 --- a/erigon-lib/types/txn.go +++ b/erigon-lib/types/txn.go @@ -27,17 +27,17 @@ import ( "sort" gokzg4844 "github.com/crate-crypto/go-kzg-4844" + "github.com/erigontech/secp256k1" "github.com/holiman/uint256" - "github.com/ledgerwatch/secp256k1" "golang.org/x/crypto/sha3" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 3f7ed58bd3f..1a01780bf48 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 dfb5932281e..40a67543b7e 100644 --- a/erigon-lib/types/txn_packets_fuzz_test.go +++ b/erigon-lib/types/txn_packets_fuzz_test.go @@ -5,8 +5,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 a21c523fd2e..6d9d10b5f1a 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 4c53263d84f..11f57820fc4 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 1f43a695d37..077bd1ee936 100644 --- a/erigon-lib/types/txn_types_fuzz_test.go +++ b/erigon-lib/types/txn_types_fuzz_test.go @@ -5,7 +5,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 71f7f0e5f16..3dcfda39254 100644 --- a/erigon-lib/wrap/e3_wrapper.go +++ b/erigon-lib/wrap/e3_wrapper.go @@ -1,7 +1,7 @@ package wrap import ( - "github.com/ledgerwatch/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv" ) type TxContainer struct { diff --git a/eth/backend.go b/eth/backend.go index fb323de5894..5f2fefc84b9 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -34,102 +34,102 @@ import ( "sync/atomic" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/mdbx-go/mdbx" lru "github.com/hashicorp/golang-lru/arc/v2" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "google.golang.org/grpc" "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/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/downloader" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - rpcsentinel "github.com/ledgerwatch/erigon-lib/gointerfaces/sentinel" - protosentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - txpoolproto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - prototypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/kv/temporal" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/txpool" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolutil" - 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/db_config" - "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" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/crypto" - "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/finality/flags" - "github.com/ledgerwatch/erigon/polygon/bor/valset" - "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/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/downloader" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + rpcsentinel "github.com/erigontech/erigon-lib/gointerfaces/sentinel" + protosentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + txpoolproto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + prototypes "github.com/erigontech/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/kv/temporal" + 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/txpoolutil" + 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/db_config" + "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" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "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/finality/flags" + "github.com/erigontech/erigon/polygon/bor/valset" + "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 c4ca57e06c1..729b85763dd 100644 --- a/eth/calltracer/calltracer.go +++ b/eth/calltracer/calltracer.go @@ -4,14 +4,14 @@ import ( "encoding/binary" "sort" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" "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" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/vm" ) type CallTracer struct { diff --git a/eth/discovery.go b/eth/discovery.go index 21c97d0b8f3..5e4e3bb649b 100644 --- a/eth/discovery.go +++ b/eth/discovery.go @@ -17,8 +17,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 65c13928801..372292ff6fd 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -28,21 +28,21 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "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/chain/networkname" + "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 b1c1dc1c8d6..620c0d2e47a 100644 --- a/eth/ethconfig/estimate/esitmated_ram.go +++ b/eth/ethconfig/estimate/esitmated_ram.go @@ -5,8 +5,8 @@ import ( "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon-lib/mmap" + "github.com/erigontech/erigon-lib/common/cmp" + "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 f5432c115b4..5c1db7e80d9 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -6,14 +6,14 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/consensus/ethash/ethashcfg" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/gasprice/gaspricecfg" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/consensus/ethash/ethashcfg" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/gasprice/gaspricecfg" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" + "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 8909339f822..baf397eecdd 100644 --- a/eth/ethconfig/tx_pool.go +++ b/eth/ethconfig/tx_pool.go @@ -19,8 +19,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 1a669ccb087..ac3a5f4d040 100644 --- a/eth/ethconsensusconfig/config.go +++ b/eth/ethconsensusconfig/config.go @@ -5,24 +5,24 @@ import ( "path/filepath" "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-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-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 f2f7b985962..8e0725788d4 100644 --- a/eth/ethutils/receipt.go +++ b/eth/ethutils/receipt.go @@ -3,14 +3,14 @@ package ethutils import ( "math/big" + "github.com/erigontech/erigon-lib/log/v3" "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/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 9182aa8004a..035b1aff81e 100644 --- a/eth/ethutils/utils.go +++ b/eth/ethutils/utils.go @@ -4,12 +4,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 c8059b02d7c..722e51beea8 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -20,14 +20,14 @@ import ( "encoding/json" "errors" "fmt" - "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/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 9c7ae790a99..f0fc08c4285 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,9 +21,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 8aacaa84a4c..38736be31cb 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -24,12 +24,12 @@ import ( "sort" "sync/atomic" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus/misc" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/rpc" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/consensus/misc" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/rpc" ) var ( diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go index 0fd0ec3939b..c4afaf32ac5 100644 --- a/eth/gasprice/feehistory_test.go +++ b/eth/gasprice/feehistory_test.go @@ -21,10 +21,10 @@ import ( "errors" "testing" - "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/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 0e116c89fa0..d11e57e4b45 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -22,14 +22,14 @@ import ( "errors" "math/big" + "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/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/core/types" - "github.com/ledgerwatch/erigon/rpc" + "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 96184ffc296..7f5cd285407 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -22,22 +22,22 @@ import ( "math/big" "testing" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "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/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/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/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 749477ab84a..f91832d43bb 100644 --- a/eth/gasprice/gaspricecfg/gaspricecfg.go +++ b/eth/gasprice/gaspricecfg/gaspricecfg.go @@ -3,7 +3,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/no_gaps_in_canonical_headers.go b/eth/integrity/no_gaps_in_canonical_headers.go index c1a36f8d87e..3231ac09317 100644 --- a/eth/integrity/no_gaps_in_canonical_headers.go +++ b/eth/integrity/no_gaps_in_canonical_headers.go @@ -5,13 +5,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 4c2cc56c28d..5a152b87c91 100644 --- a/eth/integrity/snap_blocks_read.go +++ b/eth/integrity/snap_blocks_read.go @@ -5,9 +5,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/integrity/trie.go b/eth/integrity/trie.go index e0e1dfe991f..3fe42a4685e 100644 --- a/eth/integrity/trie.go +++ b/eth/integrity/trie.go @@ -10,14 +10,14 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/ethdb" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/ethdb" + "github.com/erigontech/erigon/turbo/trie" ) // AssertSubset a & b == a - checks whether a is subset of b diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go index 50afab48f8d..1a0b0411e3b 100644 --- a/eth/protocols/eth/discovery.go +++ b/eth/protocols/eth/discovery.go @@ -19,11 +19,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 396bbbbc238..0399c0fa452 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -19,11 +19,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 a373858c043..c4181f9cdb5 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -23,19 +23,19 @@ import ( "github.com/holiman/uint256" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/kv" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 7ac2b995a5c..a19b23ac0c5 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -20,15 +20,15 @@ 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/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/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 c62aef03155..f5b5ac7b703 100644 --- a/eth/protocols/eth/protocol.go +++ b/eth/protocols/eth/protocol.go @@ -21,14 +21,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/sentry" - 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/sentry" + 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 b99caaf8e10..da3ccb58a03 100644 --- a/eth/protocols/eth/protocol_test.go +++ b/eth/protocols/eth/protocol_test.go @@ -21,11 +21,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 1a3c290dc45..08d412c4660 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. @@ -125,7 +125,6 @@ This stage can spawn unwinds if the block execution fails. Translation each marked for translation contract (from EVM to TEVM) - ### Stage 9: [VerkleTrie](/eth/stagedsync/stage_verkle_trie.go) [TODO] @@ -156,7 +155,6 @@ If the hashed state is not empty, then we are looking at the History ChangeSets This stage doesn't use a network connection. - ### Stages [12, 13](/eth/stagedsync/stage_indexes.go), [14](/eth/stagedsync/stage_log_index.go), [15](/eth/stagedsync/stage_call_traces.go) and [16](/eth/stagedsync/stage_txlookup.go): Generate Indexes There are 5 indexes that are generated during sync. diff --git a/eth/stagedsync/bor_heimdall_shared.go b/eth/stagedsync/bor_heimdall_shared.go index f33e3624189..b1df8e6927e 100644 --- a/eth/stagedsync/bor_heimdall_shared.go +++ b/eth/stagedsync/bor_heimdall_shared.go @@ -10,14 +10,14 @@ import ( "strconv" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/rlp" - "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/core/types" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/rlp" + "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 0c66eb69f2e..29f62ae228b 100644 --- a/eth/stagedsync/chain_reader.go +++ b/eth/stagedsync/chain_reader.go @@ -4,15 +4,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 4373cdc09f2..90bc1c9b60e 100644 --- a/eth/stagedsync/default_stages.go +++ b/eth/stagedsync/default_stages.go @@ -3,13 +3,13 @@ package stagedsync import ( "context" - "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/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 25da72f3433..c36ccbc463d 100644 --- a/eth/stagedsync/exec3.go +++ b/eth/stagedsync/exec3.go @@ -14,34 +14,34 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/log/v3" "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/common/dir" - "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" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/cmd/state/exec22" - "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/rawdbhelpers" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "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" + "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" + kv2 "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/metrics" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/cmd/state/exec22" + "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/rawdbhelpers" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/services" ) var execStepsInDB = metrics.NewGauge(`exec_steps_in_db`) //nolint diff --git a/eth/stagedsync/stage.go b/eth/stagedsync/stage.go index 4695e1c732b..3e507f79bb6 100644 --- a/eth/stagedsync/stage.go +++ b/eth/stagedsync/stage.go @@ -1,12 +1,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 f917cfd5fa0..86ce6afd774 100644 --- a/eth/stagedsync/stage_blockhashes.go +++ b/eth/stagedsync/stage_blockhashes.go @@ -4,11 +4,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 602d1e0692f..89b460dc5df 100644 --- a/eth/stagedsync/stage_bodies.go +++ b/eth/stagedsync/stage_bodies.go @@ -6,22 +6,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 7e4d6fbe06d..a7a1bdbe3c1 100644 --- a/eth/stagedsync/stage_bodies_test.go +++ b/eth/stagedsync/stage_bodies_test.go @@ -6,15 +6,15 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" "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 TestBodiesUnwind(t *testing.T) { diff --git a/eth/stagedsync/stage_bor_heimdall.go b/eth/stagedsync/stage_bor_heimdall.go index 5c05529054e..4c568c31135 100644 --- a/eth/stagedsync/stage_bor_heimdall.go +++ b/eth/stagedsync/stage_bor_heimdall.go @@ -11,31 +11,31 @@ import ( "sort" "time" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" "golang.org/x/sync/errgroup" - "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/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "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/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 cd02438374a..8661aa19cd0 100644 --- a/eth/stagedsync/stage_bor_heimdall_test.go +++ b/eth/stagedsync/stage_bor_heimdall_test.go @@ -8,18 +8,18 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "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/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 5e5e1024a4c..b19333bab2a 100644 --- a/eth/stagedsync/stage_call_traces.go +++ b/eth/stagedsync/stage_call_traces.go @@ -11,18 +11,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 ba7a08085e4..1e73fdaaf41 100644 --- a/eth/stagedsync/stage_call_traces_test.go +++ b/eth/stagedsync/stage_call_traces_test.go @@ -6,15 +6,15 @@ import ( "time" "github.com/RoaringBitmap/roaring/roaring64" - "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/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/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func genTestCallTraceSet(t *testing.T, tx kv.RwTx, to uint64) { diff --git a/eth/stagedsync/stage_execute.go b/eth/stagedsync/stage_execute.go index 65eaee65301..5ab064f262d 100644 --- a/eth/stagedsync/stage_execute.go +++ b/eth/stagedsync/stage_execute.go @@ -10,46 +10,46 @@ import ( "time" "github.com/c2h5oh/datasize" - "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" "golang.org/x/sync/errgroup" - "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/hexutility" - "github.com/ledgerwatch/erigon-lib/common/length" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "github.com/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/kv/membatch" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - libstate "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/common/changeset" - "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/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/calltracer" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - tracelogger "github.com/ledgerwatch/erigon/eth/tracers/logger" - "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/cmp" + "github.com/erigontech/erigon-lib/common/datadir" + "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/common/metrics" + "github.com/erigontech/erigon-lib/diagnostics" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/membatch" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + libstate "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/common/changeset" + "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/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/calltracer" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/eth/stagedsync/stages" + tracelogger "github.com/erigontech/erigon/eth/tracers/logger" + "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 5c88977614d..abd86bb9a90 100644 --- a/eth/stagedsync/stage_execute_test.go +++ b/eth/stagedsync/stage_execute_test.go @@ -7,25 +7,25 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/config3" - "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/config3" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/wrap" + "github.com/erigontech/erigon-lib/wrap" - "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/historyv2" - libstate "github.com/ledgerwatch/erigon-lib/state" + "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/historyv2" + libstate "github.com/erigontech/erigon-lib/state" - "github.com/ledgerwatch/erigon/cmd/state/exec22" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/params" + "github.com/erigontech/erigon/cmd/state/exec22" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "github.com/erigontech/erigon/params" ) func TestExec(t *testing.T) { diff --git a/eth/stagedsync/stage_finish.go b/eth/stagedsync/stage_finish.go index b0f78d3b991..2d83b4263fc 100644 --- a/eth/stagedsync/stage_finish.go +++ b/eth/stagedsync/stage_finish.go @@ -7,23 +7,23 @@ import ( "fmt" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "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" - - "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-lib/kv/dbutils" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "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/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_hashstate.go b/eth/stagedsync/stage_hashstate.go index a90500a3f07..d13b623c765 100644 --- a/eth/stagedsync/stage_hashstate.go +++ b/eth/stagedsync/stage_hashstate.go @@ -10,24 +10,24 @@ import ( "runtime" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - 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/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/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv/dbutils" + + 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/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/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/errgroup" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/eth/ethconfig/estimate" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/eth/ethconfig/estimate" ) type HashStateCfg struct { diff --git a/eth/stagedsync/stage_hashstate_test.go b/eth/stagedsync/stage_hashstate_test.go index 8c0e3ea5510..9d9af68ea53 100644 --- a/eth/stagedsync/stage_hashstate_test.go +++ b/eth/stagedsync/stage_hashstate_test.go @@ -5,14 +5,14 @@ import ( "errors" "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/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/stretchr/testify/require" - 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" ) func TestPromoteHashedStateClearState(t *testing.T) { diff --git a/eth/stagedsync/stage_headers.go b/eth/stagedsync/stage_headers.go index c2660e91916..3859e5c1776 100644 --- a/eth/stagedsync/stage_headers.go +++ b/eth/stagedsync/stage_headers.go @@ -9,25 +9,25 @@ import ( "time" "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/common" - "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/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/common" + "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/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 5b8a3a97581..3ad681a426a 100644 --- a/eth/stagedsync/stage_indexes.go +++ b/eth/stagedsync/stage_indexes.go @@ -11,23 +11,23 @@ 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 fe936ba668e..cd4b041f582 100644 --- a/eth/stagedsync/stage_indexes_test.go +++ b/eth/stagedsync/stage_indexes_test.go @@ -10,23 +10,23 @@ 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/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/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/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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/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_interhashes.go b/eth/stagedsync/stage_interhashes.go index 6bd7cb52c96..f4e82685c70 100644 --- a/eth/stagedsync/stage_interhashes.go +++ b/eth/stagedsync/stage_interhashes.go @@ -9,26 +9,26 @@ import ( "slices" "sync/atomic" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - 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/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon-lib/kv/dbutils" + + 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/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon/turbo/trie" ) type TrieCfg struct { diff --git a/eth/stagedsync/stage_interhashes_test.go b/eth/stagedsync/stage_interhashes_test.go index 7dbbf35a8ad..5f47c0e1664 100644 --- a/eth/stagedsync/stage_interhashes_test.go +++ b/eth/stagedsync/stage_interhashes_test.go @@ -5,23 +5,23 @@ import ( "encoding/binary" "testing" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - 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" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon/eth/ethconfig" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" - - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/turbo/trie" - - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/kv/dbutils" + + 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" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon/eth/ethconfig" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" + + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/turbo/trie" + + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/eth/stagedsync/stage_log_index.go b/eth/stagedsync/stage_log_index.go index c5e2b5848c3..a8907200628 100644 --- a/eth/stagedsync/stage_log_index.go +++ b/eth/stagedsync/stage_log_index.go @@ -11,19 +11,19 @@ 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/cbor" - "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/cbor" + "github.com/erigontech/erigon/ethdb/prune" ) const ( diff --git a/eth/stagedsync/stage_log_index_test.go b/eth/stagedsync/stage_log_index_test.go index d00a3363d12..97f3df795fa 100644 --- a/eth/stagedsync/stage_log_index_test.go +++ b/eth/stagedsync/stage_log_index_test.go @@ -6,16 +6,16 @@ import ( "testing" "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/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/ethdb/prune" + 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" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/ethdb/prune" "github.com/stretchr/testify/require" ) diff --git a/eth/stagedsync/stage_mining_bor_heimdall.go b/eth/stagedsync/stage_mining_bor_heimdall.go index caffc0a8f17..695be13131c 100644 --- a/eth/stagedsync/stage_mining_bor_heimdall.go +++ b/eth/stagedsync/stage_mining_bor_heimdall.go @@ -4,13 +4,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 e49a6b1b288..760591dfb38 100644 --- a/eth/stagedsync/stage_mining_bor_heimdall_test.go +++ b/eth/stagedsync/stage_mining_bor_heimdall_test.go @@ -4,12 +4,12 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "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 d2485ad8a7e..1536af542a5 100644 --- a/eth/stagedsync/stage_mining_create_block.go +++ b/eth/stagedsync/stage_mining_create_block.go @@ -8,20 +8,20 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "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/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/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 5d8c5f0c4d7..a04d9e88e1e 100644 --- a/eth/stagedsync/stage_mining_exec.go +++ b/eth/stagedsync/stage_mining_exec.go @@ -8,26 +8,26 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "golang.org/x/net/context" - "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" - "github.com/ledgerwatch/erigon-lib/kv/membatch" - 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/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/metrics" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/membatch" + 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 6e14116ff8b..38ca2408931 100644 --- a/eth/stagedsync/stage_mining_finish.go +++ b/eth/stagedsync/stage_mining_finish.go @@ -3,14 +3,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_postexec.go b/eth/stagedsync/stage_postexec.go index 5a119e56de6..06f3d97b7f6 100644 --- a/eth/stagedsync/stage_postexec.go +++ b/eth/stagedsync/stage_postexec.go @@ -4,7 +4,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 fb5f3f5a809..95ce75f5b46 100644 --- a/eth/stagedsync/stage_senders.go +++ b/eth/stagedsync/stage_senders.go @@ -9,26 +9,26 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - "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/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/log/v3" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/secp256k1" - - "github.com/ledgerwatch/erigon/common/debug" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/ethdb/prune" - "github.com/ledgerwatch/erigon/turbo/stages/headerdownload" + "github.com/erigontech/erigon-lib/kv/dbutils" + + "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/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/log/v3" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/secp256k1" + + "github.com/erigontech/erigon/common/debug" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/ethdb/prune" + "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 bea7d1c6650..9b3b6877c06 100644 --- a/eth/stagedsync/stage_senders_test.go +++ b/eth/stagedsync/stage_senders_test.go @@ -3,21 +3,21 @@ package stagedsync_test import ( "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/turbo/stages/mock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "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" + "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 70a45297f3a..1dc4462ef0e 100644 --- a/eth/stagedsync/stage_snapshots.go +++ b/eth/stagedsync/stage_snapshots.go @@ -21,36 +21,36 @@ import ( "time" "github.com/anacrolix/torrent" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/errgroup" - "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/diagnostics" - "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/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "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" - 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/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/diagnostics" + "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/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "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" + 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_txlookup.go b/eth/stagedsync/stage_txlookup.go index 7111039298b..314f9f3fa4c 100644 --- a/eth/stagedsync/stage_txlookup.go +++ b/eth/stagedsync/stage_txlookup.go @@ -6,20 +6,20 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/eth/ethconfig" - - "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/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/eth/ethconfig" + + "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/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 b123504edef..1b801849822 100644 --- a/eth/stagedsync/stage_verkle_trie.go +++ b/eth/stagedsync/stage_verkle_trie.go @@ -4,13 +4,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 002182493c8..785e0cbddb8 100644 --- a/eth/stagedsync/stagebuilder.go +++ b/eth/stagedsync/stagebuilder.go @@ -3,13 +3,13 @@ package stagedsync import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 9db9429d327..5ed2222389f 100644 --- a/eth/stagedsync/stagedsynctest/chain_configs.go +++ b/eth/stagedsync/stagedsynctest/chain_configs.go @@ -1,9 +1,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 e371b5220d7..1b8b6fd0425 100644 --- a/eth/stagedsync/stagedsynctest/harness.go +++ b/eth/stagedsync/stagedsynctest/harness.go @@ -11,31 +11,31 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "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/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 6691fb90ffa..4568b1a1cad 100644 --- a/eth/stagedsync/stages/metrics.go +++ b/eth/stagedsync/stages/metrics.go @@ -5,8 +5,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 d4710c50c64..958042290b7 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 3081feea54a..655ef822ecb 100644 --- a/eth/stagedsync/sync.go +++ b/eth/stagedsync/sync.go @@ -5,16 +5,16 @@ import ( "fmt" "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/dbg" - "github.com/ledgerwatch/erigon-lib/diagnostics" - "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/diagnostics" + "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 7e41ae56397..d6a78bd9a92 100644 --- a/eth/stagedsync/sync_test.go +++ b/eth/stagedsync/sync_test.go @@ -5,13 +5,13 @@ import ( "fmt" "testing" - "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/stretchr/testify/assert" - "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 545e0c631b0..da9cb0ea447 100644 --- a/eth/stagedsync/testutil.go +++ b/eth/stagedsync/testutil.go @@ -5,13 +5,13 @@ import ( "math/big" "testing" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv" + state2 "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/types/accounts" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - state2 "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/stretchr/testify/assert" ) diff --git a/eth/stagedsync/types.go b/eth/stagedsync/types.go index 09d90cdad63..f4521c5025c 100644 --- a/eth/stagedsync/types.go +++ b/eth/stagedsync/types.go @@ -1,6 +1,6 @@ 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/api.go b/eth/tracers/api.go index 9890821192a..9bfad181c5f 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -3,9 +3,9 @@ package tracers 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 788ea60a510..15194f19d94 100644 --- a/eth/tracers/internal/tracetest/calltrace_test.go +++ b/eth/tracers/internal/tracetest/calltrace_test.go @@ -27,25 +27,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 007fbd17a42..e3673264eed 100644 --- a/eth/tracers/internal/tracetest/prestate_test.go +++ b/eth/tracers/internal/tracetest/prestate_test.go @@ -27,17 +27,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 520dfa89dfc..d560a5a0bd4 100644 --- a/eth/tracers/internal/tracetest/util.go +++ b/eth/tracers/internal/tracetest/util.go @@ -5,7 +5,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 a38983d39fa..02e3a1e1a6e 100644 --- a/eth/tracers/js/goja.go +++ b/eth/tracers/js/goja.go @@ -23,17 +23,17 @@ import ( "math/big" "github.com/dop251/goja" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" "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" + + "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 080230f7cc0..e2fe82353f5 100644 --- a/eth/tracers/js/tracer_test.go +++ b/eth/tracers/js/tracer_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" "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/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 a869ea036ec..f935150332d 100644 --- a/eth/tracers/logger/access_list_tracer.go +++ b/eth/tracers/logger/access_list_tracer.go @@ -19,13 +19,13 @@ package logger import ( "sort" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" "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" + "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 02f719689ff..fe5bf608b81 100644 --- a/eth/tracers/logger/access_list_tracer_test.go +++ b/eth/tracers/logger/access_list_tracer_test.go @@ -3,8 +3,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 51794956f88..6825ea09fb5 100644 --- a/eth/tracers/logger/json_stream.go +++ b/eth/tracers/logger/json_stream.go @@ -5,12 +5,12 @@ import ( "encoding/hex" "sort" + libcommon "github.com/erigontech/erigon-lib/common" "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" + "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 c49a6c4ca85..9aeb910344e 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -12,13 +12,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 c06b4769226..a361cd898d7 100644 --- a/eth/tracers/logger/logger_json.go +++ b/eth/tracers/logger/logger_json.go @@ -21,12 +21,12 @@ import ( "io" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" "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" + "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 b4b41213754..1ce81beaecd 100644 --- a/eth/tracers/logger/logger_test.go +++ b/eth/tracers/logger/logger_test.go @@ -20,15 +20,15 @@ import ( "math/big" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "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" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" - "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 dummyContractRef struct { diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go index c61617171f0..47af7174a4b 100644 --- a/eth/tracers/native/4byte.go +++ b/eth/tracers/native/4byte.go @@ -21,12 +21,12 @@ import ( "strconv" "sync/atomic" + libcommon "github.com/erigontech/erigon-lib/common" "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" + "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 964b02aa13a..dbbd0c20caa 100644 --- a/eth/tracers/native/call.go +++ b/eth/tracers/native/call.go @@ -24,12 +24,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 e8a14bb4ad2..7d9cb3fedfe 100644 --- a/eth/tracers/native/mux.go +++ b/eth/tracers/native/mux.go @@ -19,11 +19,11 @@ package native import ( "encoding/json" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + "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 29365d00d86..9fdee764bef 100644 --- a/eth/tracers/native/noop.go +++ b/eth/tracers/native/noop.go @@ -19,11 +19,11 @@ package native import ( "encoding/json" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" - "github.com/ledgerwatch/erigon/eth/tracers" + "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 94779c52cbf..0959e30d78f 100644 --- a/eth/tracers/native/prestate.go +++ b/eth/tracers/native/prestate.go @@ -24,12 +24,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/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/hexutil" + "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 bdcc31394ec..5bc6968ffde 100644 --- a/eth/tracers/native/tracer.go +++ b/eth/tracers/native/tracer.go @@ -34,7 +34,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 7bf41f5769b..c3ccfa2ffe8 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -21,9 +21,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 5067a30f97c..f930bca90c8 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -23,26 +23,26 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/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/crypto" - "github.com/ledgerwatch/erigon/params" - "github.com/ledgerwatch/erigon/tests" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + libcommon "github.com/erigontech/erigon-lib/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/crypto" + "github.com/erigontech/erigon/params" + "github.com/erigontech/erigon/tests" + "github.com/erigontech/erigon/turbo/stages/mock" "github.com/holiman/uint256" // 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 c45ad59ca0f..d677a6a1a12 100644 --- a/ethdb/cbor/pool.go +++ b/ethdb/cbor/pool.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/ugorji/go/codec" ) diff --git a/ethdb/db_interface.go b/ethdb/db_interface.go index ab131be8800..af3bd0ab72d 100644 --- a/ethdb/db_interface.go +++ b/ethdb/db_interface.go @@ -19,7 +19,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 796ad8fe2a3..e0e223606d7 100644 --- a/ethdb/kv_util.go +++ b/ethdb/kv_util.go @@ -3,8 +3,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 c1674cc4441..af1f95694d2 100644 --- a/ethdb/privateapi/all.go +++ b/ethdb/privateapi/all.go @@ -4,12 +4,12 @@ import ( "fmt" "net" - "github.com/ledgerwatch/erigon-lib/gointerfaces/grpcutil" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + "github.com/erigontech/erigon-lib/gointerfaces/remote" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/remotedbserver" - "github.com/ledgerwatch/erigon-lib/log/v3" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/kv/remotedbserver" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/grpc" "google.golang.org/grpc/credentials" "google.golang.org/grpc/health" diff --git a/ethdb/privateapi/ethbackend.go b/ethdb/privateapi/ethbackend.go index 2bb4e1bd7aa..ae74ce7990b 100644 --- a/ethdb/privateapi/ethbackend.go +++ b/ethdb/privateapi/ethbackend.go @@ -5,22 +5,22 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/protobuf/types/known/emptypb" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "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" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 c5bd3d11ece..28809c11048 100644 --- a/ethdb/privateapi/logsfilter.go +++ b/ethdb/privateapi/logsfilter.go @@ -5,12 +5,12 @@ import ( "io" "sync" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/types" - "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 a593cd14f04..1fdfe785aab 100644 --- a/ethdb/privateapi/logsfilter_test.go +++ b/ethdb/privateapi/logsfilter_test.go @@ -4,13 +4,13 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" "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 6a1d9b338c4..a0a75098e94 100644 --- a/ethdb/privateapi/mining.go +++ b/ethdb/privateapi/mining.go @@ -6,17 +6,17 @@ import ( "errors" "sync" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" - libcommon "github.com/ledgerwatch/erigon-lib/common" - proto_txpool "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/log/v3" + libcommon "github.com/erigontech/erigon-lib/common" + proto_txpool "github.com/erigontech/erigon-lib/gointerfaces/txpool" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/protobuf/types/known/emptypb" - "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 58de3247890..4f74ae114e9 100644 --- a/ethdb/prune/storage_mode.go +++ b/ethdb/prune/storage_mode.go @@ -9,9 +9,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 a5aeca248ac..71572edbe12 100644 --- a/ethdb/prune/storage_mode_test.go +++ b/ethdb/prune/storage_mode_test.go @@ -5,8 +5,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 006b1785fce..8769c129550 100644 --- a/ethdb/walk.go +++ b/ethdb/walk.go @@ -19,7 +19,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 44579e37753..367a794eeea 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -31,20 +31,20 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + 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/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" + + "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 7764cff826a..8f2641f3c5a 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,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 f40732989c4..af778260227 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,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 0e5bcb4c5b3..9d215e39ea7 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,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 f6081c16118..93eda0afbee 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,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 191764001e6..3d8eb1524f7 100644 --- a/go.mod +++ b/go.mod @@ -1,14 +1,14 @@ -module github.com/ledgerwatch/erigon +module github.com/erigontech/erigon go 1.22.0 require ( github.com/erigontech/mdbx-go v0.27.24 + github.com/erigontech/secp256k1 v1.1.0 github.com/erigontech/silkworm-go v0.18.0 - github.com/ledgerwatch/secp256k1 v1.0.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 @@ -36,6 +36,8 @@ require ( github.com/dop251/goja v0.0.0-20220405120441-9037c2b61cbf github.com/edsrzf/mmap-go v1.1.0 github.com/emicklei/dot v1.6.1 + github.com/erigontech/erigon-lib v1.0.0 + github.com/erigontech/erigonwatch v0.1.16 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 @@ -62,8 +64,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 v1.0.0 - github.com/ledgerwatch/erigonwatch v0.1.2 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 @@ -159,6 +159,7 @@ require ( github.com/docker/go-units v0.5.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/elastic/gosigar v0.14.2 // indirect + github.com/erigontech/erigon-snapshot v1.3.1-0.20241023024258-f64407a77e8e // indirect github.com/erigontech/speedtest v0.0.2 // indirect github.com/flynn/noise v1.1.0 // indirect github.com/francoispqt/gojay v1.2.13 // indirect @@ -185,7 +186,6 @@ require ( github.com/koron/go-ssdp v0.0.4 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb // indirect github.com/libp2p/go-buffer-pool v0.1.0 // indirect github.com/libp2p/go-flow-metrics v0.1.0 // indirect github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect diff --git a/go.sum b/go.sum index 999f62b3c15..f1ea9f78c6e 100644 --- a/go.sum +++ b/go.sum @@ -268,8 +268,14 @@ github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1m github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/erigontech/erigon-snapshot v1.3.1-0.20241023024258-f64407a77e8e h1:ZpIO6HeopuZPYDLldL6zR0qyRezj80kQrDOGEF779ts= +github.com/erigontech/erigon-snapshot v1.3.1-0.20241023024258-f64407a77e8e/go.mod h1:ooHlCl+eEYzebiPu+FP6Q6SpPUeMADn8Jxabv3IKb9M= +github.com/erigontech/erigonwatch v0.1.16 h1:ygx/H0L1quI9kMSZBIKCvMxp0qX9UoxPdWe1r9mkbk0= +github.com/erigontech/erigonwatch v0.1.16/go.mod h1:8vQ+VjvLu2gkPs8EwdPrOTAAo++WuLuBi54N7NuAF0I= github.com/erigontech/mdbx-go v0.27.24 h1:jNsRE/4jC1F3S5SpAbmgT5jrEkfrdFk2MKEL9toVPxo= github.com/erigontech/mdbx-go v0.27.24/go.mod h1:FAMxbOgqOnRDx51j8HjuJZIgznbDwjX7LItd+/UWyA4= +github.com/erigontech/secp256k1 v1.1.0 h1:mO3YJMUSoASE15Ya//SoHiisptUhdXExuMUN1M0X9qY= +github.com/erigontech/secp256k1 v1.1.0/go.mod h1:GokhPepsMB+EYDs7I5JZCprxHW6+yfOcJKaKtoZ+Fls= github.com/erigontech/silkworm-go v0.18.0 h1:j56p61xZHBFhZGH1OixlGU8KcfjHzcw9pjAfjmVsOZA= github.com/erigontech/silkworm-go v0.18.0/go.mod h1:O50ux0apICEVEGyRWiE488K8qz8lc3PA/SXbQQAc8SU= github.com/erigontech/speedtest v0.0.2 h1:W9Cvky/8AMUtUONwkLA/dZjeQ2XfkBdYfJzvhMZUO+U= @@ -530,12 +536,6 @@ github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758 h1:0D5M2HQSGD3P github.com/kylelemons/godebug v0.0.0-20170224010052-a616ab194758/go.mod h1:B69LEHPfb2qLo0BaaOLcbitczOKLWTsrBG9LczfCD4k= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/leanovate/gopter v0.2.9/go.mod h1:U2L/78B+KVFIx2VmW6onHJQzXtFb+p5y3y2Sh+Jxxv8= -github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb h1:bsoVxjnQGxhOODRmkdrbkRTB9+sIduguoNMSZPRRoTI= -github.com/ledgerwatch/erigon-snapshot v1.3.1-0.20240805114253-42da880260bb/go.mod h1:3AuPxZc85jkehh/HA9h8gabv5MSi3kb/ddtzBsTVJFo= -github.com/ledgerwatch/erigonwatch v0.1.2 h1:/jq0r3oFh61pYk65Rw10aeCJj2Mzs1E2AG6TXG668og= -github.com/ledgerwatch/erigonwatch v0.1.2/go.mod h1:5K2cWaom0/rURye4dUUEQg2UyCH2A5zHVp86TDDMaA4= -github.com/ledgerwatch/secp256k1 v1.0.0 h1:Usvz87YoTG0uePIV8woOof5cQnLXGYa162rFf3YnwaQ= -github.com/ledgerwatch/secp256k1 v1.0.0/go.mod h1:SPmqJFciiF/Q0mPt2jVs2dTr/1TZBTIA+kPMmKgBAak= github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8= github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg= github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM= diff --git a/interfaces.go b/interfaces.go index c93740696c4..b75a0d0751b 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,11 +22,11 @@ import ( "errors" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/erigon-lib/types" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/migrations/db_schema_version.go b/migrations/db_schema_version.go index c4978b0b47e..082a0156530 100644 --- a/migrations/db_schema_version.go +++ b/migrations/db_schema_version.go @@ -3,9 +3,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 424368f0ef0..510a14cb5bd 100644 --- a/migrations/migrations.go +++ b/migrations/migrations.go @@ -6,13 +6,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" "github.com/ugorji/go/codec" ) diff --git a/migrations/migrations_test.go b/migrations/migrations_test.go index 4b793b7c454..786e19ad8e2 100644 --- a/migrations/migrations_test.go +++ b/migrations/migrations_test.go @@ -5,11 +5,11 @@ import ( "errors" "testing" - "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" "github.com/stretchr/testify/require" ) diff --git a/migrations/prohibit_new_downloads2.go b/migrations/prohibit_new_downloads2.go index c0854d9af55..1f9f3ac0b8a 100644 --- a/migrations/prohibit_new_downloads2.go +++ b/migrations/prohibit_new_downloads2.go @@ -7,14 +7,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 db4741066e1..b110a6d5f22 100644 --- a/migrations/prohibit_new_downloads_lock.go +++ b/migrations/prohibit_new_downloads_lock.go @@ -5,12 +5,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/migrations/txs_begin_end.go b/migrations/txs_begin_end.go index b2224df52ac..2b6f2697f1a 100644 --- a/migrations/txs_begin_end.go +++ b/migrations/txs_begin_end.go @@ -8,18 +8,18 @@ import ( "runtime" "time" - common2 "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/assert" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "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/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/rlp" + common2 "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/assert" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/common/hexutility" + "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/eth/stagedsync/stages" + "github.com/erigontech/erigon/rlp" ) var ErrTxsBeginEndNoMigration = fmt.Errorf("in this Erigon version DB format was changed: added additional first/last system-txs to blocks. There is no DB migration for this change. Please re-sync or switch to earlier version") diff --git a/migrations/txs_begin_end_test.go b/migrations/txs_begin_end_test.go index 708e1ed2a32..df7fbaeda04 100644 --- a/migrations/txs_begin_end_test.go +++ b/migrations/txs_begin_end_test.go @@ -8,18 +8,18 @@ import ( "testing" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/migrations" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/migrations" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) func TestTxsBeginEnd(t *testing.T) { diff --git a/migrations/txs_v3.go b/migrations/txs_v3.go index a0f30641b98..4548ec56e54 100644 --- a/migrations/txs_v3.go +++ b/migrations/txs_v3.go @@ -7,14 +7,14 @@ import ( "runtime" "time" - common2 "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/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + common2 "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/hexutility" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb" + "github.com/erigontech/erigon/core/rawdb" ) var TxsV3 = Migration{ diff --git a/migrations/txs_v3_test.go b/migrations/txs_v3_test.go index 53c42ec65ca..a7eaa80e71b 100644 --- a/migrations/txs_v3_test.go +++ b/migrations/txs_v3_test.go @@ -9,20 +9,20 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/common/u256" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/migrations" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/kv/dbutils" + + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + "github.com/erigontech/erigon-lib/common/u256" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/migrations" + "github.com/erigontech/erigon/rlp" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" ) func TestTxsV3(t *testing.T) { diff --git a/node/endpoints.go b/node/endpoints.go index 3fb93da9bb7..7ae4bd8c832 100644 --- a/node/endpoints.go +++ b/node/endpoints.go @@ -25,10 +25,10 @@ import ( "net/url" "time" - 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" "golang.org/x/net/http2" "golang.org/x/net/http2/h2c" ) diff --git a/node/node.go b/node/node.go index 7c50f00b7ce..85500e80eb0 100644 --- a/node/node.go +++ b/node/node.go @@ -29,20 +29,20 @@ 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/erigontech/erigon-lib/log/v3" "github.com/gofrs/flock" - "github.com/ledgerwatch/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 0d2ab7c6fdc..8ccc92effd6 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -21,9 +21,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 7ef7233da59..e3ae8f4f523 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -23,12 +23,12 @@ import ( "runtime" "testing" - "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" "github.com/stretchr/testify/require" ) diff --git a/node/nodecfg/config.go b/node/nodecfg/config.go index dcf9c3bb23d..918e787340f 100644 --- a/node/nodecfg/config.go +++ b/node/nodecfg/config.go @@ -25,15 +25,15 @@ import ( "sync" "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 7d6227717e9..1d4bbb41377 100644 --- a/node/nodecfg/config_test.go +++ b/node/nodecfg/config_test.go @@ -23,10 +23,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 da16d7ab990..85d60b1a803 100644 --- a/node/nodecfg/defaults.go +++ b/node/nodecfg/defaults.go @@ -17,11 +17,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 a396687c122..9084366d8ba 100644 --- a/node/rpcstack.go +++ b/node/rpcstack.go @@ -28,9 +28,9 @@ import ( "sync" "sync/atomic" - "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" "github.com/rs/cors" ) diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index 4ea88ae6575..c1612e8a7fe 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -26,13 +26,13 @@ import ( "strings" "testing" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" + "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/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/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 23d3e5300ae..867d412ec1c 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -28,11 +28,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 34080dda51e..41f5b13a034 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -27,11 +27,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 9852757ef9b..81292b83abb 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -22,13 +22,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 5bc2ba47982..e3edb9d61d8 100644 --- a/p2p/discover/lookup.go +++ b/p2p/discover/lookup.go @@ -20,7 +20,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 2aebde2be0f..298ba26d795 100644 --- a/p2p/discover/lookup_util_test.go +++ b/p2p/discover/lookup_util_test.go @@ -7,10 +7,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 59c20b1bdb3..f72f4c231eb 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -20,7 +20,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 4e017365c6a..9197e8aadcd 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -25,8 +25,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 1b8072dafa0..50b3149e576 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,12 +33,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 8e8e9a862ed..4e6d2d35115 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -25,11 +25,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 de33ddded4e..6f82909b9b8 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -29,10 +29,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 f1ff407dc2f..5795c867486 100644 --- a/p2p/discover/v4_lookup_test.go +++ b/p2p/discover/v4_lookup_test.go @@ -26,10 +26,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 2514c3d4ea9..839f92d0be2 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -28,14 +28,14 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/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 ce3e18d7f6f..b80688bed05 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -32,12 +32,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 @@ -548,7 +548,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 bca303f0bd6..f9eab1b043f 100644 --- a/p2p/discover/v4wire/v4wire.go +++ b/p2p/discover/v4wire/v4wire.go @@ -27,10 +27,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 ba2824a8bd0..b5eb23e1c71 100644 --- a/p2p/discover/v4wire/v4wire_test.go +++ b/p2p/discover/v4wire/v4wire_test.go @@ -23,8 +23,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 1eb2fd7e32f..f3fe154f4cd 100644 --- a/p2p/discover/v5_lookup_test.go +++ b/p2p/discover/v5_lookup_test.go @@ -9,9 +9,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 7b96d7807a8..69f5879b9b6 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -29,14 +29,14 @@ import ( "sync" "time" - common2 "github.com/ledgerwatch/erigon-lib/common/cmp" - "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" + common2 "github.com/erigontech/erigon-lib/common/cmp" + "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 5989c749fa1..faab6185d2c 100644 --- a/p2p/discover/v5_udp_integration_test.go +++ b/p2p/discover/v5_udp_integration_test.go @@ -9,8 +9,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 3566b737dc6..b0e5d1adf42 100644 --- a/p2p/discover/v5_udp_test.go +++ b/p2p/discover/v5_udp_test.go @@ -29,13 +29,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 bb3bbefa21a..a2c14041a50 100644 --- a/p2p/discover/v5wire/crypto.go +++ b/p2p/discover/v5wire/crypto.go @@ -25,9 +25,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 28b8d22481d..8548be2066d 100644 --- a/p2p/discover/v5wire/crypto_test.go +++ b/p2p/discover/v5wire/crypto_test.go @@ -25,11 +25,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 703c09a7fec..9792d2b8c49 100644 --- a/p2p/discover/v5wire/encoding.go +++ b/p2p/discover/v5wire/encoding.go @@ -28,10 +28,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 3a79bb9a407..8ea965d67b7 100644 --- a/p2p/discover/v5wire/encoding_test.go +++ b/p2p/discover/v5wire/encoding_test.go @@ -31,13 +31,13 @@ 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 82e8e92168e..871ebbedeca 100644 --- a/p2p/discover/v5wire/msg.go +++ b/p2p/discover/v5wire/msg.go @@ -20,10 +20,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 66fbfc652ee..f0f7e31ccfb 100644 --- a/p2p/discover/v5wire/session.go +++ b/p2p/discover/v5wire/session.go @@ -22,9 +22,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 588ea3f0ce1..baadb1940ab 100644 --- a/p2p/dnsdisc/client.go +++ b/p2p/dnsdisc/client.go @@ -27,12 +27,12 @@ import ( "sync" "time" + "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/hashicorp/golang-lru/v2" - "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" "golang.org/x/sync/singleflight" "golang.org/x/time/rate" ) diff --git a/p2p/dnsdisc/client_test.go b/p2p/dnsdisc/client_test.go index dbbd20fa865..6d5a0f06a3d 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -24,15 +24,15 @@ 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 c58e31bcbf3..074dcbdc9a9 100644 --- a/p2p/dnsdisc/sync.go +++ b/p2p/dnsdisc/sync.go @@ -21,8 +21,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 6a25fcd0c1a..762a173a04d 100644 --- a/p2p/dnsdisc/tree.go +++ b/p2p/dnsdisc/tree.go @@ -26,10 +26,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 828d0c61645..a4e31431afe 100644 --- a/p2p/dnsdisc/tree_test.go +++ b/p2p/dnsdisc/tree_test.go @@ -17,12 +17,12 @@ package dnsdisc import ( - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "reflect" "testing" "github.com/davecgh/go-spew/spew" - "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 d07ef769c3a..d673a9202fe 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,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 05f12573196..5d6f3cb511a 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,9 +23,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 d410be4fd21..6059c382848 100644 --- a/p2p/enode/iter.go +++ b/p2p/enode/iter.go @@ -20,7 +20,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 83eaa8da1b0..d82f54dc15e 100644 --- a/p2p/enode/iter_test.go +++ b/p2p/enode/iter_test.go @@ -23,7 +23,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 96c4cc5c0d9..86575e76378 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,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 09965616efd..be75305c532 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -22,9 +22,9 @@ import ( "net" "testing" - "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" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/node.go b/p2p/enode/node.go index 6a5cb1984d2..c9de81fed28 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -26,8 +26,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 9ed7ee0b16f..a76ccbcad45 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -24,8 +24,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 7d8f3ef61c6..02c7d2a6d70 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -29,12 +29,12 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/log/v3" mdbx1 "github.com/erigontech/mdbx-go/mdbx" - "github.com/ledgerwatch/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 0d1ed627694..b18cf38e4a7 100644 --- a/p2p/enode/nodedb_test.go +++ b/p2p/enode/nodedb_test.go @@ -26,7 +26,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 eae6998eecb..9e9647e2b96 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,8 +26,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 43488591f1b..101115c504c 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -24,8 +24,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 f28b233f217..cfa9b8fa386 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,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 dd4f1fe14f0..f32a7f89b5f 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,7 +24,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 5554ebd9c70..80ccff04668 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -21,7 +21,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 90c29164513..d7130d7fde2 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -25,10 +25,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 26190bbd925..cdc0ef94429 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -21,7 +21,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 f7fe9af64ce..549ca5871c8 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,7 +25,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 278e07cc5fa..5c5dc4767b8 100644 --- a/p2p/nat/natpmp.go +++ b/p2p/nat/natpmp.go @@ -22,8 +22,8 @@ import ( "strings" "time" + "github.com/erigontech/erigon/common/debug" natpmp "github.com/jackpal/go-nat-pmp" - "github.com/ledgerwatch/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 083ab90f606..297b25a502e 100644 --- a/p2p/nat/natupnp.go +++ b/p2p/nat/natupnp.go @@ -24,10 +24,10 @@ import ( "sync" "time" + "github.com/erigontech/erigon/common/debug" "github.com/huin/goupnp" "github.com/huin/goupnp/dcps/internetgateway1" "github.com/huin/goupnp/dcps/internetgateway2" - "github.com/ledgerwatch/erigon/common/debug" ) const ( diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index 36c1bc28901..a28618a13ee 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,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 3fd7128ca4d..b9194977fe3 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,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 ad32a58ef7d..5186b6284ba 100644 --- a/p2p/node_key_config.go +++ b/p2p/node_key_config.go @@ -6,7 +6,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 f155cd5518a..bf804d3766b 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -26,15 +26,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 ec6fadb0b4c..e1bf1c1e155 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -28,10 +28,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 bcd40c5dc8c..cad94ceeeb0 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -19,8 +19,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 2fb372debe4..82f88be19fc 100644 --- a/p2p/rlpx/buffer_test.go +++ b/p2p/rlpx/buffer_test.go @@ -18,7 +18,7 @@ package rlpx import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "testing" "github.com/stretchr/testify/assert" diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go index a094bb8df79..e02cc19d6d1 100644 --- a/p2p/rlpx/rlpx.go +++ b/p2p/rlpx/rlpx.go @@ -34,10 +34,10 @@ import ( "net" "time" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/crypto/ecies" + "github.com/erigontech/erigon/rlp" "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" ) diff --git a/p2p/rlpx/rlpx_test.go b/p2p/rlpx/rlpx_test.go index 3353fd39365..a4b1e01a3b7 100644 --- a/p2p/rlpx/rlpx_test.go +++ b/p2p/rlpx/rlpx_test.go @@ -29,10 +29,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 768f57cd1a8..6b35908a905 100644 --- a/p2p/sentry/eth_handshake.go +++ b/p2p/sentry/eth_handshake.go @@ -3,11 +3,11 @@ package sentry import ( "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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/sentry" + "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 57eed30b339..8f402aded48 100644 --- a/p2p/sentry/eth_handshake_test.go +++ b/p2p/sentry/eth_handshake_test.go @@ -7,14 +7,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/sentry" + 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/sentry" - "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 118a1e93e70..a7703fc0d84 100644 --- a/p2p/sentry/sentry_grpc_server.go +++ b/p2p/sentry/sentry_grpc_server.go @@ -18,31 +18,31 @@ import ( "syscall" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/grpc" "google.golang.org/grpc/health" "google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/protobuf/types/known/emptypb" - 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/sentry" - proto_types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - - "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" + 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/sentry" + proto_types "github.com/erigontech/erigon-lib/gointerfaces/types" + + "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 e2aae045110..67905403de6 100644 --- a/p2p/sentry/sentry_grpc_server_test.go +++ b/p2p/sentry/sentry_grpc_server_test.go @@ -6,23 +6,23 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/chain" + "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/sentry" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain" - "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/sentry" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "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" + libcommon "github.com/erigontech/erigon-lib/common" + "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 7eac5dda8a3..82f318083af 100644 --- a/p2p/sentry/sentry_multi_client/broadcast.go +++ b/p2p/sentry/sentry_multi_client/broadcast.go @@ -7,16 +7,16 @@ import ( "strings" "syscall" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/grpc" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" - "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 bc757784971..c9405ec98d4 100644 --- a/p2p/sentry/sentry_multi_client/sentry_api.go +++ b/p2p/sentry/sentry_multi_client/sentry_api.go @@ -6,15 +6,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/sentry" - - "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/sentry" + + "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 0d014637ee3..0c7f67012fd 100644 --- a/p2p/sentry/sentry_multi_client/sentry_multi_client.go +++ b/p2p/sentry/sentry_multi_client/sentry_multi_client.go @@ -12,31 +12,31 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "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/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/sentry" - proto_types "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - - "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/dbg" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/grpcutil" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + proto_types "github.com/erigontech/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + + "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/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 6119fdd710d..399e7372d23 100644 --- a/p2p/sentry/simulator/sentry_simulator.go +++ b/p2p/sentry/simulator/sentry_simulator.go @@ -6,27 +6,27 @@ import ( "fmt" "path/filepath" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/protobuf/types/known/emptypb" - "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/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "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/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/sentry" + "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 c3537b7a802..3fe6ec8ac9a 100644 --- a/p2p/sentry/simulator/simulator_test.go +++ b/p2p/sentry/simulator/simulator_test.go @@ -7,14 +7,14 @@ import ( "context" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - sentry_if "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + sentry_if "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 9ce2d01dab9..e3f6bd2713e 100644 --- a/p2p/sentry/status_data_provider.go +++ b/p2p/sentry/status_data_provider.go @@ -6,17 +6,17 @@ import ( "fmt" "math/big" + "github.com/erigontech/erigon-lib/log/v3" "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/sentry" - "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/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 f0f5fd5ef8c..26de9f67505 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -34,18 +34,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 fd0ccb926e2..49624dbe0f8 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -29,11 +29,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 5105712c0a5..1114b2ff8f6 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,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 b0219406b7c..0c5c73cc105 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -24,13 +24,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 83bb87918b1..26d37642979 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,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 71483d89404..511d7916077 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -28,15 +28,15 @@ 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/erigontech/erigon-lib/log/v3" "github.com/gorilla/websocket" "github.com/julienschmidt/httprouter" - "github.com/ledgerwatch/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 d3379b39d2e..551cfd70eda 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,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 8d35b133acf..21cdb226e4d 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -27,11 +27,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 b6e6f852797..2c57e83a155 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,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 00b88ce2b55..2318e27c9bd 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -19,10 +19,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 405d28b3acc..f42c810b500 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -26,10 +26,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 ( @@ -102,7 +102,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 37eb84ea8ff..12eabcda99a 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -23,11 +23,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 845107e2dba..a3757e714d0 100644 --- a/p2p/util.go +++ b/p2p/util.go @@ -19,7 +19,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 80506961453..9b1824a8724 100644 --- a/p2p/util_test.go +++ b/p2p/util_test.go @@ -20,7 +20,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 20132b92bbe..be34c917259 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -17,8 +17,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 @@ -68,7 +68,7 @@ var GoerliBootnodes = []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 dc0c2c8add6..776ce0eb179 100644 --- a/params/config.go +++ b/params/config.go @@ -23,12 +23,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 c5463a12fb2..a534a3f126d 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -24,8 +24,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 f98b425c799..e95ca210fd8 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,9 +19,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 d5e0d8cc868..bd4b71c5f36 100644 --- a/params/mining.go +++ b/params/mining.go @@ -5,8 +5,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 085e58af384..0a4a7befcb8 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -19,7 +19,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 f29de56980d..e66016632fa 100644 --- a/params/version.go +++ b/params/version.go @@ -19,7 +19,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 83ecf3786d3..7eecc5d7534 100644 --- a/polygon/bor/bor.go +++ b/polygon/bor/bor.go @@ -16,40 +16,40 @@ import ( "sync/atomic" "time" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/arc/v2" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/xsleonard/go-merkle" "golang.org/x/crypto/sha3" "golang.org/x/sync/errgroup" - "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/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/heimdall" - "github.com/ledgerwatch/erigon/rlp" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/services" + "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/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/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 b957adcf389..844b949b5dd 100644 --- a/polygon/bor/bor_test.go +++ b/polygon/bor/bor_test.go @@ -8,26 +8,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 db24874d745..1dba3374046 100644 --- a/polygon/bor/borcfg/bor_config.go +++ b/polygon/bor/borcfg/bor_config.go @@ -5,7 +5,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 81c2f264038..0d3e60921c8 100644 --- a/polygon/bor/bordb/prune.go +++ b/polygon/bor/bordb/prune.go @@ -5,9 +5,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 1d7a35fde6e..ae067e5a116 100644 --- a/polygon/bor/fake.go +++ b/polygon/bor/fake.go @@ -1,12 +1,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 a3b68c2b532..31d9ed83c5d 100644 --- a/polygon/bor/fee_log.go +++ b/polygon/bor/fee_log.go @@ -3,10 +3,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 5df9ff2ca22..a55e24764a9 100644 --- a/polygon/bor/finality/api.go +++ b/polygon/bor/finality/api.go @@ -1,11 +1,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 6c1e7060850..2fe8664c28a 100644 --- a/polygon/bor/finality/bor_verifier.go +++ b/polygon/bor/finality/bor_verifier.go @@ -6,11 +6,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 7185ee893da..bd819c1c20c 100644 --- a/polygon/bor/finality/generics/generics.go +++ b/polygon/bor/finality/generics/generics.go @@ -1,8 +1,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 eecf3a53236..d5d209262d2 100644 --- a/polygon/bor/finality/rawdb/checkpoint.go +++ b/polygon/bor/finality/rawdb/checkpoint.go @@ -4,7 +4,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 0befde62bd6..fb581ba95cf 100644 --- a/polygon/bor/finality/rawdb/milestone.go +++ b/polygon/bor/finality/rawdb/milestone.go @@ -5,10 +5,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 c679add9d38..140b605cdd7 100644 --- a/polygon/bor/finality/whitelist.go +++ b/polygon/bor/finality/whitelist.go @@ -6,13 +6,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 fd33dd656f0..5eb6909db54 100644 --- a/polygon/bor/finality/whitelist/checkpoint.go +++ b/polygon/bor/finality/whitelist/checkpoint.go @@ -1,10 +1,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 16b17be6616..f8390f8cd68 100644 --- a/polygon/bor/finality/whitelist/finality.go +++ b/polygon/bor/finality/whitelist/finality.go @@ -3,11 +3,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 d3204e2b69b..81ad9d301cf 100644 --- a/polygon/bor/finality/whitelist/milestone.go +++ b/polygon/bor/finality/whitelist/milestone.go @@ -1,13 +1,13 @@ package whitelist import ( - "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/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/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 14dec13d799..47da6f8f70c 100644 --- a/polygon/bor/finality/whitelist/service.go +++ b/polygon/bor/finality/whitelist/service.go @@ -3,10 +3,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 4e0de45b663..06c64c49321 100644 --- a/polygon/bor/finality/whitelist/service_test.go +++ b/polygon/bor/finality/whitelist/service_test.go @@ -8,12 +8,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 1871b0b5169..d7d9447653f 100644 --- a/polygon/bor/finality/whitelist_helpers.go +++ b/polygon/bor/finality/whitelist_helpers.go @@ -4,12 +4,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 17c7812c7cf..8438ac7a00c 100644 --- a/polygon/bor/genesis_contracts.go +++ b/polygon/bor/genesis_contracts.go @@ -4,13 +4,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 ea43f6eccf7..ad7cfd46fa2 100644 --- a/polygon/bor/snapshot.go +++ b/polygon/bor/snapshot.go @@ -7,14 +7,14 @@ import ( "encoding/json" "time" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/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 e39674bca30..570317d45ae 100644 --- a/polygon/bor/snapshot_test.go +++ b/polygon/bor/snapshot_test.go @@ -8,9 +8,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 83812b95b31..494e158b9bd 100644 --- a/polygon/bor/snaptype/types.go +++ b/polygon/bor/snaptype/types.go @@ -11,23 +11,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 c1e9431bfbd..75f42247ad8 100644 --- a/polygon/bor/snaptype/types_test.go +++ b/polygon/bor/snaptype/types_test.go @@ -3,7 +3,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 00ef70656d3..1d238b15fcf 100644 --- a/polygon/bor/spanner.go +++ b/polygon/bor/spanner.go @@ -5,15 +5,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 7cc3d5d3ecc..75f6fe3ead5 100644 --- a/polygon/bor/spanner_test_validators.go +++ b/polygon/bor/spanner_test_validators.go @@ -1,9 +1,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 fa0baf22bb2..ec8c0daa5f9 100644 --- a/polygon/bor/statefull/processor.go +++ b/polygon/bor/statefull/processor.go @@ -1,9 +1,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 08cf384e56e..0800d390106 100644 --- a/polygon/bor/types/bor_receipt.go +++ b/polygon/bor/types/bor_receipt.go @@ -5,10 +5,10 @@ import ( "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 2a525bfd935..9b44e366ce6 100644 --- a/polygon/bor/valset/validator.go +++ b/polygon/bor/valset/validator.go @@ -9,7 +9,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 a9e554ad0cc..7c7f1ecd8cb 100644 --- a/polygon/bor/valset/validator_set.go +++ b/polygon/bor/valset/validator_set.go @@ -10,7 +10,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/heimdall/checkpoint.go b/polygon/heimdall/checkpoint.go index b26d5697866..0dcc15ba21b 100644 --- a/polygon/heimdall/checkpoint.go +++ b/polygon/heimdall/checkpoint.go @@ -6,8 +6,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" ) var _ Waypoint = Checkpoint{} diff --git a/polygon/heimdall/client.go b/polygon/heimdall/client.go index 6918d8840d2..89163b95e2e 100644 --- a/polygon/heimdall/client.go +++ b/polygon/heimdall/client.go @@ -13,9 +13,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 7d3d81c2b06..405ba0cb544 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 acc50a812f3..f214e2be080 100644 --- a/polygon/heimdall/client_test.go +++ b/polygon/heimdall/client_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon/turbo/testlog" ) type emptyBodyReadCloser struct{} diff --git a/polygon/heimdall/event_record.go b/polygon/heimdall/event_record.go index b7ae3ac68dc..daeab212fca 100644 --- a/polygon/heimdall/event_record.go +++ b/polygon/heimdall/event_record.go @@ -7,10 +7,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/heimdall.go b/polygon/heimdall/heimdall.go index 997721a78f1..6d7017e6654 100644 --- a/polygon/heimdall/heimdall.go +++ b/polygon/heimdall/heimdall.go @@ -6,9 +6,9 @@ import ( "sort" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/common" + "github.com/erigontech/erigon-lib/common" ) // Heimdall is a wrapper of Heimdall HTTP API diff --git a/polygon/heimdall/heimdall_mock.go b/polygon/heimdall/heimdall_mock.go index 421f5979dd5..3b44d7b0133 100644 --- a/polygon/heimdall/heimdall_mock.go +++ b/polygon/heimdall/heimdall_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/heimdall (interfaces: Heimdall) +// Source: github.com/erigontech/erigon/polygon/heimdall (interfaces: Heimdall) // // Generated by this command: // diff --git a/polygon/heimdall/heimdall_no_store.go b/polygon/heimdall/heimdall_no_store.go index 1125871f3ac..d68717f0c98 100644 --- a/polygon/heimdall/heimdall_no_store.go +++ b/polygon/heimdall/heimdall_no_store.go @@ -3,7 +3,7 @@ package heimdall import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" ) //go:generate mockgen -typed=true -destination=./heimdall_no_store_mock.go -package=heimdall . HeimdallNoStore diff --git a/polygon/heimdall/heimdall_no_store_mock.go b/polygon/heimdall/heimdall_no_store_mock.go index 9cc8a9a4293..aff58a0c939 100644 --- a/polygon/heimdall/heimdall_no_store_mock.go +++ b/polygon/heimdall/heimdall_no_store_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/heimdall (interfaces: HeimdallNoStore) +// Source: github.com/erigontech/erigon/polygon/heimdall (interfaces: HeimdallNoStore) // // Generated by this command: // diff --git a/polygon/heimdall/heimdall_test.go b/polygon/heimdall/heimdall_test.go index 3c27118216d..3c281b4458d 100644 --- a/polygon/heimdall/heimdall_test.go +++ b/polygon/heimdall/heimdall_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon/crypto" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + "github.com/erigontech/erigon/crypto" ) func makeCheckpoint(start uint64, len uint) *Checkpoint { 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 295b86f70c2..ac26872add6 100644 --- a/polygon/heimdall/metrics.go +++ b/polygon/heimdall/metrics.go @@ -4,7 +4,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 12e64c00243..ddbabc700cc 100644 --- a/polygon/heimdall/milestone.go +++ b/polygon/heimdall/milestone.go @@ -6,8 +6,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" ) var _ Waypoint = Milestone{} diff --git a/polygon/heimdall/simulator/heimdall_simulator.go b/polygon/heimdall/simulator/heimdall_simulator.go index bce325439f0..137f6b1657e 100644 --- a/polygon/heimdall/simulator/heimdall_simulator.go +++ b/polygon/heimdall/simulator/heimdall_simulator.go @@ -9,18 +9,18 @@ import ( "path/filepath" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/common/background" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - "github.com/ledgerwatch/erigon/cmd/snapshots/sync" - "github.com/ledgerwatch/erigon/eth/ethconfig" - borsnaptype "github.com/ledgerwatch/erigon/polygon/bor/snaptype" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/turbo/snapshotsync/freezeblocks" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/common/background" + "github.com/erigontech/erigon-lib/downloader/snaptype" + "github.com/erigontech/erigon/cmd/snapshots/sync" + "github.com/erigontech/erigon/eth/ethconfig" + borsnaptype "github.com/erigontech/erigon/polygon/bor/snaptype" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/turbo/snapshotsync/freezeblocks" ) type HeimdallSimulator struct { diff --git a/polygon/heimdall/simulator/simulator_test.go b/polygon/heimdall/simulator/simulator_test.go index 5e9c1c963da..8fb0a2657fc 100644 --- a/polygon/heimdall/simulator/simulator_test.go +++ b/polygon/heimdall/simulator/simulator_test.go @@ -8,11 +8,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/assert" - "github.com/ledgerwatch/erigon/polygon/heimdall" - "github.com/ledgerwatch/erigon/polygon/heimdall/simulator" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/heimdall/simulator" ) //go:embed testdata/v1-000000-000500-borevents.seg diff --git a/polygon/heimdall/span.go b/polygon/heimdall/span.go index 10c36998c1f..b2748f5e53d 100644 --- a/polygon/heimdall/span.go +++ b/polygon/heimdall/span.go @@ -3,7 +3,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 34da42915e9..57efe3f359e 100644 --- a/polygon/heimdall/span_id.go +++ b/polygon/heimdall/span_id.go @@ -1,7 +1,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 4fa25269128..382919cf3f4 100644 --- a/polygon/heimdall/span_id_test.go +++ b/polygon/heimdall/span_id_test.go @@ -5,7 +5,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/storage.go b/polygon/heimdall/storage.go index 9d1fd910874..963f6ac12b5 100644 --- a/polygon/heimdall/storage.go +++ b/polygon/heimdall/storage.go @@ -6,8 +6,8 @@ import ( "encoding/json" "fmt" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon/turbo/services" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon/turbo/services" ) // Generate all mocks in file diff --git a/polygon/heimdall/storage_mock.go b/polygon/heimdall/storage_mock.go index 1bae0ae2b2a..df9cebb228e 100644 --- a/polygon/heimdall/storage_mock.go +++ b/polygon/heimdall/storage_mock.go @@ -13,9 +13,9 @@ import ( context "context" reflect "reflect" - common "github.com/ledgerwatch/erigon-lib/common" - kv "github.com/ledgerwatch/erigon-lib/kv" - rlp "github.com/ledgerwatch/erigon/rlp" + common "github.com/erigontech/erigon-lib/common" + kv "github.com/erigontech/erigon-lib/kv" + rlp "github.com/erigontech/erigon/rlp" gomock "go.uber.org/mock/gomock" ) diff --git a/polygon/heimdall/waypoint.go b/polygon/heimdall/waypoint.go index 565191e9d25..d5c87d6a7e9 100644 --- a/polygon/heimdall/waypoint.go +++ b/polygon/heimdall/waypoint.go @@ -4,7 +4,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 a313e0cfa4e..2ffb8e0cc63 100644 --- a/polygon/p2p/fetcher_base.go +++ b/polygon/p2p/fetcher_base.go @@ -9,10 +9,10 @@ import ( "github.com/cenkalti/backoff/v4" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + "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 8b6f69dc5a0..163e7f2513b 100644 --- a/polygon/p2p/fetcher_base_test.go +++ b/polygon/p2p/fetcher_base_test.go @@ -12,12 +12,12 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + erigonlibtypes "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 8dd66126857..9341f96446d 100644 --- a/polygon/p2p/fetcher_errors.go +++ b/polygon/p2p/fetcher_errors.go @@ -5,7 +5,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 39ee7d3845b..44407b4d3b3 100644 --- a/polygon/p2p/fetcher_penalizing.go +++ b/polygon/p2p/fetcher_penalizing.go @@ -5,9 +5,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 0c96e26a898..dcfa62406bc 100644 --- a/polygon/p2p/fetcher_penalizing_test.go +++ b/polygon/p2p/fetcher_penalizing_test.go @@ -7,9 +7,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 8f510ade3f2..d1de0c67a59 100644 --- a/polygon/p2p/fetcher_tracking.go +++ b/polygon/p2p/fetcher_tracking.go @@ -4,7 +4,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 f7576865ca3..8c218e897cb 100644 --- a/polygon/p2p/fetcher_tracking_test.go +++ b/polygon/p2p/fetcher_tracking_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 7d8fe74dc47..7c5c54f8f6e 100644 --- a/polygon/p2p/message_listener.go +++ b/polygon/p2p/message_listener.go @@ -5,14 +5,14 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - sentrymulticlient "github.com/ledgerwatch/erigon/p2p/sentry/sentry_multi_client" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon/eth/protocols/eth" + sentrymulticlient "github.com/erigontech/erigon/p2p/sentry/sentry_multi_client" + "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 73a8cb12159..7f5fbe8c330 100644 --- a/polygon/p2p/message_listener_test.go +++ b/polygon/p2p/message_listener_test.go @@ -8,21 +8,21 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" "google.golang.org/grpc" "google.golang.org/grpc/metadata" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 647a0ac6852..3d6e5ff6d16 100644 --- a/polygon/p2p/message_sender.go +++ b/polygon/p2p/message_sender.go @@ -4,10 +4,10 @@ import ( "context" "errors" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 6909bb0e5f2..26269c4b01b 100644 --- a/polygon/p2p/message_sender_test.go +++ b/polygon/p2p/message_sender_test.go @@ -8,12 +8,12 @@ import ( "go.uber.org/mock/gomock" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon/eth/protocols/eth" - "github.com/ledgerwatch/erigon/rlp" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + erigonlibtypes "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 b757994fa8d..46406bbd149 100644 --- a/polygon/p2p/peer_id.go +++ b/polygon/p2p/peer_id.go @@ -4,8 +4,8 @@ import ( "encoding/binary" "encoding/hex" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - erigonlibtypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces" + erigonlibtypes "github.com/erigontech/erigon-lib/gointerfaces/types" ) func PeerIdFromH512(h512 *erigonlibtypes.H512) *PeerId { diff --git a/polygon/p2p/peer_penalizer.go b/polygon/p2p/peer_penalizer.go index baec519723b..8802ed94b41 100644 --- a/polygon/p2p/peer_penalizer.go +++ b/polygon/p2p/peer_penalizer.go @@ -3,8 +3,8 @@ package p2p import ( "context" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" ) type PeerPenalizer interface { diff --git a/polygon/p2p/peer_shuffle.go b/polygon/p2p/peer_shuffle.go index 44d58b2ea3e..d0765a1386e 100644 --- a/polygon/p2p/peer_shuffle.go +++ b/polygon/p2p/peer_shuffle.go @@ -1,6 +1,6 @@ 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 db7ce7eb464..52a9ce7c76b 100644 --- a/polygon/p2p/peer_tracker.go +++ b/polygon/p2p/peer_tracker.go @@ -3,9 +3,9 @@ package p2p import ( "sync" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" ) type PeerTracker interface { diff --git a/polygon/p2p/peer_tracker_test.go b/polygon/p2p/peer_tracker_test.go index 895aec4fe1f..a724506a909 100644 --- a/polygon/p2p/peer_tracker_test.go +++ b/polygon/p2p/peer_tracker_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon/turbo/testlog" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon/turbo/testlog" ) func TestPeerTracker(t *testing.T) { diff --git a/polygon/p2p/service.go b/polygon/p2p/service.go index 1f15082cde5..7ca9da6e59d 100644 --- a/polygon/p2p/service.go +++ b/polygon/p2p/service.go @@ -4,10 +4,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 563c46309a6..2e8afda1523 100644 --- a/polygon/p2p/service_mock.go +++ b/polygon/p2p/service_mock.go @@ -13,9 +13,9 @@ import ( context "context" reflect "reflect" - sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - types "github.com/ledgerwatch/erigon/core/types" - eth "github.com/ledgerwatch/erigon/eth/protocols/eth" + sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + types "github.com/erigontech/erigon/core/types" + eth "github.com/erigontech/erigon/eth/protocols/eth" gomock "go.uber.org/mock/gomock" ) diff --git a/polygon/sync/accumulated_headers_verifier.go b/polygon/sync/accumulated_headers_verifier.go index 97b8043691c..e36840cd296 100644 --- a/polygon/sync/accumulated_headers_verifier.go +++ b/polygon/sync/accumulated_headers_verifier.go @@ -4,9 +4,9 @@ import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/heimdall" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/heimdall" ) type AccumulatedHeadersVerifier func(waypoint heimdall.Waypoint, headers []*types.Header) error diff --git a/polygon/sync/block_downloader.go b/polygon/sync/block_downloader.go index c33d9ff4aab..e43156df529 100644 --- a/polygon/sync/block_downloader.go +++ b/polygon/sync/block_downloader.go @@ -10,15 +10,15 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "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/common/cmp" + "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 c926d60fa7a..eac366b5777 100644 --- a/polygon/sync/block_downloader_test.go +++ b/polygon/sync/block_downloader_test.go @@ -9,16 +9,16 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - "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 69aed9fdfa0..fb9bbdde672 100644 --- a/polygon/sync/blocks_verifier.go +++ b/polygon/sync/blocks_verifier.go @@ -1,6 +1,6 @@ package sync -import "github.com/ledgerwatch/erigon/core/types" +import "github.com/erigontech/erigon/core/types" type BlocksVerifier func(blocks []*types.Block) error diff --git a/polygon/sync/canonical_chain_builder.go b/polygon/sync/canonical_chain_builder.go index c6ceabb8de6..d6c17a7cde6 100644 --- a/polygon/sync/canonical_chain_builder.go +++ b/polygon/sync/canonical_chain_builder.go @@ -6,9 +6,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_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 abad208176a..01da119bf6c 100644 --- a/polygon/sync/canonical_chain_builder_test.go +++ b/polygon/sync/canonical_chain_builder_test.go @@ -9,8 +9,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 fee15ff5179..69aa27f8ff0 100644 --- a/polygon/sync/difficulty.go +++ b/polygon/sync/difficulty.go @@ -5,13 +5,13 @@ import ( lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync" - 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 cf4e592ee3d..4e94f8e6eb1 100644 --- a/polygon/sync/difficulty_test.go +++ b/polygon/sync/difficulty_test.go @@ -7,9 +7,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 5c722fdda9e..0b8356dc546 100644 --- a/polygon/sync/execution_client.go +++ b/polygon/sync/execution_client.go @@ -3,8 +3,8 @@ package sync import ( "context" - executionclient "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/core/types" + executionclient "github.com/erigontech/erigon/cl/phase1/execution_client" + "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 e504cd3b2f4..84f5b0fa3cf 100644 --- a/polygon/sync/header_time_validator.go +++ b/polygon/sync/header_time_validator.go @@ -6,12 +6,12 @@ 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/eth/stagedsync" - "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/eth/stagedsync" + "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 0ac887a3aba..cfe33e51226 100644 --- a/polygon/sync/header_validator.go +++ b/polygon/sync/header_validator.go @@ -3,10 +3,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/service.go b/polygon/sync/service.go index 3bbebcdbd9c..a84599d57ab 100644 --- a/polygon/sync/service.go +++ b/polygon/sync/service.go @@ -3,19 +3,19 @@ package sync import ( "context" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/arc/v2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon-lib/chain" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - executionclient "github.com/ledgerwatch/erigon/cl/phase1/execution_client" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "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" + + "github.com/erigontech/erigon-lib/chain" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + executionclient "github.com/erigontech/erigon/cl/phase1/execution_client" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/stagedsync" + "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" ) type Service interface { diff --git a/polygon/sync/spans_cache.go b/polygon/sync/spans_cache.go index 66e3bd22400..2a700142a58 100644 --- a/polygon/sync/spans_cache.go +++ b/polygon/sync/spans_cache.go @@ -1,6 +1,6 @@ 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/storage.go b/polygon/sync/storage.go index 12aa855a6fd..8bc30ea28a3 100644 --- a/polygon/sync/storage.go +++ b/polygon/sync/storage.go @@ -5,9 +5,9 @@ import ( "sync" "time" - "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" ) //go:generate mockgen -typed=true -destination=./storage_mock.go -package=sync . Storage diff --git a/polygon/sync/storage_mock.go b/polygon/sync/storage_mock.go index 32c3611bc03..4c12270947b 100644 --- a/polygon/sync/storage_mock.go +++ b/polygon/sync/storage_mock.go @@ -1,5 +1,5 @@ // Code generated by MockGen. DO NOT EDIT. -// Source: github.com/ledgerwatch/erigon/polygon/sync (interfaces: Storage) +// Source: github.com/erigontech/erigon/polygon/sync (interfaces: Storage) // // 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 5a7b5403a62..01667a8e48a 100644 --- a/polygon/sync/sync.go +++ b/polygon/sync/sync.go @@ -4,11 +4,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 Sync struct { diff --git a/polygon/sync/tip_events.go b/polygon/sync/tip_events.go index 0e0dcb069ea..c1770e5957e 100644 --- a/polygon/sync/tip_events.go +++ b/polygon/sync/tip_events.go @@ -3,12 +3,12 @@ package sync import ( "context" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/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/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/protocols/eth" + "github.com/erigontech/erigon/polygon/heimdall" + "github.com/erigontech/erigon/polygon/p2p" ) const EventTypeNewBlock = "new-block" diff --git a/polygon/sync/validator_set_interface.go b/polygon/sync/validator_set_interface.go index a9e5f3a97a9..4724d5fbbf4 100644 --- a/polygon/sync/validator_set_interface.go +++ b/polygon/sync/validator_set_interface.go @@ -1,8 +1,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/tracer/bor_state_sync_txn_tracer.go b/polygon/tracer/bor_state_sync_txn_tracer.go index 1beea7c312e..e2a6ca1c5e8 100644 --- a/polygon/tracer/bor_state_sync_txn_tracer.go +++ b/polygon/tracer/bor_state_sync_txn_tracer.go @@ -5,10 +5,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 265ba7daed6..ba544e1ce06 100644 --- a/polygon/tracer/trace_bor_state_sync_txn.go +++ b/polygon/tracer/trace_bor_state_sync_txn.go @@ -7,22 +7,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" - "github.com/ledgerwatch/erigon/eth/tracers" - "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" + "github.com/erigontech/erigon/eth/tracers" + "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 006a6660aac..4361f762be8 100644 --- a/rlp/decode.go +++ b/rlp/decode.go @@ -28,7 +28,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 61092887123..c71910e3ac9 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -27,7 +27,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 1cedf1b3be7..cd50e0a6174 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -25,7 +25,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 c33a86d4b46..5a2f9894625 100644 --- a/rlp/iterator_test.go +++ b/rlp/iterator_test.go @@ -17,7 +17,7 @@ package rlp import ( - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "testing" ) diff --git a/rpc/client.go b/rpc/client.go index ac2a32c1ce6..29377a4f550 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -28,7 +28,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 50e0079705d..486b4b4d1be 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -21,10 +21,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 67b0f2bf9d9..a0422bc48b5 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -30,8 +30,8 @@ import ( "time" "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) { @@ -352,7 +352,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 c3370ada13b..41ec6477af2 100644 --- a/rpc/doc.go +++ b/rpc/doc.go @@ -98,7 +98,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 efd9de2f3ce..71247b232c9 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -26,10 +26,10 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/log/v3" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/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 8cd3edc915c..1196456916e 100644 --- a/rpc/http.go +++ b/rpc/http.go @@ -31,12 +31,12 @@ import ( "sync" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/golang-jwt/jwt/v4" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/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 43359cbe5f1..fcc53ba93d1 100644 --- a/rpc/http_test.go +++ b/rpc/http_test.go @@ -22,7 +22,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 763ecd1fb7b..f3e24799b42 100644 --- a/rpc/inproc.go +++ b/rpc/inproc.go @@ -20,7 +20,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 331ebeb125b..2c905cbaedc 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -19,8 +19,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 21af0ac9b1c..f9bc29ebd8c 100644 --- a/rpc/metrics.go +++ b/rpc/metrics.go @@ -18,7 +18,7 @@ package rpc import ( "fmt" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" "reflect" "strings" ) diff --git a/rpc/server.go b/rpc/server.go index 388e3789663..ee4716f105e 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -24,8 +24,8 @@ import ( "time" mapset "github.com/deckarep/golang-set" + "github.com/erigontech/erigon-lib/log/v3" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/log/v3" ) const MetadataApi = "rpc" diff --git a/rpc/server_test.go b/rpc/server_test.go index aec76b37652..605e377355b 100644 --- a/rpc/server_test.go +++ b/rpc/server_test.go @@ -29,8 +29,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 6599b65427f..4413fca21e5 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -25,9 +25,9 @@ import ( "sync" "unicode" + "github.com/erigontech/erigon-lib/common/dbg" + "github.com/erigontech/erigon-lib/log/v3" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/common/dbg" - "github.com/ledgerwatch/erigon-lib/log/v3" ) var ( diff --git a/rpc/stdio.go b/rpc/stdio.go index c647e6d324b..b8fe117dc2a 100644 --- a/rpc/stdio.go +++ b/rpc/stdio.go @@ -24,7 +24,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 3285fe58c3d..7b3defd2b72 100644 --- a/rpc/subscription_test.go +++ b/rpc/subscription_test.go @@ -24,7 +24,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 c290c624cc8..6727ab51607 100644 --- a/rpc/testservice_test.go +++ b/rpc/testservice_test.go @@ -24,7 +24,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 11dc2b77675..1da445f679b 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -25,9 +25,9 @@ import ( "strconv" "strings" - "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" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 6c063d4bcbf..ba4592781a7 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -20,9 +20,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 44dda1d9367..f710da01345 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -28,8 +28,8 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" + "github.com/erigontech/erigon-lib/log/v3" "github.com/gorilla/websocket" - "github.com/ledgerwatch/erigon-lib/log/v3" ) const ( diff --git a/rpc/websocket_bench_test.go b/rpc/websocket_bench_test.go index b6346e03040..ef5c9bda0a3 100644 --- a/rpc/websocket_bench_test.go +++ b/rpc/websocket_bench_test.go @@ -6,7 +6,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 5881d952f4e..1043634bbec 100644 --- a/rpc/websocket_test.go +++ b/rpc/websocket_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/gorilla/websocket" - "github.com/ledgerwatch/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 36a5080cab8..8a230913ee4 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -22,8 +22,8 @@ import ( "runtime" "testing" - "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" ) func TestBlockchain(t *testing.T) { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index e78844f549d..8f9d932a97c 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -27,25 +27,25 @@ import ( "reflect" "testing" + "github.com/erigontech/erigon-lib/log/v3" "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/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/kv" + "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/kv" - "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/ledgerwatch/erigon/turbo/services" - "github.com/ledgerwatch/erigon/turbo/stages/mock" + "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" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/stages/mock" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/bor/helper/miner.go b/tests/bor/helper/miner.go index b9083237b76..3f0194e8bf6 100644 --- a/tests/bor/helper/miner.go +++ b/tests/bor/helper/miner.go @@ -9,24 +9,24 @@ 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 a88dcd3a7e3..7baa5d075a6 100644 --- a/tests/bor/mining_test.go +++ b/tests/bor/mining_test.go @@ -11,23 +11,23 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/chain/networkname" + "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" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "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" - - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + + "github.com/erigontech/erigon-lib/gointerfaces" + + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" ) const ( @@ -52,7 +52,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) { log.Root().SetHandler(log.LvlFilterHandler(log.LvlInfo, log.StreamHandler(os.Stderr, log.TerminalFormat()))) 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 26d695cd74c..e35d2b47b04 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,12 +20,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 0711294dc6a..d176f5ce521 100644 --- a/tests/exec_spec_test.go +++ b/tests/exec_spec_test.go @@ -6,8 +6,8 @@ import ( "path/filepath" "testing" - "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" ) func TestExecutionSpec(t *testing.T) { diff --git a/tests/fuzzers/abi/abifuzzer.go b/tests/fuzzers/abi/abifuzzer.go index ad0e58ba1be..3f1ddb24718 100644 --- a/tests/fuzzers/abi/abifuzzer.go +++ b/tests/fuzzers/abi/abifuzzer.go @@ -21,8 +21,8 @@ import ( "reflect" "strings" + "github.com/erigontech/erigon/accounts/abi" fuzz "github.com/google/gofuzz" - "github.com/ledgerwatch/erigon/accounts/abi" ) var ( diff --git a/tests/fuzzers/bitutil/compress_fuzz.go b/tests/fuzzers/bitutil/compress_fuzz.go index 926c682a4ae..0bff9786213 100644 --- a/tests/fuzzers/bitutil/compress_fuzz.go +++ b/tests/fuzzers/bitutil/compress_fuzz.go @@ -19,7 +19,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 ab1e08495ac..219b380988e 100644 --- a/tests/fuzzers/bls12381/precompile_fuzzer.go +++ b/tests/fuzzers/bls12381/precompile_fuzzer.go @@ -20,9 +20,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 69e7222c488..f1efeb3d277 100644 --- a/tests/fuzzers/difficulty/difficulty-fuzz.go +++ b/tests/fuzzers/difficulty/difficulty-fuzz.go @@ -23,10 +23,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 7cae3c0392d..80e642ac14f 100644 --- a/tests/fuzzers/rlp/rlp_fuzzer.go +++ b/tests/fuzzers/rlp/rlp_fuzzer.go @@ -20,8 +20,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 0f9d0c5cb49..e0f7a13b3a2 100644 --- a/tests/fuzzers/runtime/runtime_fuzz.go +++ b/tests/fuzzers/runtime/runtime_fuzz.go @@ -17,7 +17,7 @@ package runtime import ( - "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/fuzzers/secp256k1/secp_fuzzer.go b/tests/fuzzers/secp256k1/secp_fuzzer.go index e077fb010f9..b2686002084 100644 --- a/tests/fuzzers/secp256k1/secp_fuzzer.go +++ b/tests/fuzzers/secp256k1/secp_fuzzer.go @@ -24,8 +24,8 @@ import ( "fmt" "github.com/btcsuite/btcd/btcec/v2" + "github.com/erigontech/secp256k1" fuzz "github.com/google/gofuzz" - "github.com/ledgerwatch/secp256k1" ) func Fuzz(input []byte) int { diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 5f30c22bff1..55da00bc93e 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 78dd51ad300..cccc62ca75b 100644 --- a/tests/init.go +++ b/tests/init.go @@ -21,8 +21,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 d7cae958c26..5b7822e2dc4 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -29,7 +29,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 eb71f3d35cd..57b5b5496dc 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,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 418a053f2ce..537065eabca 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -27,12 +27,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 9aee31c9d94..ed132b2dfb4 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -25,28 +25,28 @@ import ( "strconv" "strings" + "github.com/erigontech/erigon-lib/config3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/config3" "golang.org/x/crypto/sha3" - "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" - types2 "github.com/ledgerwatch/erigon-lib/types" - - "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/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/ledgerwatch/erigon/turbo/trie" + "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" + types2 "github.com/erigontech/erigon-lib/types" + + "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/types" + "github.com/erigontech/erigon/core/vm" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/trie" ) // StateTest checks transaction processing without block context. diff --git a/tests/statedb_chain_test.go b/tests/statedb_chain_test.go index bc2be827492..abbf0fb1514 100644 --- a/tests/statedb_chain_test.go +++ b/tests/statedb_chain_test.go @@ -21,20 +21,20 @@ import ( "math/big" "testing" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" "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/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 e10b0bea219..59eb8b393d5 100644 --- a/tests/statedb_insert_chain_transaction_test.go +++ b/tests/statedb_insert_chain_transaction_test.go @@ -7,21 +7,21 @@ import ( "math/big" "testing" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" "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/turbo/stages/mock" + "github.com/erigontech/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/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/testdata b/tests/testdata index a0e848269dd..853b1e03b10 160000 --- a/tests/testdata +++ b/tests/testdata @@ -1 +1 @@ -Subproject commit a0e848269dd2af2b061fe9a4749d40963c2bdb5c +Subproject commit 853b1e03b1078d370614002851ba1ee9803d9fcf diff --git a/tests/transaction_test.go b/tests/transaction_test.go index aec17b308bc..4348665d20e 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -21,7 +21,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 202f9dfdd0c..ae96bbdf430 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -23,13 +23,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 4c35e3e2f06..a944d619fcf 100644 --- a/turbo/adapter/block_propagator.go +++ b/turbo/adapter/block_propagator.go @@ -4,7 +4,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 eadfdef6e7e..115b7e279c5 100644 --- a/turbo/adapter/ethapi/api.go +++ b/turbo/adapter/ethapi/api.go @@ -21,19 +21,19 @@ import ( "fmt" "math/big" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - 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" + 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 ddeda5bd466..d8c4d144a75 100644 --- a/turbo/adapter/ethapi/get_proof.go +++ b/turbo/adapter/ethapi/get_proof.go @@ -2,13 +2,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 67e985ade1e..56f1b442281 100644 --- a/turbo/adapter/ethapi/internal.go +++ b/turbo/adapter/ethapi/internal.go @@ -2,9 +2,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 841c55c6c76..72ca8dcd255 100644 --- a/turbo/adapter/ethapi/state_overrides.go +++ b/turbo/adapter/ethapi/state_overrides.go @@ -4,10 +4,10 @@ import ( "fmt" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/state" + "github.com/erigontech/erigon/core/state" ) type StateOverrides map[libcommon.Address]Account diff --git a/turbo/app/backup_cmd.go b/turbo/app/backup_cmd.go index 5d74ea84ff9..529adcad43b 100644 --- a/turbo/app/backup_cmd.go +++ b/turbo/app/backup_cmd.go @@ -5,16 +5,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 8bb2e374ca2..f38f43adf23 100644 --- a/turbo/app/import_cmd.go +++ b/turbo/app/import_cmd.go @@ -12,26 +12,26 @@ import ( "syscall" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "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/direct" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "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 ea8336bbe0f..8c509fbcd16 100644 --- a/turbo/app/init_cmd.go +++ b/turbo/app/init_cmd.go @@ -4,15 +4,15 @@ import ( "encoding/json" "os" - "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/urfave/cli/v2" - "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 6fe59011da7..1413de1e927 100644 --- a/turbo/app/make_app.go +++ b/turbo/app/make_app.go @@ -6,19 +6,19 @@ import ( "fmt" "strings" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "github.com/ledgerwatch/erigon/turbo/logging" - enode "github.com/ledgerwatch/erigon/turbo/node" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon/turbo/logging" + enode "github.com/erigontech/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/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 709dbaaa935..33e76ecbcf1 100644 --- a/turbo/app/snapshots_cmd.go +++ b/turbo/app/snapshots_cmd.go @@ -15,40 +15,40 @@ import ( "time" "github.com/c2h5oh/datasize" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/cl/clparams" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/cl/clparams" "github.com/urfave/cli/v2" "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/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - "github.com/ledgerwatch/erigon-lib/kv/mdbx" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/metrics" - "github.com/ledgerwatch/erigon-lib/seg" - libstate "github.com/ledgerwatch/erigon-lib/state" - "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/etl" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcfg" + "github.com/erigontech/erigon-lib/kv/mdbx" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/seg" + libstate "github.com/erigontech/erigon-lib/state" + "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 75271c8b49a..4333d33c39c 100644 --- a/turbo/app/support_cmd.go +++ b/turbo/app/support_cmd.go @@ -16,12 +16,12 @@ import ( "syscall" "time" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/debug" "github.com/gorilla/websocket" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/debug" "github.com/urfave/cli/v2" ) diff --git a/turbo/builder/block_builder.go b/turbo/builder/block_builder.go index d820649407c..e9d3a42d39c 100644 --- a/turbo/builder/block_builder.go +++ b/turbo/builder/block_builder.go @@ -6,10 +6,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 0e9e06288ed..92aae81bda2 100644 --- a/turbo/builder/latest_block_built.go +++ b/turbo/builder/latest_block_built.go @@ -3,7 +3,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 7a799c5605e..653f7a16158 100644 --- a/turbo/builder/latest_block_built_test.go +++ b/turbo/builder/latest_block_built_test.go @@ -3,7 +3,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 7f77739152a..a2349e7a3a3 100644 --- a/turbo/cli/default_flags.go +++ b/turbo/cli/default_flags.go @@ -3,7 +3,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 17ac3af9df4..24fc6088933 100644 --- a/turbo/cli/flags.go +++ b/turbo/cli/flags.go @@ -4,29 +4,29 @@ import ( "fmt" "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/ledgerwatch/erigon-lib/etl" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "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/kvcache" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/pflag" "github.com/urfave/cli/v2" - "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 618cb97ca4b..f1fd5ca2eb3 100644 --- a/turbo/cli/helpers.go +++ b/turbo/cli/helpers.go @@ -22,7 +22,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 9bc28a13ac8..8fc2d236fd1 100644 --- a/turbo/cmdtest/test_cmd.go +++ b/turbo/cmdtest/test_cmd.go @@ -32,7 +32,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 6d5471d5201..24915c959a5 100644 --- a/turbo/debug/api.go +++ b/turbo/debug/api.go @@ -34,8 +34,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 b1a18b76fa5..9f473ad89ff 100644 --- a/turbo/debug/flags.go +++ b/turbo/debug/flags.go @@ -24,18 +24,18 @@ 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/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/pelletier/go-toml" "github.com/spf13/cobra" "github.com/urfave/cli/v2" "gopkg.in/yaml.v2" - "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 cae643e0ac8..4140b8a9264 100644 --- a/turbo/debug/signal.go +++ b/turbo/debug/signal.go @@ -8,8 +8,8 @@ import ( "os/signal" "runtime/pprof" - "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" "golang.org/x/sys/unix" ) diff --git a/turbo/debug/signal_windows.go b/turbo/debug/signal_windows.go index e91df0253d1..d99366572eb 100644 --- a/turbo/debug/signal_windows.go +++ b/turbo/debug/signal_windows.go @@ -7,8 +7,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 32c6334cba4..ea7d619451d 100644 --- a/turbo/debug/trace.go +++ b/turbo/debug/trace.go @@ -23,7 +23,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 b3a90ad66d6..6033c922c80 100644 --- a/turbo/engineapi/engine_block_downloader/block_downloader.go +++ b/turbo/engineapi/engine_block_downloader/block_downloader.go @@ -10,23 +10,23 @@ import ( "sync/atomic" "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/etl" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "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-lib/log/v3" + + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/etl" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "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 7ef7b59afa7..fe59e477767 100644 --- a/turbo/engineapi/engine_block_downloader/body.go +++ b/turbo/engineapi/engine_block_downloader/body.go @@ -6,15 +6,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 5b10ab1217d..bc551b6864f 100644 --- a/turbo/engineapi/engine_block_downloader/core.go +++ b/turbo/engineapi/engine_block_downloader/core.go @@ -3,12 +3,12 @@ package engine_block_downloader import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "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 f71503c15b1..c09435a15af 100644 --- a/turbo/engineapi/engine_helpers/constants.go +++ b/turbo/engineapi/engine_helpers/constants.go @@ -1,6 +1,6 @@ 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 8e4b01d3301..c0ded5da38b 100644 --- a/turbo/engineapi/engine_helpers/fork_validator.go +++ b/turbo/engineapi/engine_helpers/fork_validator.go @@ -19,22 +19,22 @@ import ( "fmt" "sync" - "github.com/ledgerwatch/erigon/cl/phase1/core/state/lru" + "github.com/erigontech/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/wrap" - "github.com/ledgerwatch/erigon/common/math" - "github.com/ledgerwatch/erigon/consensus" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" - "github.com/ledgerwatch/erigon/turbo/engineapi/engine_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/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/common/math" + "github.com/erigontech/erigon/consensus" + "github.com/erigontech/erigon/eth/stagedsync/stages" + "github.com/erigontech/erigon/turbo/engineapi/engine_types" + "github.com/erigontech/erigon/turbo/services" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/turbo/shards" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/turbo/shards" ) // the maximum point from the current head, past which side forks are not validated anymore. diff --git a/turbo/engineapi/engine_server.go b/turbo/engineapi/engine_server.go index d2dcbc6a04e..92f3e24fc31 100644 --- a/turbo/engineapi/engine_server.go +++ b/turbo/engineapi/engine_server.go @@ -9,38 +9,38 @@ import ( "sync" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon/cl/clparams" - "github.com/ledgerwatch/erigon/eth/ethutils" - - "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/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - libstate "github.com/ledgerwatch/erigon-lib/state" - - "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/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/common/hexutil" + "github.com/erigontech/erigon/cl/clparams" + "github.com/erigontech/erigon/eth/ethutils" + + "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/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + libstate "github.com/erigontech/erigon-lib/state" + + "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/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" ) type EngineServer struct { diff --git a/turbo/engineapi/engine_types/jsonrpc.go b/turbo/engineapi/engine_types/jsonrpc.go index 8d7751d57c6..83e8c1c19b6 100644 --- a/turbo/engineapi/engine_types/jsonrpc.go +++ b/turbo/engineapi/engine_types/jsonrpc.go @@ -5,14 +5,14 @@ import ( "encoding/json" "errors" - "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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/erigon/core/types" + "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" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 b02e666e7de..96253c9654a 100644 --- a/turbo/engineapi/interface.go +++ b/turbo/engineapi/interface.go @@ -2,10 +2,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 45c401d80e9..ec5f3cf29db 100644 --- a/turbo/execution/eth1/block_building.go +++ b/turbo/execution/eth1/block_building.go @@ -7,17 +7,17 @@ import ( "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - - "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" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + + "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 0ace80b603f..3998ca1b689 100644 --- a/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go +++ b/turbo/execution/eth1/eth1_chain_reader.go/chain_reader.go @@ -6,21 +6,21 @@ import ( "math/big" "time" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "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/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "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 d4642f8f5dc..22e1e540978 100644 --- a/turbo/execution/eth1/eth1_utils/grpc.go +++ b/turbo/execution/eth1/eth1_utils/grpc.go @@ -5,12 +5,12 @@ import ( "fmt" "math/big" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon/core/types" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "github.com/ledgerwatch/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 9a67acf0bbc..673f90a87a6 100644 --- a/turbo/execution/eth1/eth1_utils/grpc_test.go +++ b/turbo/execution/eth1/eth1_utils/grpc_test.go @@ -3,13 +3,13 @@ package eth1_utils import ( "testing" + 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" "github.com/go-test/deep" "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" ) diff --git a/turbo/execution/eth1/ethereum_execution.go b/turbo/execution/eth1/ethereum_execution.go index 089dac227be..4660a992d2b 100644 --- a/turbo/execution/eth1/ethereum_execution.go +++ b/turbo/execution/eth1/ethereum_execution.go @@ -5,30 +5,30 @@ import ( "errors" "math/big" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "golang.org/x/sync/semaphore" "google.golang.org/protobuf/types/known/emptypb" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - "github.com/ledgerwatch/erigon-lib/wrap" - - "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/chain" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "github.com/erigontech/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/wrap" + + "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 24a31a51336..649a271634b 100644 --- a/turbo/execution/eth1/forkchoice.go +++ b/turbo/execution/eth1/forkchoice.go @@ -5,15 +5,15 @@ import ( "fmt" "time" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/eth/stagedsync/stages" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/eth/stagedsync/stages" ) type forkchoiceOutcome struct { diff --git a/turbo/execution/eth1/getters.go b/turbo/execution/eth1/getters.go index 7673622a331..459cced8a36 100644 --- a/turbo/execution/eth1/getters.go +++ b/turbo/execution/eth1/getters.go @@ -7,16 +7,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" - "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 704678bdea1..d0751720220 100644 --- a/turbo/execution/eth1/inserters.go +++ b/turbo/execution/eth1/inserters.go @@ -5,13 +5,13 @@ import ( "fmt" "reflect" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/metrics" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + "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 29252ea8863..0bce0135ff8 100644 --- a/turbo/jsonrpc/admin_api.go +++ b/turbo/jsonrpc/admin_api.go @@ -5,10 +5,10 @@ import ( "errors" "fmt" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon/p2p" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 835bd8cc170..a3ef449ddd8 100644 --- a/turbo/jsonrpc/bor_api.go +++ b/turbo/jsonrpc/bor_api.go @@ -3,13 +3,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 db0ad4ea60b..51e443d4017 100644 --- a/turbo/jsonrpc/bor_helper.go +++ b/turbo/jsonrpc/bor_helper.go @@ -7,16 +7,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 1e3a072fc4a..4b9bac15fce 100644 --- a/turbo/jsonrpc/bor_snapshot.go +++ b/turbo/jsonrpc/bor_snapshot.go @@ -6,19 +6,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 ebcbfc34f8e..7e5a794af0f 100644 --- a/turbo/jsonrpc/call_traces_test.go +++ b/turbo/jsonrpc/call_traces_test.go @@ -11,12 +11,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 7d9a6bf0755..70ae66ce36e 100644 --- a/turbo/jsonrpc/corner_cases_support_test.go +++ b/turbo/jsonrpc/corner_cases_support_test.go @@ -6,16 +6,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 5be5bdc3551..e90caa3c73c 100644 --- a/turbo/jsonrpc/daemon.go +++ b/turbo/jsonrpc/daemon.go @@ -1,20 +1,20 @@ package jsonrpc import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - libstate "github.com/ledgerwatch/erigon-lib/state" - "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" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + libstate "github.com/erigontech/erigon-lib/state" + "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 1a11d93abd6..4851b606b09 100644 --- a/turbo/jsonrpc/db_api_deprecated.go +++ b/turbo/jsonrpc/db_api_deprecated.go @@ -4,7 +4,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 f2f404e8ea5..3319d7c6ccf 100644 --- a/turbo/jsonrpc/debug_api.go +++ b/turbo/jsonrpc/debug_api.go @@ -4,27 +4,27 @@ import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/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/common/changeset" - "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" - "github.com/ledgerwatch/erigon/eth/tracers" - "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/ledgerwatch/erigon/turbo/transactions" + "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/changeset" + "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" + "github.com/erigontech/erigon/eth/tracers" + "github.com/erigontech/erigon/rlp" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/transactions" ) // AccountRangeMaxResults is the maximum number of results to be returned per call diff --git a/turbo/jsonrpc/debug_api_test.go b/turbo/jsonrpc/debug_api_test.go index 5cbe8627652..5b0d4bce575 100644 --- a/turbo/jsonrpc/debug_api_test.go +++ b/turbo/jsonrpc/debug_api_test.go @@ -7,21 +7,21 @@ import ( "testing" "github.com/davecgh/go-spew/spew" + "github.com/erigontech/erigon-lib/log/v3" jsoniter "github.com/json-iterator/go" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/tracers" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/rpc/rpccfg" - "github.com/ledgerwatch/erigon/turbo/adapter/ethapi" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/core/types" + "github.com/erigontech/erigon/eth/tracers" + "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 4b1bd336614..5cb27ae2b6c 100644 --- a/turbo/jsonrpc/erigon_api.go +++ b/turbo/jsonrpc/erigon_api.go @@ -2,18 +2,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 1e9ae7a6389..e4e0734c891 100644 --- a/turbo/jsonrpc/erigon_block.go +++ b/turbo/jsonrpc/erigon_block.go @@ -7,23 +7,23 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - + "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/kv" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/kv/temporal/historyv2" + "github.com/erigontech/erigon/turbo/services" "github.com/holiman/uint256" - "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/temporal/historyv2" - "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/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 a487af36cb3..2f0f46d4b81 100644 --- a/turbo/jsonrpc/erigon_cache_check.go +++ b/turbo/jsonrpc/erigon_cache_check.go @@ -3,7 +3,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 0c8240324f8..af74d78308c 100644 --- a/turbo/jsonrpc/erigon_nodeInfo.go +++ b/turbo/jsonrpc/erigon_nodeInfo.go @@ -3,7 +3,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 c63ccfea473..dce660525b3 100644 --- a/turbo/jsonrpc/erigon_receipts.go +++ b/turbo/jsonrpc/erigon_receipts.go @@ -7,19 +7,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 535441854d4..556cee85d29 100644 --- a/turbo/jsonrpc/erigon_receipts_test.go +++ b/turbo/jsonrpc/erigon_receipts_test.go @@ -10,21 +10,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 ec1a4af1c68..591672cb908 100644 --- a/turbo/jsonrpc/erigon_system.go +++ b/turbo/jsonrpc/erigon_system.go @@ -4,15 +4,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 fd2f732ce74..5f8c8ca775d 100644 --- a/turbo/jsonrpc/eth_accounts.go +++ b/turbo/jsonrpc/eth_accounts.go @@ -5,19 +5,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/txpool" + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" - "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 f3cee5909ae..4e605e13530 100644 --- a/turbo/jsonrpc/eth_api.go +++ b/turbo/jsonrpc/eth_api.go @@ -9,35 +9,35 @@ import ( "sync/atomic" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/log/v3" 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/datadir" - "github.com/ledgerwatch/erigon-lib/common/hexutility" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/kvcfg" - libstate "github.com/ledgerwatch/erigon-lib/state" - 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/chain" + "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/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/kvcfg" + libstate "github.com/erigontech/erigon-lib/state" + 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 ca50b32badd..4d4bb656eb3 100644 --- a/turbo/jsonrpc/eth_api_test.go +++ b/turbo/jsonrpc/eth_api_test.go @@ -5,23 +5,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 d6f5696c074..3c14bef9f4f 100644 --- a/turbo/jsonrpc/eth_block.go +++ b/turbo/jsonrpc/eth_block.go @@ -6,27 +6,27 @@ 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/rlp" - "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/rlp" + "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) { @@ -71,7 +71,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/turbo-geth/issues/1645 } txs = append(txs, txn) } @@ -249,7 +249,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) } @@ -268,7 +268,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 7005c2f9a26..6807ac8b5b7 100644 --- a/turbo/jsonrpc/eth_block_test.go +++ b/turbo/jsonrpc/eth_block_test.go @@ -5,28 +5,28 @@ 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/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "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/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/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-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "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/u256" + "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/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 246a7b887b6..70519119ee8 100644 --- a/turbo/jsonrpc/eth_call.go +++ b/turbo/jsonrpc/eth_call.go @@ -6,34 +6,34 @@ import ( "fmt" "math/big" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon-lib/log/v3" "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/txpool" - "github.com/ledgerwatch/erigon-lib/kv" - 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/stagedsync" - "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" - "github.com/ledgerwatch/erigon/turbo/trie" + 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/txpool" + "github.com/erigontech/erigon-lib/kv" + 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/stagedsync" + "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" + "github.com/erigontech/erigon/turbo/trie" ) var latestNumOrHash = rpc.BlockNumberOrHashWithNumber(rpc.LatestBlockNumber) diff --git a/turbo/jsonrpc/eth_callMany.go b/turbo/jsonrpc/eth_callMany.go index e384e288431..e2fc12af8b9 100644 --- a/turbo/jsonrpc/eth_callMany.go +++ b/turbo/jsonrpc/eth_callMany.go @@ -7,21 +7,21 @@ import ( "math/big" "time" + "github.com/erigontech/erigon-lib/log/v3" "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/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 bce7de48b66..49b58881c51 100644 --- a/turbo/jsonrpc/eth_callMany_test.go +++ b/turbo/jsonrpc/eth_callMany_test.go @@ -8,23 +8,23 @@ import ( "strconv" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - - "github.com/ledgerwatch/erigon-lib/common/datadir" - "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/datadir" + "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 8f2e1ba0ad4..0649250c268 100644 --- a/turbo/jsonrpc/eth_call_test.go +++ b/turbo/jsonrpc/eth_call_test.go @@ -7,34 +7,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "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 5d2fc1d986c..f243b462a06 100644 --- a/turbo/jsonrpc/eth_deprecated.go +++ b/turbo/jsonrpc/eth_deprecated.go @@ -4,8 +4,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 ae897597417..4c6c90a87a6 100644 --- a/turbo/jsonrpc/eth_filters.go +++ b/turbo/jsonrpc/eth_filters.go @@ -4,13 +4,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 7d9f2a1e3cc..b7ebb9430f7 100644 --- a/turbo/jsonrpc/eth_filters_test.go +++ b/turbo/jsonrpc/eth_filters_test.go @@ -6,23 +6,23 @@ 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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" + "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 b32940feac1..73fc81378b0 100644 --- a/turbo/jsonrpc/eth_mining.go +++ b/turbo/jsonrpc/eth_mining.go @@ -3,13 +3,13 @@ package jsonrpc import ( "context" "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/gointerfaces/txpool" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" "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 7994317c78f..8b8edf55a16 100644 --- a/turbo/jsonrpc/eth_mining_test.go +++ b/turbo/jsonrpc/eth_mining_test.go @@ -5,20 +5,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/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" - "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" + "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 8b8229ee527..75aae170cc8 100644 --- a/turbo/jsonrpc/eth_receipts.go +++ b/turbo/jsonrpc/eth_receipts.go @@ -7,32 +7,32 @@ import ( "fmt" "github.com/RoaringBitmap/roaring" - "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-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/eth/ethutils" - bortypes "github.com/ledgerwatch/erigon/polygon/bor/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/vm" - "github.com/ledgerwatch/erigon/core/vm/evmtypes" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/ethdb/cbor" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/services" - "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" + "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/iter" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon/eth/ethutils" + bortypes "github.com/erigontech/erigon/polygon/bor/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/vm" + "github.com/erigontech/erigon/core/vm/evmtypes" + "github.com/erigontech/erigon/eth/filters" + "github.com/erigontech/erigon/ethdb/cbor" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/services" + "github.com/erigontech/erigon/turbo/transactions" ) // getReceipts - checking in-mem cache, or else fallback to db, or else fallback to re-exec of block to re-gen receipts @@ -640,7 +640,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 7ab072b5f9b..033718dc01f 100644 --- a/turbo/jsonrpc/eth_subscribe_test.go +++ b/turbo/jsonrpc/eth_subscribe_test.go @@ -7,22 +7,22 @@ import ( "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/direct" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/wrap" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/direct" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 549750b70d7..2f333d4a1ca 100644 --- a/turbo/jsonrpc/eth_system.go +++ b/turbo/jsonrpc/eth_system.go @@ -4,18 +4,18 @@ import ( "context" "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 52b4598bbb3..035a50a0732 100644 --- a/turbo/jsonrpc/eth_system_test.go +++ b/turbo/jsonrpc/eth_system_test.go @@ -8,15 +8,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 df647297138..4a7cdb43c54 100644 --- a/turbo/jsonrpc/eth_txs.go +++ b/turbo/jsonrpc/eth_txs.go @@ -5,19 +5,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - 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" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/gointerfaces/types" + 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. @@ -175,7 +175,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() @@ -210,7 +210,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)) @@ -239,7 +239,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() @@ -274,7 +274,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 1e5578e4efa..c0bf862f59f 100644 --- a/turbo/jsonrpc/eth_uncles.go +++ b/turbo/jsonrpc/eth_uncles.go @@ -3,16 +3,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. @@ -32,7 +32,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) @@ -63,7 +63,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{}) @@ -103,7 +103,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 @@ -120,7 +120,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) @@ -128,7 +128,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 fad33fdf727..0f121f97b6c 100644 --- a/turbo/jsonrpc/gen_traces_test.go +++ b/turbo/jsonrpc/gen_traces_test.go @@ -9,17 +9,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" - "github.com/ledgerwatch/erigon/eth/tracers" - "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" + "github.com/erigontech/erigon/eth/tracers" + "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 c38df84004e..223ec742ab0 100644 --- a/turbo/jsonrpc/get_chain_config_test.go +++ b/turbo/jsonrpc/get_chain_config_test.go @@ -4,7 +4,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 8562f67a1be..d8729fa6005 100644 --- a/turbo/jsonrpc/graphql_api.go +++ b/turbo/jsonrpc/graphql_api.go @@ -5,15 +5,15 @@ import ( "fmt" "math/big" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "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" + "github.com/erigontech/erigon-lib/common/hexutil" + "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 { @@ -125,7 +125,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 f35e36afdf4..2383945d557 100644 --- a/turbo/jsonrpc/net_api.go +++ b/turbo/jsonrpc/net_api.go @@ -3,10 +3,10 @@ package jsonrpc import ( "context" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "strconv" - "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 379edc9990e..b00dac300e3 100644 --- a/turbo/jsonrpc/otterscan_api.go +++ b/turbo/jsonrpc/otterscan_api.go @@ -6,29 +6,29 @@ import ( "fmt" "math/big" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "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-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "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-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "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 @@ -485,7 +485,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 c44bdb277f2..339c55e3909 100644 --- a/turbo/jsonrpc/otterscan_block_details.go +++ b/turbo/jsonrpc/otterscan_block_details.go @@ -4,14 +4,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 09db17d2f71..118fb4a8af3 100644 --- a/turbo/jsonrpc/otterscan_contract_creator.go +++ b/turbo/jsonrpc/otterscan_contract_creator.go @@ -6,17 +6,17 @@ import ( "fmt" "sort" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "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/temporal/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/turbo/rpchelper" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + "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/temporal/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + + "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 38e39dbc724..8de9527c683 100644 --- a/turbo/jsonrpc/otterscan_contract_creator_test.go +++ b/turbo/jsonrpc/otterscan_contract_creator_test.go @@ -3,8 +3,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 4c8807eb3f5..d5987713582 100644 --- a/turbo/jsonrpc/otterscan_default_tracer.go +++ b/turbo/jsonrpc/otterscan_default_tracer.go @@ -1,10 +1,10 @@ package jsonrpc import ( + "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "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 6a5f9a4be63..cd3da0100dd 100644 --- a/turbo/jsonrpc/otterscan_generic_tracer.go +++ b/turbo/jsonrpc/otterscan_generic_tracer.go @@ -3,17 +3,17 @@ package jsonrpc import ( "context" - "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/turbo/rpchelper" - - "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/turbo/shards" + "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/turbo/rpchelper" + + "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/turbo/shards" ) type GenericTracer interface { diff --git a/turbo/jsonrpc/otterscan_has_code.go b/turbo/jsonrpc/otterscan_has_code.go index af442e8d000..f5ddfccdb59 100644 --- a/turbo/jsonrpc/otterscan_has_code.go +++ b/turbo/jsonrpc/otterscan_has_code.go @@ -4,10 +4,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 a7d2c4a9712..bbfc1bce77c 100644 --- a/turbo/jsonrpc/otterscan_search_backward.go +++ b/turbo/jsonrpc/otterscan_search_backward.go @@ -4,8 +4,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 4c07ca38efe..602b5541002 100644 --- a/turbo/jsonrpc/otterscan_search_backward_test.go +++ b/turbo/jsonrpc/otterscan_search_backward_test.go @@ -2,12 +2,12 @@ package jsonrpc import ( "bytes" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "testing" "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 5931ad25609..43edf480e45 100644 --- a/turbo/jsonrpc/otterscan_search_forward.go +++ b/turbo/jsonrpc/otterscan_search_forward.go @@ -4,8 +4,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_trace.go b/turbo/jsonrpc/otterscan_search_trace.go index fda1293f497..7a64301ae10 100644 --- a/turbo/jsonrpc/otterscan_search_trace.go +++ b/turbo/jsonrpc/otterscan_search_trace.go @@ -4,18 +4,18 @@ 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/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/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" + "github.com/erigontech/erigon/turbo/shards" ) 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_trace_contract_creator.go b/turbo/jsonrpc/otterscan_trace_contract_creator.go index 3f0bb4b6a36..2d29be44a64 100644 --- a/turbo/jsonrpc/otterscan_trace_contract_creator.go +++ b/turbo/jsonrpc/otterscan_trace_contract_creator.go @@ -3,11 +3,11 @@ package jsonrpc import ( "context" + "github.com/erigontech/erigon-lib/common" "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/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 2d032b903d0..2925b4f9698 100644 --- a/turbo/jsonrpc/otterscan_trace_operations.go +++ b/turbo/jsonrpc/otterscan_trace_operations.go @@ -2,12 +2,12 @@ package jsonrpc import ( "context" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "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 17fddfdd9ef..f2ca2db30a8 100644 --- a/turbo/jsonrpc/otterscan_trace_touch.go +++ b/turbo/jsonrpc/otterscan_trace_touch.go @@ -3,10 +3,10 @@ package jsonrpc import ( "bytes" + "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" + "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 c6df5d79f67..fd39a969d75 100644 --- a/turbo/jsonrpc/otterscan_trace_transaction.go +++ b/turbo/jsonrpc/otterscan_trace_transaction.go @@ -4,14 +4,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 feb2681001d..6e20ddd660c 100644 --- a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go +++ b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce.go @@ -7,15 +7,15 @@ import ( "sort" "github.com/RoaringBitmap/roaring/roaring64" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" - "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/historyv2" - "github.com/ledgerwatch/erigon-lib/log/v3" - - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" + "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/historyv2" + "github.com/erigontech/erigon-lib/log/v3" + + "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 9e72d5d0275..ed976b51012 100644 --- a/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go +++ b/turbo/jsonrpc/otterscan_transaction_by_sender_and_nonce_test.go @@ -3,9 +3,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 e71d27112a9..2fa1541c079 100644 --- a/turbo/jsonrpc/otterscan_transaction_error.go +++ b/turbo/jsonrpc/otterscan_transaction_error.go @@ -3,8 +3,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 cb2bfd212ff..1de552274b0 100644 --- a/turbo/jsonrpc/otterscan_types.go +++ b/turbo/jsonrpc/otterscan_types.go @@ -4,9 +4,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 55ac32a3afe..ffbf16bdb82 100644 --- a/turbo/jsonrpc/overlay_api.go +++ b/turbo/jsonrpc/overlay_api.go @@ -10,26 +10,26 @@ import ( "github.com/RoaringBitmap/roaring" "github.com/RoaringBitmap/roaring/roaring64" + "github.com/erigontech/erigon-lib/log/v3" "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" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon/common/math" - "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/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/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/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/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 820b9e9fb5b..45524c70ea0 100644 --- a/turbo/jsonrpc/overlay_create_tracer.go +++ b/turbo/jsonrpc/overlay_create_tracer.go @@ -1,9 +1,9 @@ package jsonrpc import ( + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/vm" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/vm" ) type OverlayCreateTracer struct { diff --git a/turbo/jsonrpc/parity_api.go b/turbo/jsonrpc/parity_api.go index 05744f3f42d..02f5807f0ed 100644 --- a/turbo/jsonrpc/parity_api.go +++ b/turbo/jsonrpc/parity_api.go @@ -5,16 +5,16 @@ import ( "encoding/binary" "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-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/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/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 8a3f14780c1..ec3558bb23b 100644 --- a/turbo/jsonrpc/parity_api_test.go +++ b/turbo/jsonrpc/parity_api_test.go @@ -5,15 +5,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/send_transaction.go b/turbo/jsonrpc/send_transaction.go index 0cf22944193..41d059999f5 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/txpool" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/hexutility" + txPoolProto "github.com/erigontech/erigon-lib/gointerfaces/txpool" - "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 1890a641619..6c47e4a3ab0 100644 --- a/turbo/jsonrpc/send_transaction_test.go +++ b/turbo/jsonrpc/send_transaction_test.go @@ -7,31 +7,31 @@ import ( "testing" "time" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/txpool/txpoolcfg" + "github.com/erigontech/erigon-lib/wrap" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/txpool/txpoolcfg" - "github.com/ledgerwatch/erigon-lib/wrap" - - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon/rpc/rpccfg" + + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon/rpc/rpccfg" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/cmd/rpcdaemon/rpcdaemontest" - "github.com/ledgerwatch/erigon/common/u256" - - txpool_proto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/log/v3" - "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/cmd/rpcdaemon/rpcdaemontest" + "github.com/erigontech/erigon/common/u256" + + txpool_proto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/log/v3" + "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 affd4381c15..86a6d0cd9a9 100644 --- a/turbo/jsonrpc/storage_range.go +++ b/turbo/jsonrpc/storage_range.go @@ -3,10 +3,10 @@ package jsonrpc import ( "fmt" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/order" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/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 65c7180e5c5..5df91faf428 100644 --- a/turbo/jsonrpc/trace_adhoc.go +++ b/turbo/jsonrpc/trace_adhoc.go @@ -8,28 +8,28 @@ import ( "math" "strings" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" - - 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" - 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" - "github.com/ledgerwatch/erigon/polygon/tracer" - "github.com/ledgerwatch/erigon/rpc" - "github.com/ledgerwatch/erigon/turbo/rpchelper" - "github.com/ledgerwatch/erigon/turbo/shards" - "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" + 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" + "github.com/erigontech/erigon/polygon/tracer" + "github.com/erigontech/erigon/rpc" + "github.com/erigontech/erigon/turbo/rpchelper" + "github.com/erigontech/erigon/turbo/shards" + "github.com/erigontech/erigon/turbo/transactions" ) const ( diff --git a/turbo/jsonrpc/trace_adhoc_test.go b/turbo/jsonrpc/trace_adhoc_test.go index e89eb674924..8d94d2c6a1e 100644 --- a/turbo/jsonrpc/trace_adhoc_test.go +++ b/turbo/jsonrpc/trace_adhoc_test.go @@ -12,23 +12,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" - "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" + "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 3ac39b058f0..3e79100074a 100644 --- a/turbo/jsonrpc/trace_api.go +++ b/turbo/jsonrpc/trace_api.go @@ -6,12 +6,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" - "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" + "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 1efa5e81617..1736b0c0a97 100644 --- a/turbo/jsonrpc/trace_filtering.go +++ b/turbo/jsonrpc/trace_filtering.go @@ -6,34 +6,34 @@ import ( "fmt" "github.com/RoaringBitmap/roaring/roaring64" + "github.com/erigontech/erigon-lib/log/v3" jsoniter "github.com/json-iterator/go" - "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/hexutil" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/bitmapdb" - "github.com/ledgerwatch/erigon-lib/kv/iter" - "github.com/ledgerwatch/erigon-lib/kv/order" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - - "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/stagedsync" - "github.com/ledgerwatch/erigon/eth/tracers" - "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/shards" - "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/bitmapdb" + "github.com/erigontech/erigon-lib/kv/iter" + "github.com/erigontech/erigon-lib/kv/order" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + + "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/stagedsync" + "github.com/erigontech/erigon/eth/tracers" + "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/shards" + "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 06ce3358765..bee3f1bc1a8 100644 --- a/turbo/jsonrpc/trace_types.go +++ b/turbo/jsonrpc/trace_types.go @@ -2,12 +2,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 c9a7f6c1c15..b5bcc4b7388 100644 --- a/turbo/jsonrpc/tracing.go +++ b/turbo/jsonrpc/tracing.go @@ -5,26 +5,26 @@ import ( "fmt" "time" + "github.com/erigontech/erigon-lib/log/v3" "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" - "github.com/ledgerwatch/erigon/eth/tracers" - 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/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/eth/tracers" + 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 aaf91175f3f..42f4fbd2f02 100644 --- a/turbo/jsonrpc/txpool_api.go +++ b/turbo/jsonrpc/txpool_api.go @@ -4,15 +4,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/txpool" - "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/txpool" + "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 8789ada0385..a0fdfd82a9e 100644 --- a/turbo/jsonrpc/txpool_api_test.go +++ b/turbo/jsonrpc/txpool_api_test.go @@ -3,23 +3,23 @@ package jsonrpc import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "testing" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + txPoolProto "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/kv/kvcache" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - txPoolProto "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "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" + "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) { diff --git a/turbo/jsonrpc/web3_api.go b/turbo/jsonrpc/web3_api.go index ea4ae201f3f..1b5ab511d54 100644 --- a/turbo/jsonrpc/web3_api.go +++ b/turbo/jsonrpc/web3_api.go @@ -3,10 +3,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 04e5025dcc1..050a6d21fad 100644 --- a/turbo/logging/flags.go +++ b/turbo/logging/flags.go @@ -1,7 +1,7 @@ package logging import ( - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" ) diff --git a/turbo/logging/logging.go b/turbo/logging/logging.go index c0b48b104e3..a210135ad1e 100644 --- a/turbo/logging/logging.go +++ b/turbo/logging/logging.go @@ -6,12 +6,12 @@ import ( "path/filepath" "strconv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/spf13/cobra" "github.com/urfave/cli/v2" "gopkg.in/natefinch/lumberjack.v2" - "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 d9fd2b8bfa3..e7d843ee204 100644 --- a/turbo/mock/txpool.go +++ b/turbo/mock/txpool.go @@ -4,11 +4,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 c3f19535483..3c9d66424b3 100644 --- a/turbo/node/node.go +++ b/turbo/node/node.go @@ -4,18 +4,18 @@ package node import ( "context" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" "github.com/urfave/cli/v2" - "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/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 ba627578e1b..4d0eee2d497 100644 --- a/turbo/rlphacks/bytes_test.go +++ b/turbo/rlphacks/bytes_test.go @@ -6,7 +6,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 066a85ce1ac..c03f5aa97b0 100644 --- a/turbo/rpchelper/filters.go +++ b/turbo/rpchelper/filters.go @@ -14,19 +14,19 @@ import ( "github.com/prometheus/client_golang/prometheus" - 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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon-lib/gointerfaces/txpool" - "github.com/ledgerwatch/erigon-lib/log/v3" - txpool2 "github.com/ledgerwatch/erigon-lib/txpool" + 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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon-lib/gointerfaces/txpool" + "github.com/erigontech/erigon-lib/log/v3" + txpool2 "github.com/erigontech/erigon-lib/txpool" "google.golang.org/grpc" - "github.com/ledgerwatch/erigon/core/types" - "github.com/ledgerwatch/erigon/eth/filters" - "github.com/ledgerwatch/erigon/rlp" + "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 df040e35cd1..9993e8c0e49 100644 --- a/turbo/rpchelper/filters_deadlock_test.go +++ b/turbo/rpchelper/filters_deadlock_test.go @@ -4,15 +4,15 @@ import ( "context" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" - "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 e6dcf53eb6e..fe0d8198a0d 100644 --- a/turbo/rpchelper/filters_test.go +++ b/turbo/rpchelper/filters_test.go @@ -4,17 +4,17 @@ import ( "context" "testing" + "github.com/erigontech/erigon/core/types" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/core/types" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" - types2 "github.com/ledgerwatch/erigon-lib/gointerfaces/types" + types2 "github.com/erigontech/erigon-lib/gointerfaces/types" - "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 c611c1a1f50..c24838cb4bb 100644 --- a/turbo/rpchelper/helper.go +++ b/turbo/rpchelper/helper.go @@ -5,18 +5,18 @@ import ( "errors" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/kvcache" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon/core/rawdb" - "github.com/ledgerwatch/erigon/core/state" - "github.com/ledgerwatch/erigon/core/systemcontracts" - "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/config3" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/kvcache" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon/core/rawdb" + "github.com/erigontech/erigon/core/state" + "github.com/erigontech/erigon/core/systemcontracts" + "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 801f57fccbd..ac292a31c4f 100644 --- a/turbo/rpchelper/interface.go +++ b/turbo/rpchelper/interface.go @@ -4,13 +4,13 @@ import ( "context" "sync/atomic" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/remote" - "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 a588d370f59..4ea9278fe8c 100644 --- a/turbo/rpchelper/logsfilter.go +++ b/turbo/rpchelper/logsfilter.go @@ -3,12 +3,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + 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/remote" - 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 41e963d3285..9e9d5aaeb64 100644 --- a/turbo/rpchelper/metrics.go +++ b/turbo/rpchelper/metrics.go @@ -1,7 +1,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 2bd69416c60..5925adffd6f 100644 --- a/turbo/rpchelper/rpc_block.go +++ b/turbo/rpchelper/rpc_block.go @@ -3,12 +3,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 949d89bbecd..c8af942407a 100644 --- a/turbo/services/interfaces.go +++ b/turbo/services/interfaces.go @@ -3,15 +3,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 7b50d4b0917..40cd6dbb883 100644 --- a/turbo/shards/events.go +++ b/turbo/shards/events.go @@ -3,9 +3,9 @@ package shards import ( "sync" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "github.com/ledgerwatch/erigon/core/types" + "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "github.com/erigontech/erigon/core/types" ) type RpcEventType uint64 diff --git a/turbo/shards/state_cache.go b/turbo/shards/state_cache.go index 86924418830..5fe4215c178 100644 --- a/turbo/shards/state_cache.go +++ b/turbo/shards/state_cache.go @@ -4,14 +4,14 @@ import ( "bytes" "container/heap" "fmt" - "github.com/ledgerwatch/erigon-lib/metrics" + "github.com/erigontech/erigon-lib/metrics" "unsafe" "github.com/c2h5oh/datasize" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types/accounts" "github.com/google/btree" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/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 5d2fc396f35..d8d1bcf9961 100644 --- a/turbo/shards/state_cache_test.go +++ b/turbo/shards/state_cache_test.go @@ -6,11 +6,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 cf0cc8c563b..12c414e334b 100644 --- a/turbo/shards/state_change_accumulator.go +++ b/turbo/shards/state_change_accumulator.go @@ -3,9 +3,9 @@ package shards import ( "context" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces" + "github.com/erigontech/erigon-lib/gointerfaces/remote" ) // 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 fc359033f21..8954261bf0c 100644 --- a/turbo/shards/trie_cache.go +++ b/turbo/shards/trie_cache.go @@ -3,14 +3,14 @@ package shards import ( "bytes" "fmt" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "math/bits" "unsafe" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/google/btree" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "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 b94e94737e8..6499e1d6e18 100644 --- a/turbo/silkworm/silkworm.go +++ b/turbo/silkworm/silkworm.go @@ -5,10 +5,10 @@ import ( "math/big" "unsafe" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/consensus" 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" ) type Silkworm = silkworm_go.Silkworm diff --git a/turbo/snapshotsync/freezeblocks/beacon_block_reader.go b/turbo/snapshotsync/freezeblocks/beacon_block_reader.go index a81e1a0bfb7..2b6b3fdb812 100644 --- a/turbo/snapshotsync/freezeblocks/beacon_block_reader.go +++ b/turbo/snapshotsync/freezeblocks/beacon_block_reader.go @@ -6,14 +6,14 @@ import ( "fmt" "sync" + 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" "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" ) var buffersPool = sync.Pool{ diff --git a/turbo/snapshotsync/freezeblocks/block_reader.go b/turbo/snapshotsync/freezeblocks/block_reader.go index 2f37b00b4a3..15f2850b17a 100644 --- a/turbo/snapshotsync/freezeblocks/block_reader.go +++ b/turbo/snapshotsync/freezeblocks/block_reader.go @@ -10,28 +10,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" - "github.com/ledgerwatch/erigon-lib/gointerfaces/remote" - "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" + "github.com/erigontech/erigon-lib/gointerfaces/remote" + "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 29a785080dc..ebb45364eee 100644 --- a/turbo/snapshotsync/freezeblocks/block_reader_test.go +++ b/turbo/snapshotsync/freezeblocks/block_reader_test.go @@ -7,16 +7,16 @@ import ( "path/filepath" "testing" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "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/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 0bf567329d2..c4a4b2e5f0c 100644 --- a/turbo/snapshotsync/freezeblocks/block_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/block_snapshots.go @@ -16,39 +16,39 @@ import ( "sync/atomic" "time" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/tidwall/btree" "golang.org/x/exp/slices" "golang.org/x/sync/errgroup" - "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/params" - "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/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/params" + "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 53fb8cd2c34..0443b7aa75c 100644 --- a/turbo/snapshotsync/freezeblocks/block_snapshots_test.go +++ b/turbo/snapshotsync/freezeblocks/block_snapshots_test.go @@ -6,19 +6,19 @@ import ( "testing" "testing/fstest" - "github.com/ledgerwatch/erigon-lib/log/v3" + "github.com/erigontech/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "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/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/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/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 666371caed5..3a8b8a1e109 100644 --- a/turbo/snapshotsync/freezeblocks/bor_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/bor_snapshots.go @@ -7,12 +7,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 35f1d7ca5ad..eb1edbdce1d 100644 --- a/turbo/snapshotsync/freezeblocks/caplin_snapshots.go +++ b/turbo/snapshotsync/freezeblocks/caplin_snapshots.go @@ -12,26 +12,26 @@ import ( "sync/atomic" "time" + "github.com/erigontech/erigon-lib/common/datadir" + "github.com/erigontech/erigon-lib/log/v3" "github.com/klauspost/compress/zstd" - "github.com/ledgerwatch/erigon-lib/common/datadir" - "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/cmp" - "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/cl/utils" - "github.com/ledgerwatch/erigon/eth/ethconfig" + + "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/cmp" + "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/cl/utils" + "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 a1efedf74ef..36b447683f6 100644 --- a/turbo/snapshotsync/freezeblocks/dump_test.go +++ b/turbo/snapshotsync/freezeblocks/dump_test.go @@ -5,27 +5,27 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon/polygon/bor/borcfg" + "github.com/erigontech/erigon-lib/chain/networkname" + "github.com/erigontech/erigon-lib/chain/snapcfg" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/chain/networkname" - "github.com/ledgerwatch/erigon-lib/chain/snapcfg" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon-lib/chain" - libcommon "github.com/ledgerwatch/erigon-lib/common" - types2 "github.com/ledgerwatch/erigon-lib/types" + "github.com/erigontech/erigon-lib/chain" + libcommon "github.com/erigontech/erigon-lib/common" + types2 "github.com/erigontech/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/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 741e3223549..5239e7a9ecc 100644 --- a/turbo/snapshotsync/snap/flags.go +++ b/turbo/snapshotsync/snap/flags.go @@ -1,8 +1,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 33d47b131df..d229f15e921 100644 --- a/turbo/snapshotsync/snapshotsync.go +++ b/turbo/snapshotsync/snapshotsync.go @@ -8,22 +8,22 @@ 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/diagnostics" - "github.com/ledgerwatch/erigon-lib/downloader/downloadergrpc" - "github.com/ledgerwatch/erigon-lib/downloader/snaptype" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/rawdbv3" - "github.com/ledgerwatch/erigon-lib/state" - - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/rawdb" - coresnaptype "github.com/ledgerwatch/erigon/core/snaptype" - "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/diagnostics" + "github.com/erigontech/erigon-lib/downloader/downloadergrpc" + "github.com/erigontech/erigon-lib/downloader/snaptype" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/rawdbv3" + "github.com/erigontech/erigon-lib/state" + + "github.com/erigontech/erigon-lib/log/v3" + "github.com/erigontech/erigon/core/rawdb" + coresnaptype "github.com/erigontech/erigon/core/snaptype" + "github.com/erigontech/erigon/turbo/services" ) type CaplinMode int diff --git a/turbo/stages/blockchain_test.go b/turbo/stages/blockchain_test.go index 0127e57baa7..7a046fc707b 100644 --- a/turbo/stages/blockchain_test.go +++ b/turbo/stages/blockchain_test.go @@ -25,32 +25,32 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "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 4a3d3787985..cdcc21e1b07 100644 --- a/turbo/stages/bodydownload/body_algos.go +++ b/turbo/stages/bodydownload/body_algos.go @@ -9,17 +9,17 @@ 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 15f1294b81d..572ebed5083 100644 --- a/turbo/stages/bodydownload/body_data_struct.go +++ b/turbo/stages/bodydownload/body_data_struct.go @@ -2,14 +2,14 @@ package bodydownload import ( "github.com/RoaringBitmap/roaring/roaring64" + 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/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" - "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, and WithdrawalsHash to the block header diff --git a/turbo/stages/bodydownload/body_test.go b/turbo/stages/bodydownload/body_test.go index 8d0d6ecc3a5..9ab395afddc 100644 --- a/turbo/stages/bodydownload/body_test.go +++ b/turbo/stages/bodydownload/body_test.go @@ -3,11 +3,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 b7633aaba13..0da4c32a7fd 100644 --- a/turbo/stages/bodydownload/prefetched_blocks.go +++ b/turbo/stages/bodydownload/prefetched_blocks.go @@ -1,10 +1,10 @@ package bodydownload import ( + "github.com/erigontech/erigon-lib/common" "github.com/hashicorp/golang-lru/v2" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types" + "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 fd71b318420..1ac15942ae6 100644 --- a/turbo/stages/chain_makers_test.go +++ b/turbo/stages/chain_makers_test.go @@ -21,17 +21,17 @@ import ( "math/big" "testing" + "github.com/erigontech/erigon-lib/chain" "github.com/holiman/uint256" - "github.com/ledgerwatch/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 a26a65740b8..0fa02cacdcc 100644 --- a/turbo/stages/genesis_test.go +++ b/turbo/stages/genesis_test.go @@ -23,19 +23,19 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "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-lib/log/v3" - "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-lib/log/v3" + "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 7a83b452bac..9437a98b27e 100644 --- a/turbo/stages/headerdownload/header_algo_test.go +++ b/turbo/stages/headerdownload/header_algo_test.go @@ -6,16 +6,16 @@ import ( "math/big" "testing" - "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - - "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/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-lib/kv" + + "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/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 7d177607efe..a40c0979ca9 100644 --- a/turbo/stages/headerdownload/header_algos.go +++ b/turbo/stages/headerdownload/header_algos.go @@ -15,24 +15,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" - - 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" + + 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 0138810e99b..40ae9d43ea8 100644 --- a/turbo/stages/headerdownload/header_data_struct.go +++ b/turbo/stages/headerdownload/header_data_struct.go @@ -7,15 +7,15 @@ import ( "sync" "time" + "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" "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" ) type QueueID uint8 diff --git a/turbo/stages/mock/mock_sentry.go b/turbo/stages/mock/mock_sentry.go index 008bc129365..b7e5ec60f51 100644 --- a/turbo/stages/mock/mock_sentry.go +++ b/turbo/stages/mock/mock_sentry.go @@ -11,64 +11,64 @@ import ( "time" "github.com/c2h5oh/datasize" + "github.com/erigontech/erigon-lib/config3" + "github.com/erigontech/erigon-lib/kv/temporal/temporaltest" + "github.com/erigontech/erigon-lib/log/v3" lru "github.com/hashicorp/golang-lru/arc/v2" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/config3" - "github.com/ledgerwatch/erigon-lib/kv/temporal/temporaltest" - "github.com/ledgerwatch/erigon-lib/log/v3" "google.golang.org/protobuf/types/known/emptypb" - "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_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/gointerfaces/execution" - proto_sentry "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - ptypes "github.com/ledgerwatch/erigon-lib/gointerfaces/types" - "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/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/ledgerwatch/erigon/turbo/trie" + "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_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloader" + "github.com/erigontech/erigon-lib/gointerfaces/execution" + proto_sentry "github.com/erigontech/erigon-lib/gointerfaces/sentry" + ptypes "github.com/erigontech/erigon-lib/gointerfaces/types" + "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/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" + "github.com/erigontech/erigon/turbo/trie" ) const MockInsertAsInitialCycle = false diff --git a/turbo/stages/mock/sentry_mock_test.go b/turbo/stages/mock/sentry_mock_test.go index 6b28ba1763e..a215bca4507 100644 --- a/turbo/stages/mock/sentry_mock_test.go +++ b/turbo/stages/mock/sentry_mock_test.go @@ -4,22 +4,22 @@ import ( "math/big" "testing" + "github.com/erigontech/erigon-lib/log/v3" "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon-lib/log/v3" "github.com/stretchr/testify/require" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/gointerfaces/sentry" - "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" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/gointerfaces/sentry" + "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 8f30d4a9353..7b0a49a2f5e 100644 --- a/turbo/stages/stageloop.go +++ b/turbo/stages/stageloop.go @@ -6,40 +6,40 @@ import ( "fmt" "time" + "github.com/erigontech/erigon-lib/log/v3" 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" - proto_downloader "github.com/ledgerwatch/erigon-lib/gointerfaces/downloader" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/membatchwithdb" - "github.com/ledgerwatch/erigon-lib/state" - "github.com/ledgerwatch/erigon-lib/wrap" - "github.com/ledgerwatch/erigon/polygon/bor/finality" - - "github.com/ledgerwatch/erigon/polygon/heimdall" - - "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/sentry_multi_client" - "github.com/ledgerwatch/erigon/polygon/bor" - "github.com/ledgerwatch/erigon/polygon/bor/finality/flags" - "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" + proto_downloader "github.com/erigontech/erigon-lib/gointerfaces/downloader" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/membatchwithdb" + "github.com/erigontech/erigon-lib/state" + "github.com/erigontech/erigon-lib/wrap" + "github.com/erigontech/erigon/polygon/bor/finality" + + "github.com/erigontech/erigon/polygon/heimdall" + + "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/sentry_multi_client" + "github.com/erigontech/erigon/polygon/bor" + "github.com/erigontech/erigon/polygon/bor/finality/flags" + "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 80929b23de4..4b7b119b6fd 100644 --- a/turbo/testlog/testlog.go +++ b/turbo/testlog/testlog.go @@ -21,7 +21,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 87b0594054f..da29580bd09 100644 --- a/turbo/transactions/call.go +++ b/turbo/transactions/call.go @@ -5,22 +5,22 @@ import ( "fmt" "time" + "github.com/erigontech/erigon-lib/log/v3" "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/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/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/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 125762f1cdb..c09780d418d 100644 --- a/turbo/transactions/tracing.go +++ b/turbo/transactions/tracing.go @@ -8,24 +8,24 @@ import ( "fmt" "time" + "github.com/erigontech/erigon-lib/log/v3" jsoniter "github.com/json-iterator/go" - "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/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/stagedsync" - "github.com/ledgerwatch/erigon/eth/tracers" - "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/stagedsync" + "github.com/erigontech/erigon/eth/tracers" + "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 0e787a2daa1..df4c59a2cb6 100644 --- a/turbo/trie/account_node_test.go +++ b/turbo/trie/account_node_test.go @@ -2,16 +2,16 @@ package trie import ( "crypto/ecdsa" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" + "github.com/erigontech/erigon-lib/kv/dbutils" "reflect" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" "golang.org/x/crypto/sha3" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" + "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 7945e611ca0..781472d6f7f 100644 --- a/turbo/trie/debug.go +++ b/turbo/trie/debug.go @@ -23,7 +23,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func (t *Trie) Print(w io.Writer) { diff --git a/turbo/trie/debug_test.go b/turbo/trie/debug_test.go index c923f4d914c..c453c856ea9 100644 --- a/turbo/trie/debug_test.go +++ b/turbo/trie/debug_test.go @@ -23,11 +23,11 @@ import ( "fmt" "testing" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/core/types/accounts" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/core/types/accounts" ) var debugTests = []struct { diff --git a/turbo/trie/delete_subrtee_test.go b/turbo/trie/delete_subrtee_test.go index 32fe9355adb..1b60879178f 100644 --- a/turbo/trie/delete_subrtee_test.go +++ b/turbo/trie/delete_subrtee_test.go @@ -6,12 +6,12 @@ import ( "reflect" "testing" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" "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" + "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 c72423e2f2e..f19ccb1c26d 100644 --- a/turbo/trie/encoding.go +++ b/turbo/trie/encoding.go @@ -19,7 +19,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 bf4134c9587..07f368a4d4b 100644 --- a/turbo/trie/encoding_test.go +++ b/turbo/trie/encoding_test.go @@ -22,7 +22,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 bf879782fda..f6f62d304d0 100644 --- a/turbo/trie/errors.go +++ b/turbo/trie/errors.go @@ -19,7 +19,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 b288174365e..91f6f6293b2 100644 --- a/turbo/trie/flatdb_sub_trie_loader_test.go +++ b/turbo/trie/flatdb_sub_trie_loader_test.go @@ -5,12 +5,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 45651ed75ab..1b022aea560 100644 --- a/turbo/trie/gen_struct_step.go +++ b/turbo/trie/gen_struct_step.go @@ -19,10 +19,10 @@ package trie import ( "fmt" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + "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 933a147000c..8a8522abeb4 100644 --- a/turbo/trie/hack.go +++ b/turbo/trie/hack.go @@ -3,10 +3,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 18059dcf057..4626c214d93 100644 --- a/turbo/trie/hashbuilder.go +++ b/turbo/trie/hashbuilder.go @@ -6,15 +6,15 @@ import ( "io" "math/bits" + libcommon "github.com/erigontech/erigon-lib/common" + length2 "github.com/erigontech/erigon-lib/common/length" "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" + "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 194d694a23d..d0c1fb8a926 100644 --- a/turbo/trie/hasher.go +++ b/turbo/trie/hasher.go @@ -21,13 +21,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 a68a47a4b06..1359f9824d4 100644 --- a/turbo/trie/hasher_test.go +++ b/turbo/trie/hasher_test.go @@ -4,7 +4,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 531c6083e1a..87612890bc6 100644 --- a/turbo/trie/intermediate_hashes_test.go +++ b/turbo/trie/intermediate_hashes_test.go @@ -2,8 +2,8 @@ package trie import ( "fmt" - "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" "strconv" "testing" diff --git a/turbo/trie/node.go b/turbo/trie/node.go index b7bb2262237..3fd268bf097 100644 --- a/turbo/trie/node.go +++ b/turbo/trie/node.go @@ -20,11 +20,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 d9dc7ffeb5b..5796e32d8b6 100644 --- a/turbo/trie/proof.go +++ b/turbo/trie/proof.go @@ -4,12 +4,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 9f768fb2349..9bb4b11db2e 100644 --- a/turbo/trie/retain_list.go +++ b/turbo/trie/retain_list.go @@ -20,14 +20,14 @@ import ( "bytes" "encoding/binary" "fmt" - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "math/big" "sort" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/length" + "github.com/erigontech/erigon/core/types/accounts" "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" ) type RetainDecider interface { diff --git a/turbo/trie/retain_list_test.go b/turbo/trie/retain_list_test.go index a9488efb54e..47eea5bafe7 100644 --- a/turbo/trie/retain_list_test.go +++ b/turbo/trie/retain_list_test.go @@ -1,12 +1,12 @@ package trie import ( - "github.com/ledgerwatch/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/common/hexutil" "testing" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon/core/types/accounts" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon/core/types/accounts" "github.com/stretchr/testify/require" ) diff --git a/turbo/trie/stark_stats.go b/turbo/trie/stark_stats.go index ffa8f0a89d2..def4b8bb878 100644 --- a/turbo/trie/stark_stats.go +++ b/turbo/trie/stark_stats.go @@ -6,12 +6,12 @@ import ( "math/bits" "sort" + libcommon "github.com/erigontech/erigon-lib/common" + len2 "github.com/erigontech/erigon-lib/common/length" "github.com/holiman/uint256" - libcommon "github.com/ledgerwatch/erigon-lib/common" - len2 "github.com/ledgerwatch/erigon-lib/common/length" - "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" ) type StarkStatsBuilder struct { diff --git a/turbo/trie/stream.go b/turbo/trie/stream.go index c89a5c83369..364e4440129 100644 --- a/turbo/trie/stream.go +++ b/turbo/trie/stream.go @@ -22,12 +22,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 2c3038d5ea6..9005d27b010 100644 --- a/turbo/trie/stream_test.go +++ b/turbo/trie/stream_test.go @@ -23,11 +23,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_branch_test.go b/turbo/trie/structural_branch_test.go index aebde55d551..66e6eaa9a1c 100644 --- a/turbo/trie/structural_branch_test.go +++ b/turbo/trie/structural_branch_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/kv" - "github.com/ledgerwatch/erigon-lib/kv/memdb" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/kv" + "github.com/erigontech/erigon-lib/kv/memdb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/ledgerwatch/erigon/common" - "github.com/ledgerwatch/erigon/eth/integrity" - "github.com/ledgerwatch/erigon/turbo/trie" + "github.com/erigontech/erigon/common" + "github.com/erigontech/erigon/eth/integrity" + "github.com/erigontech/erigon/turbo/trie" ) func TestIHCursor(t *testing.T) { diff --git a/turbo/trie/structural_test.go b/turbo/trie/structural_test.go index 2d02bc28605..02456553c89 100644 --- a/turbo/trie/structural_test.go +++ b/turbo/trie/structural_test.go @@ -25,13 +25,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 7e3d41b4972..cfe4d9c3a85 100644 --- a/turbo/trie/sub_trie_loader.go +++ b/turbo/trie/sub_trie_loader.go @@ -1,7 +1,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 c8e6ee215e4..f2accf0085b 100644 --- a/turbo/trie/trie.go +++ b/turbo/trie/trie.go @@ -22,12 +22,12 @@ import ( "encoding/binary" "fmt" - libcommon "github.com/ledgerwatch/erigon-lib/common" - "github.com/ledgerwatch/erigon-lib/common/cmp" + libcommon "github.com/erigontech/erigon-lib/common" + "github.com/erigontech/erigon-lib/common/cmp" - "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_from_witness.go b/turbo/trie/trie_from_witness.go index 1d76411bd1e..ab7bfaa0090 100644 --- a/turbo/trie/trie_from_witness.go +++ b/turbo/trie/trie_from_witness.go @@ -5,7 +5,7 @@ import ( "github.com/holiman/uint256" - "github.com/ledgerwatch/erigon/turbo/rlphacks" + "github.com/erigontech/erigon/turbo/rlphacks" ) func BuildTrieFromWitness(witness *Witness, trace bool) (*Trie, error) { diff --git a/turbo/trie/trie_root.go b/turbo/trie/trie_root.go index b973ff9c254..54447a53f7d 100644 --- a/turbo/trie/trie_root.go +++ b/turbo/trie/trie_root.go @@ -8,16 +8,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_root_test.go b/turbo/trie/trie_root_test.go index c66386b1e48..e03530b2019 100644 --- a/turbo/trie/trie_root_test.go +++ b/turbo/trie/trie_root_test.go @@ -8,19 +8,19 @@ import ( "testing" "time" - "github.com/ledgerwatch/erigon-lib/common/hexutil" - "github.com/ledgerwatch/erigon-lib/kv/dbutils" - + "github.com/erigontech/erigon-lib/common/hexutil" + "github.com/erigontech/erigon-lib/kv/dbutils" + + 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-lib/log/v3" + "github.com/erigontech/erigon/core/types/accounts" + "github.com/erigontech/erigon/crypto" + "github.com/erigontech/erigon/eth/stagedsync" + "github.com/erigontech/erigon/turbo/trie" "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/memdb" - "github.com/ledgerwatch/erigon-lib/log/v3" - "github.com/ledgerwatch/erigon/core/types/accounts" - "github.com/ledgerwatch/erigon/crypto" - "github.com/ledgerwatch/erigon/eth/stagedsync" - "github.com/ledgerwatch/erigon/turbo/trie" "github.com/stretchr/testify/require" ) diff --git a/turbo/trie/trie_test.go b/turbo/trie/trie_test.go index 1e0f59a298b..fae18bfef18 100644 --- a/turbo/trie/trie_test.go +++ b/turbo/trie/trie_test.go @@ -26,13 +26,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 bf2b0dcb35b..19553527d63 100644 --- a/turbo/trie/trie_transform.go +++ b/turbo/trie/trie_transform.go @@ -1,8 +1,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 fb462d1a6fb..16ab12d7ead 100644 --- a/turbo/trie/visual.go +++ b/turbo/trie/visual.go @@ -23,9 +23,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/turbo/trie/witness_builder.go b/turbo/trie/witness_builder.go index d517b0ad8c5..287a1b4b048 100644 --- a/turbo/trie/witness_builder.go +++ b/turbo/trie/witness_builder.go @@ -4,7 +4,7 @@ import ( "fmt" "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) type HashNodeFunc func(node, bool, []byte) (int, error) diff --git a/turbo/trie/witness_builder_test.go b/turbo/trie/witness_builder_test.go index a5e60d52fae..2145fa352f7 100644 --- a/turbo/trie/witness_builder_test.go +++ b/turbo/trie/witness_builder_test.go @@ -4,9 +4,9 @@ import ( "bytes" "testing" - 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" ) func TestBlockWitness(t *testing.T) { diff --git a/turbo/trie/witness_marshalling.go b/turbo/trie/witness_marshalling.go index 2bd13143f08..b1642e5b358 100644 --- a/turbo/trie/witness_marshalling.go +++ b/turbo/trie/witness_marshalling.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/ugorji/go/codec" ) diff --git a/turbo/trie/witness_operators.go b/turbo/trie/witness_operators.go index e61a7df5304..792f047817f 100644 --- a/turbo/trie/witness_operators.go +++ b/turbo/trie/witness_operators.go @@ -3,7 +3,7 @@ package trie import ( "math/big" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" "github.com/ugorji/go/codec" ) diff --git a/turbo/trie/witness_test.go b/turbo/trie/witness_test.go index 23f0148aaca..8cfbf497605 100644 --- a/turbo/trie/witness_test.go +++ b/turbo/trie/witness_test.go @@ -6,7 +6,7 @@ import ( "math/big" "testing" - libcommon "github.com/ledgerwatch/erigon-lib/common" + libcommon "github.com/erigontech/erigon-lib/common" ) func generateOperands() []WitnessOperator { diff --git a/wmake.ps1 b/wmake.ps1 index 01a46755539..accd7a3bf82 100644 --- a/wmake.ps1 +++ b/wmake.ps1 @@ -395,7 +395,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 @@ -414,7 +414,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)"""