diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index faf922df01..0000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1,22 +0,0 @@ -# Lines starting with '#' are comments. -# Each line is a file pattern followed by one or more owners. - -accounts/usbwallet @karalabe -accounts/scwallet @gballet -accounts/abi @gballet @MariusVanDerWijden -cmd/clef @holiman -consensus @karalabe -core/ @karalabe @holiman @rjl493456442 -eth/ @karalabe @holiman @rjl493456442 -eth/catalyst/ @gballet -eth/tracers/ @s1na -graphql/ @s1na -les/ @zsfelfoldi @rjl493456442 -light/ @zsfelfoldi @rjl493456442 -node/ @fjl -p2p/ @fjl @zsfelfoldi -rpc/ @fjl @holiman -p2p/simulations @fjl -p2p/protocols @fjl -p2p/testing @fjl -signer/ @holiman diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md deleted file mode 100644 index 969b7f8f9f..0000000000 --- a/.github/CONTRIBUTING.md +++ /dev/null @@ -1,40 +0,0 @@ -# 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 -smallest of fixes! - -If you'd like to contribute to go-ethereum, 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 [our gitter channel](https://gitter.im/ethereum/go-ethereum) 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. - -## Coding guidelines - -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 `master` 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 -[Geth documentation page](https://geth.ethereum.org/docs/) for more info -and help. - -## Configuration, dependencies, and tests - -Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/geth-developer/dev-guide) -for more details on configuring your environment, managing project dependencies -and testing procedures. diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md deleted file mode 100644 index 45bfd986ac..0000000000 --- a/.github/ISSUE_TEMPLATE/bug.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: Report a bug -about: Something with go-ethereum is not working as expected -title: '' -labels: 'type:bug' -assignees: '' ---- - -#### System information - -Geth version: `geth version` -CL client & version: e.g. lighthouse/nimbus/prysm@v1.0.0 -OS & Version: Windows/Linux/OSX -Commit hash : (if `develop`) - -#### Expected behaviour - - -#### Actual behaviour - - -#### Steps to reproduce the behaviour - - -#### Backtrace - -```` -[backtrace] -```` - -When submitting logs: please submit them as text and not screenshots. diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md deleted file mode 100644 index aacd885f9e..0000000000 --- a/.github/ISSUE_TEMPLATE/feature.md +++ /dev/null @@ -1,17 +0,0 @@ ---- -name: Request a feature -about: Report a missing feature - e.g. as a step before submitting a PR -title: '' -labels: 'type:feature' -assignees: '' ---- - -# Rationale - -Why should this feature exist? -What are the use-cases? - -# Implementation - -Do you have ideas regarding the implementation of this feature? -Are you willing to implement this feature? \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md deleted file mode 100644 index 8f460ab558..0000000000 --- a/.github/ISSUE_TEMPLATE/question.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: Ask a question -about: Something is unclear -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 [discord](https://discord.gg/nthXNEv) or the Ethereum stack exchange at https://ethereum.stackexchange.com. diff --git a/.github/no-response.yml b/.github/no-response.yml deleted file mode 100644 index 903d4ce85f..0000000000 --- a/.github/no-response.yml +++ /dev/null @@ -1,11 +0,0 @@ -# Number of days of inactivity before an Issue is closed for lack of response -daysUntilClose: 30 -# Label requiring a response -responseRequiredLabel: "need:more-information" -# Comment to post when closing an Issue for lack of response. Set to `false` to disable -closeComment: > - This issue has been automatically closed because there has been no response - to our request for more information from the original author. With only the - information that is currently in the issue, we don't have enough information - to take action. Please reach out if you have more relevant information or - answers to our questions so that we can investigate further. diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 6d921cc795..0000000000 --- a/.github/stale.yml +++ /dev/null @@ -1,17 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 366 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 42 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned - - security -# Label to use when marking an issue as stale -staleLabel: "status:inactive" -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index a4ad293eb1..0000000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: CI -run-name: CI triggered from @${{ github.actor }} of ${{ github.head_ref }} - -on: - workflow_dispatch: - pull_request: - push: - branches: - - master - -jobs: - run-tests: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: 1.20.x - - - name: Test - run: make test - - run-linter: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - with: - submodules: true - - - name: Set up Go - uses: actions/setup-go@v4 - with: - go-version: 1.20.x - - - name: Test - run: make lint diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml deleted file mode 100644 index e47a61bbec..0000000000 --- a/.github/workflows/go.yml +++ /dev/null @@ -1,24 +0,0 @@ -name: i386 linux tests - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - workflow_dispatch: - -jobs: - build: - if: false # not supported on OffchainLabs fork, ci.yml is used instead - runs-on: self-hosted - steps: - - uses: actions/checkout@v2 - - name: Set up Go - uses: actions/setup-go@v2 - with: - go-version: 1.21.4 - - name: Run tests - run: go test -short ./... - env: - GOOS: linux - GOARCH: 386 diff --git a/.github/workflows/merge-checks.yml b/.github/workflows/merge-checks.yml deleted file mode 100644 index 6561c429e2..0000000000 --- a/.github/workflows/merge-checks.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Merge Checks - -on: - pull_request_target: - branches: [ master ] - types: [synchronize, opened, reopened, labeled, unlabeled] - -permissions: - statuses: write - -jobs: - check-design-approved: - name: Check if Design Approved - runs-on: ubuntu-latest - steps: - - name: Check if design approved and update status - run: | - set -x pipefail - status_state="pending" - if ${{ contains(github.event.*.labels.*.name, 'design-approved') }}; then - status_state="success" - else - resp="$(curl -sSL --fail-with-body \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "https://api.github.com/repos/$GITHUB_REPOSITORY/commits/${{ github.event.pull_request.head.sha }}/statuses")" - if ! jq -e '.[] | select(.context == "Design Approved Check")' > /dev/null <<< "$resp"; then - # Design not approved yet and no status exists - # Keep it without a status to keep the green checkmark appearing - # Otherwise, the commit and PR's CI will appear to be indefinitely pending - # Merging will still be blocked until the required status appears - exit 0 - fi - fi - curl -sSL --fail-with-body \ - -X POST \ - -H "Accept: application/vnd.github+json" \ - -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ - -H "X-GitHub-Api-Version: 2022-11-28" \ - "https://api.github.com/repos/$GITHUB_REPOSITORY/statuses/${{ github.event.pull_request.head.sha }}" \ - -d '{"context":"Design Approved Check","state":"'"$status_state"'"}' diff --git a/.travis.yml b/.travis.yml index a55583a703..4d89e4630b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: go -go_import_path: github.com/ethereum/go-ethereum +go_import_path: github.com/paxosglobal/go-ethereum-arbitrum sudo: false jobs: allow_failures: diff --git a/README.md b/README.md index 1e8dba8090..29b474c28d 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,9 @@ Golang execution layer implementation of the Ethereum protocol. [![API Reference]( -https://pkg.go.dev/badge/github.com/ethereum/go-ethereum -)](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc) -[![Go Report Card](https://goreportcard.com/badge/github.com/ethereum/go-ethereum)](https://goreportcard.com/report/github.com/ethereum/go-ethereum) +https://pkg.go.dev/badge/github.com/paxosglobal/go-ethereum-arbitrum +)](https://pkg.go.dev/github.com/paxosglobal/go-ethereum-arbitrum?tab=doc) +[![Go Report Card](https://goreportcard.com/badge/github.com/paxosglobal/go-ethereum-arbitrum)](https://goreportcard.com/report/github.com/paxosglobal/go-ethereum-arbitrum) [![Travis](https://app.travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://app.travis-ci.com/github/ethereum/go-ethereum) [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv) @@ -344,7 +344,7 @@ testing procedures. ### Contributing to geth.ethereum.org For contributions to the [go-ethereum website](https://geth.ethereum.org), please checkout and raise pull requests against the `website` branch. -For more detailed instructions please see the `website` branch [README](https://github.com/ethereum/go-ethereum/tree/website#readme) or the +For more detailed instructions please see the `website` branch [README](https://github.com/paxosglobal/go-ethereum-arbitrum/tree/website#readme) or the [contributing](https://geth.ethereum.org/docs/developers/geth-developer/contributing) page of the website. ## License diff --git a/SECURITY.md b/SECURITY.md index 41b900d5e9..6cdb4207ea 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -2,24 +2,24 @@ ## Supported Versions -Please see [Releases](https://github.com/ethereum/go-ethereum/releases). We recommend using the [most recently released version](https://github.com/ethereum/go-ethereum/releases/latest). +Please see [Releases](https://github.com/paxosglobal/go-ethereum-arbitrum/releases). We recommend using the [most recently released version](https://github.com/paxosglobal/go-ethereum-arbitrum/releases/latest). ## Audit reports -Audit reports are published in the `docs` folder: https://github.com/ethereum/go-ethereum/tree/master/docs/audits +Audit reports are published in the `docs` folder: https://github.com/paxosglobal/go-ethereum-arbitrum/tree/master/docs/audits | Scope | Date | Report Link | | ------- | ------- | ----------- | -| `geth` | 20170425 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | -| `clef` | 20180914 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | -| `Discv5` | 20191015 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2019-10-15_Discv5_audit_LeastAuthority.pdf) | -| `Discv5` | 20200124 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2020-01-24_DiscV5_audit_Cure53.pdf) | +| `geth` | 20170425 | [pdf](https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | +| `clef` | 20180914 | [pdf](https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/docs/audits/2018-09-14_Clef-audit_NCC.pdf) | +| `Discv5` | 20191015 | [pdf](https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/docs/audits/2019-10-15_Discv5_audit_LeastAuthority.pdf) | +| `Discv5` | 20200124 | [pdf](https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/docs/audits/2020-01-24_DiscV5_audit_Cure53.pdf) | ## Reporting a Vulnerability **Please do not file a public ticket** mentioning the vulnerability. -To find out how to disclose a vulnerability in Ethereum visit [https://bounty.ethereum.org](https://bounty.ethereum.org) or email bounty@ethereum.org. Please read the [disclosure page](https://github.com/ethereum/go-ethereum/security/advisories?state=published) for more information about publicly disclosed security vulnerabilities. +To find out how to disclose a vulnerability in Ethereum visit [https://bounty.ethereum.org](https://bounty.ethereum.org) or email bounty@ethereum.org. Please read the [disclosure page](https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories?state=published) for more information about publicly disclosed security vulnerabilities. Use the built-in `geth version-check` feature to check whether the software is affected by any known vulnerability. This command will fetch the latest [`vulnerabilities.json`](https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities.json) file which contains known security vulnerabilities concerning `geth`, and cross-check the data against its own version number. diff --git a/accounts/abi/abi.go b/accounts/abi/abi.go index c7bc2b4541..5c8e5555a6 100644 --- a/accounts/abi/abi.go +++ b/accounts/abi/abi.go @@ -24,8 +24,8 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 5a77907aab..1b7fa75549 100644 --- a/accounts/abi/abi_test.go +++ b/accounts/abi/abi_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) const jsondata = ` diff --git a/accounts/abi/bind/auth.go b/accounts/abi/bind/auth.go index 0740c69510..66307a88cc 100644 --- a/accounts/abi/bind/auth.go +++ b/accounts/abi/bind/auth.go @@ -23,13 +23,13 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/external" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // 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 38b3046970..7b785c3ba6 100644 --- a/accounts/abi/bind/backend.go +++ b/accounts/abi/bind/backend.go @@ -21,9 +21,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var ( diff --git a/accounts/abi/bind/backends/simulated.go b/accounts/abi/bind/backends/simulated.go index 756a9d3552..93af081d93 100644 --- a/accounts/abi/bind/backends/simulated.go +++ b/accounts/abi/bind/backends/simulated.go @@ -19,13 +19,13 @@ package backends import ( "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/ethclient/simulated" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/ethclient/simulated" ) // SimulatedBackend is a simulated blockchain. -// Deprecated: use package github.com/ethereum/go-ethereum/ethclient/simulated instead. +// Deprecated: use package github.com/paxosglobal/go-ethereum-arbitrum/ethclient/simulated instead. type SimulatedBackend struct { *simulated.Backend simulated.Client @@ -42,7 +42,7 @@ func (b *SimulatedBackend) Fork(ctx context.Context, parentHash common.Hash) err // A simulated backend always uses chainID 1337. // // Deprecated: please use simulated.Backend from package -// github.com/ethereum/go-ethereum/ethclient/simulated instead. +// github.com/paxosglobal/go-ethereum-arbitrum/ethclient/simulated instead. func NewSimulatedBackend(alloc core.GenesisAlloc, gasLimit uint64) *SimulatedBackend { b := simulated.NewBackend(alloc, simulated.WithBlockGasLimit(gasLimit)) return &SimulatedBackend{ diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go index b503571f76..4e2c7de981 100644 --- a/accounts/abi/bind/base.go +++ b/accounts/abi/bind/base.go @@ -24,13 +24,13 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const basefeeWiggleMultiplier = 2 diff --git a/accounts/abi/bind/base_test.go b/accounts/abi/bind/base_test.go index f7eb7d14d3..a154c7966a 100644 --- a/accounts/abi/bind/base_test.go +++ b/accounts/abi/bind/base_test.go @@ -24,14 +24,14 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/assert" ) diff --git a/accounts/abi/bind/bind.go b/accounts/abi/bind/bind.go index 9d950bd782..cefbe0a3c3 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/ethereum/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts +// https://github.com/paxosglobal/go-ethereum-arbitrum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts package bind import ( @@ -29,8 +29,8 @@ import ( "text/template" "unicode" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // 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 b452ac9c5a..324728a5dc 100644 --- a/accounts/abi/bind/bind_test.go +++ b/accounts/abi/bind/bind_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) var bindTests = []struct { @@ -46,7 +46,7 @@ var bindTests = []struct { `contract NilContract {}`, []string{`606060405260068060106000396000f3606060405200`}, []string{`[]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/paxosglobal/go-ethereum-arbitrum/common"`, ` if b, err := NewEmpty(common.Address{}, nil); b == nil || err != nil { t.Fatalf("combined binding (%v) nil or error (%v) not nil", b, nil) @@ -69,7 +69,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"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/paxosglobal/go-ethereum-arbitrum/common"`, ` if b, err := NewToken(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -85,7 +85,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"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/paxosglobal/go-ethereum-arbitrum/common"`, ` if b, err := NewCrowdsale(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -101,7 +101,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"}]`}, - `"github.com/ethereum/go-ethereum/common"`, + `"github.com/paxosglobal/go-ethereum-arbitrum/common"`, ` if b, err := NewDAO(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -128,7 +128,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" `, `if b, err := NewInputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -166,7 +166,7 @@ var bindTests = []struct { ` "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" `, `if b, err := NewOutputChecker(common.Address{}, nil); b == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", b, nil) @@ -207,7 +207,7 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" `, `if e, err := NewEventChecker(common.Address{}, nil); e == nil || err != nil { t.Fatalf("binding (%v) nil or error (%v) not nil", e, nil) @@ -287,10 +287,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -343,10 +343,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -389,10 +389,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -446,11 +446,11 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -495,10 +495,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -562,10 +562,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -607,10 +607,10 @@ var bindTests = []struct { []string{`6060604052609f8060106000396000f3606060405260e060020a6000350463f97a60058114601a575b005b600060605260c0604052600d60809081527f4920646f6e27742065786973740000000000000000000000000000000000000060a052602060c0908152600d60e081905281906101009060a09080838184600060046012f15050815172ffffffffffffffffffffffffffffffffffffff1916909152505060405161012081900392509050f3`}, []string{`[{"constant":true,"inputs":[],"name":"String","outputs":[{"name":"","type":"string"}],"type":"function"}]`}, ` - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -646,10 +646,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/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" `, ` // Create a simulator and wrap a non-deployed contract @@ -694,10 +694,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -743,11 +743,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -819,10 +819,10 @@ var bindTests = []struct { "fmt" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -912,11 +912,11 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -1103,10 +1103,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -1238,10 +1238,10 @@ var bindTests = []struct { "math/big" "reflect" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` @@ -1380,10 +1380,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -1446,10 +1446,10 @@ var bindTests = []struct { "math/big" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Initialize test accounts @@ -1534,10 +1534,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/core" `, ` // Initialize test accounts @@ -1597,10 +1597,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/core" `, ` key, _ := crypto.GenerateKey() @@ -1659,10 +1659,10 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` // Generate a new random account and a funded simulator @@ -1720,10 +1720,10 @@ var bindTests = []struct { "bytes" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" `, ` key, _ := crypto.GenerateKey() @@ -1808,11 +1808,11 @@ var bindTests = []struct { ` "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" `, ` var ( @@ -1879,11 +1879,11 @@ var bindTests = []struct { "context" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" `, ` var ( @@ -1932,11 +1932,11 @@ var bindTests = []struct { "context" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" `, tester: ` var ( @@ -1981,11 +1981,11 @@ var bindTests = []struct { "context" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" `, tester: ` var ( @@ -2022,11 +2022,11 @@ var bindTests = []struct { "context" "math/big" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/accounts/abi/bind/backends" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind/backends" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" `, tester: ` var ( @@ -2060,7 +2060,7 @@ var bindTests = []struct { bytecode: []string{"0x6080604052348015600f57600080fd5b5060958061001e6000396000f3fe6080604052348015600f57600080fd5b5060043610603c5760003560e01c80639d993132146041578063d02767c7146049578063ffa02795146051575b600080fd5b60476059565b005b604f605b565b005b6057605d565b005b565b565b56fea26469706673582212200382ca602dff96a7e2ba54657985e2b4ac423a56abe4a1f0667bc635c4d4371f64736f6c63430008110033"}, abi: []string{`[{"anonymous":false,"inputs":[{"indexed":false,"internalType":"address","name":"_param","type":"address"}],"name":"_1TestEvent","type":"event"},{"inputs":[],"name":"_1test","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"__1test","outputs":[],"stateMutability":"pure","type":"function"},{"inputs":[],"name":"__2test","outputs":[],"stateMutability":"pure","type":"function"}]`}, imports: ` - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" `, tester: ` if b, err := NewNumericMethodName(common.Address{}, nil); b == nil || err != nil { @@ -2128,7 +2128,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", "-x", "-require", "github.com/ethereum/go-ethereum@v0.0.0", "-replace", "github.com/ethereum/go-ethereum="+filepath.Join(pwd, "..", "..", "..")) // Repo root + replacer := exec.Command(gocmd, "mod", "edit", "-x", "-require", "github.com/paxosglobal/go-ethereum-arbitrum@v0.0.0", "-replace", "github.com/paxosglobal/go-ethereum-arbitrum="+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 95dc13cc18..122f307328 100644 --- a/accounts/abi/bind/template.go +++ b/accounts/abi/bind/template.go @@ -16,7 +16,7 @@ package bind -import "github.com/ethereum/go-ethereum/accounts/abi" +import "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" // tmplData is the data structure required to fill the binding template. type tmplData struct { @@ -91,12 +91,12 @@ import ( "strings" "errors" - ethereum "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + ethereum "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/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 b931fbb04d..d93da3d4d2 100644 --- a/accounts/abi/bind/util.go +++ b/accounts/abi/bind/util.go @@ -21,10 +21,10 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // 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 cce71d26e0..4c6d0693e7 100644 --- a/accounts/abi/bind/util_test.go +++ b/accounts/abi/bind/util_test.go @@ -23,13 +23,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethclient/simulated" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethclient/simulated" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") diff --git a/accounts/abi/error.go b/accounts/abi/error.go index 78b38a36ba..aa97a216e4 100644 --- a/accounts/abi/error.go +++ b/accounts/abi/error.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) type Error struct { diff --git a/accounts/abi/event.go b/accounts/abi/event.go index f9457b86af..1cfd069bd1 100644 --- a/accounts/abi/event.go +++ b/accounts/abi/event.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 fffe28ea63..8722980495 100644 --- a/accounts/abi/event_test.go +++ b/accounts/abi/event_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/accounts/abi/method.go b/accounts/abi/method.go index c5a1a71f47..548bc9a9f9 100644 --- a/accounts/abi/method.go +++ b/accounts/abi/method.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) // FunctionType represents different types of functions a contract might have. diff --git a/accounts/abi/pack.go b/accounts/abi/pack.go index beef1fa37f..5af6ad1645 100644 --- a/accounts/abi/pack.go +++ b/accounts/abi/pack.go @@ -22,8 +22,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 00bdae469e..5667f8fdfa 100644 --- a/accounts/abi/pack_test.go +++ b/accounts/abi/pack_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 eae3b0df20..8174f645fd 100644 --- a/accounts/abi/packing_test.go +++ b/accounts/abi/packing_test.go @@ -19,7 +19,7 @@ package abi import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) type packUnpackTest struct { diff --git a/accounts/abi/topics.go b/accounts/abi/topics.go index 7ce9b7273c..6381d1224d 100644 --- a/accounts/abi/topics.go +++ b/accounts/abi/topics.go @@ -23,9 +23,9 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/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 9e1efd3821..a4a76c9208 100644 --- a/accounts/abi/topics_test.go +++ b/accounts/abi/topics_test.go @@ -22,8 +22,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) func TestMakeTopics(t *testing.T) { diff --git a/accounts/abi/type.go b/accounts/abi/type.go index 2eee11787f..318dfcc99e 100644 --- a/accounts/abi/type.go +++ b/accounts/abi/type.go @@ -26,7 +26,7 @@ import ( "unicode" "unicode/utf8" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // Type enumerator diff --git a/accounts/abi/type_test.go b/accounts/abi/type_test.go index ae69872ad8..db04d6cfab 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" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 905b5ce629..326f2596f3 100644 --- a/accounts/abi/unpack.go +++ b/accounts/abi/unpack.go @@ -24,7 +24,7 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) var ( diff --git a/accounts/abi/unpack_test.go b/accounts/abi/unpack_test.go index 29891ec0a4..c9ec944217 100644 --- a/accounts/abi/unpack_test.go +++ b/accounts/abi/unpack_test.go @@ -27,7 +27,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" "github.com/stretchr/testify/require" ) diff --git a/accounts/accounts.go b/accounts/accounts.go index 6c351a9649..fa4f79db82 100644 --- a/accounts/accounts.go +++ b/accounts/accounts.go @@ -21,10 +21,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" "golang.org/x/crypto/sha3" ) diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 2c4138aa78..67fa7a7fd5 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) func TestTextHash(t *testing.T) { diff --git a/accounts/external/backend.go b/accounts/external/backend.go index 0b336448fc..2dd317bf73 100644 --- a/accounts/external/backend.go +++ b/accounts/external/backend.go @@ -22,15 +22,15 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" ) type ExternalBackend struct { diff --git a/accounts/keystore/account_cache.go b/accounts/keystore/account_cache.go index 4ed1439514..7c9f96ffd9 100644 --- a/accounts/keystore/account_cache.go +++ b/accounts/keystore/account_cache.go @@ -28,9 +28,9 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "golang.org/x/exp/slices" ) diff --git a/accounts/keystore/account_cache_test.go b/accounts/keystore/account_cache_test.go index 48a238048f..4df888a8d5 100644 --- a/accounts/keystore/account_cache_test.go +++ b/accounts/keystore/account_cache_test.go @@ -28,8 +28,8 @@ import ( "github.com/cespare/cp" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" "golang.org/x/exp/slices" ) diff --git a/accounts/keystore/file_cache.go b/accounts/keystore/file_cache.go index 63eb850374..7fee274bcc 100644 --- a/accounts/keystore/file_cache.go +++ b/accounts/keystore/file_cache.go @@ -24,7 +24,7 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // fileCache is a cache of files seen during scan of keystore. diff --git a/accounts/keystore/key.go b/accounts/keystore/key.go index 9b2ac14712..ec55c5a346 100644 --- a/accounts/keystore/key.go +++ b/accounts/keystore/key.go @@ -28,10 +28,10 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" "github.com/google/uuid" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) const ( diff --git a/accounts/keystore/keystore.go b/accounts/keystore/keystore.go index 0ffcf376a5..bb58f47039 100644 --- a/accounts/keystore/keystore.go +++ b/accounts/keystore/keystore.go @@ -32,11 +32,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" ) var ( diff --git a/accounts/keystore/keystore_test.go b/accounts/keystore/keystore_test.go index c9a23eddd6..a486dfd18c 100644 --- a/accounts/keystore/keystore_test.go +++ b/accounts/keystore/keystore_test.go @@ -26,10 +26,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" "golang.org/x/exp/slices" ) diff --git a/accounts/keystore/passphrase.go b/accounts/keystore/passphrase.go index e7a7f8d0cb..42b5ee0121 100644 --- a/accounts/keystore/passphrase.go +++ b/accounts/keystore/passphrase.go @@ -37,11 +37,11 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" "github.com/google/uuid" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/scrypt" ) @@ -120,7 +120,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er "This indicates that the keystore is corrupted. \n" + "The corrupted file is stored at \n%v\n" + "Please file a ticket at:\n\n" + - "https://github.com/ethereum/go-ethereum/issues." + + "https://github.com/paxosglobal/go-ethereum-arbitrum/issues." + "The error was : %s" //lint:ignore ST1005 This is a message for the user return fmt.Errorf(msg, tmpName, err) diff --git a/accounts/keystore/passphrase_test.go b/accounts/keystore/passphrase_test.go index 20ec0f5519..d6d507fce8 100644 --- a/accounts/keystore/passphrase_test.go +++ b/accounts/keystore/passphrase_test.go @@ -20,7 +20,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) const ( diff --git a/accounts/keystore/plain.go b/accounts/keystore/plain.go index f62a133ce1..39345d31ec 100644 --- a/accounts/keystore/plain.go +++ b/accounts/keystore/plain.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) type keyStorePlain struct { diff --git a/accounts/keystore/plain_test.go b/accounts/keystore/plain_test.go index 737eb7fd61..b8eaaf81e3 100644 --- a/accounts/keystore/plain_test.go +++ b/accounts/keystore/plain_test.go @@ -25,8 +25,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { diff --git a/accounts/keystore/presale.go b/accounts/keystore/presale.go index 0664dc2cdd..780c8a67a8 100644 --- a/accounts/keystore/presale.go +++ b/accounts/keystore/presale.go @@ -25,9 +25,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/crypto" "github.com/google/uuid" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "golang.org/x/crypto/pbkdf2" ) diff --git a/accounts/keystore/wallet.go b/accounts/keystore/wallet.go index 1066095f6d..7c85db48f5 100644 --- a/accounts/keystore/wallet.go +++ b/accounts/keystore/wallet.go @@ -19,10 +19,10 @@ package keystore import ( "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) // keystoreWallet implements the accounts.Wallet interface for the original diff --git a/accounts/keystore/watch.go b/accounts/keystore/watch.go index 1bef321cd1..c3c3fd090a 100644 --- a/accounts/keystore/watch.go +++ b/accounts/keystore/watch.go @@ -23,8 +23,8 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/log" "github.com/fsnotify/fsnotify" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) type watcher struct { diff --git a/accounts/manager.go b/accounts/manager.go index cbe4f7c79d..f1800496d0 100644 --- a/accounts/manager.go +++ b/accounts/manager.go @@ -21,8 +21,8 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/event" ) // managerSubBufferSize determines how many incoming wallet events diff --git a/accounts/scwallet/hub.go b/accounts/scwallet/hub.go index 5f1f369ca2..738e952f12 100644 --- a/accounts/scwallet/hub.go +++ b/accounts/scwallet/hub.go @@ -41,11 +41,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" pcsc "github.com/gballet/go-libpcsclite" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Scheme is the URI prefix for smartcard wallets. diff --git a/accounts/scwallet/securechannel.go b/accounts/scwallet/securechannel.go index bbd8b22647..cf5c3b9c30 100644 --- a/accounts/scwallet/securechannel.go +++ b/accounts/scwallet/securechannel.go @@ -27,8 +27,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/crypto" pcsc "github.com/gballet/go-libpcsclite" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "golang.org/x/crypto/pbkdf2" "golang.org/x/text/unicode/norm" ) diff --git a/accounts/scwallet/wallet.go b/accounts/scwallet/wallet.go index f0ca9085b6..283525f012 100644 --- a/accounts/scwallet/wallet.go +++ b/accounts/scwallet/wallet.go @@ -33,13 +33,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" pcsc "github.com/gballet/go-libpcsclite" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/status-im/keycard-go/derivationpath" ) diff --git a/accounts/usbwallet/hub.go b/accounts/usbwallet/hub.go index e67942dbc1..a1f25e96ff 100644 --- a/accounts/usbwallet/hub.go +++ b/accounts/usbwallet/hub.go @@ -23,10 +23,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" "github.com/karalabe/usb" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // LedgerScheme is the protocol scheme prefixing account and wallet URLs. diff --git a/accounts/usbwallet/ledger.go b/accounts/usbwallet/ledger.go index d0cb93e74e..a7af277066 100644 --- a/accounts/usbwallet/ledger.go +++ b/accounts/usbwallet/ledger.go @@ -28,13 +28,13 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // ledgerOpcode is an enumeration encoding the supported Ledger opcodes. diff --git a/accounts/usbwallet/trezor.go b/accounts/usbwallet/trezor.go index 9644dc4e02..ecd7c76c4c 100644 --- a/accounts/usbwallet/trezor.go +++ b/accounts/usbwallet/trezor.go @@ -27,13 +27,13 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/usbwallet/trezor" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" "github.com/golang/protobuf/proto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/usbwallet/trezor" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // ErrTrezorPINNeeded is returned if opening the trezor requires a PIN code. In diff --git a/accounts/usbwallet/wallet.go b/accounts/usbwallet/wallet.go index 69083dc893..8067d4268b 100644 --- a/accounts/usbwallet/wallet.go +++ b/accounts/usbwallet/wallet.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" "github.com/karalabe/usb" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Maximum time between wallet health checks to detect USB unplugs. diff --git a/arbitrum/apibackend.go b/arbitrum/apibackend.go index b3cf1d5b71..2b7098cac0 100644 --- a/arbitrum/apibackend.go +++ b/arbitrum/apibackend.go @@ -9,30 +9,30 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/arbitrum_types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/trie" - - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/arbitrum_types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) var ( diff --git a/arbitrum/arbos_interface.go b/arbitrum/arbos_interface.go index b1a4df4adc..2c0482d2e4 100644 --- a/arbitrum/arbos_interface.go +++ b/arbitrum/arbos_interface.go @@ -3,9 +3,9 @@ package arbitrum import ( "context" - "github.com/ethereum/go-ethereum/arbitrum_types" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/arbitrum_types" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) type ArbInterface interface { diff --git a/arbitrum/backend.go b/arbitrum/backend.go index e3f23ef71a..cf9353fbd9 100644 --- a/arbitrum/backend.go +++ b/arbitrum/backend.go @@ -3,18 +3,18 @@ package arbitrum import ( "context" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/arbitrum_types" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/shutdowncheck" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/arbitrum_types" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/shutdowncheck" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type Backend struct { diff --git a/arbitrum/bloom.go b/arbitrum/bloom.go index 7946911e3a..6fb18b9ae8 100644 --- a/arbitrum/bloom.go +++ b/arbitrum/bloom.go @@ -3,7 +3,7 @@ package arbitrum import ( "time" - "github.com/ethereum/go-ethereum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" ) const ( diff --git a/arbitrum/conditionaltx.go b/arbitrum/conditionaltx.go index e174bda9e6..d7db4d8f50 100644 --- a/arbitrum/conditionaltx.go +++ b/arbitrum/conditionaltx.go @@ -4,14 +4,14 @@ import ( "context" "errors" - "github.com/ethereum/go-ethereum/arbitrum_types" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/arbitrum_types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type ArbTransactionAPI struct { diff --git a/arbitrum/config.go b/arbitrum/config.go index 308cf9aee1..0eb3a3c6a8 100644 --- a/arbitrum/config.go +++ b/arbitrum/config.go @@ -3,8 +3,8 @@ package arbitrum import ( "time" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/params" flag "github.com/spf13/pflag" ) diff --git a/arbitrum/export.go b/arbitrum/export.go index 92d7d23f83..30b4dcd7de 100644 --- a/arbitrum/export.go +++ b/arbitrum/export.go @@ -3,10 +3,10 @@ package arbitrum import ( "context" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type TransactionArgs = ethapi.TransactionArgs diff --git a/arbitrum/recordingdb.go b/arbitrum/recordingdb.go index 43d17f5b05..a063f54b84 100644 --- a/arbitrum/recordingdb.go +++ b/arbitrum/recordingdb.go @@ -8,19 +8,19 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" flag "github.com/spf13/pflag" ) diff --git a/arbitrum/recreatestate.go b/arbitrum/recreatestate.go index bd16c9d3a9..60d84f6bf4 100644 --- a/arbitrum/recreatestate.go +++ b/arbitrum/recreatestate.go @@ -4,12 +4,12 @@ import ( "context" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" "github.com/pkg/errors" ) diff --git a/arbitrum_types/txoptions.go b/arbitrum_types/txoptions.go index b6b70897ee..c0f663d9e8 100644 --- a/arbitrum_types/txoptions.go +++ b/arbitrum_types/txoptions.go @@ -5,10 +5,10 @@ import ( "encoding/json" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/pkg/errors" ) diff --git a/beacon/engine/errors.go b/beacon/engine/errors.go index 62773a0ea9..aaaabb276b 100644 --- a/beacon/engine/errors.go +++ b/beacon/engine/errors.go @@ -17,8 +17,8 @@ package engine import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // EngineAPIError is a standardized error message between consensus and execution diff --git a/beacon/engine/gen_blockparams.go b/beacon/engine/gen_blockparams.go index b1f01b50ff..b1d969e261 100644 --- a/beacon/engine/gen_blockparams.go +++ b/beacon/engine/gen_blockparams.go @@ -6,9 +6,9 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var _ = (*payloadAttributesMarshaling)(nil) diff --git a/beacon/engine/gen_ed.go b/beacon/engine/gen_ed.go index 6893d64a16..c18b38012a 100644 --- a/beacon/engine/gen_ed.go +++ b/beacon/engine/gen_ed.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var _ = (*executableDataMarshaling)(nil) diff --git a/beacon/engine/gen_epe.go b/beacon/engine/gen_epe.go index e69f9a5951..46a74205f0 100644 --- a/beacon/engine/gen_epe.go +++ b/beacon/engine/gen_epe.go @@ -7,7 +7,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*executionPayloadEnvelopeMarshaling)(nil) diff --git a/beacon/engine/types.go b/beacon/engine/types.go index f72319ad50..2f964b26d3 100644 --- a/beacon/engine/types.go +++ b/beacon/engine/types.go @@ -20,10 +20,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // PayloadVersion denotes the version of PayloadAttributes used to request the diff --git a/beacon/light/canonical.go b/beacon/light/canonical.go index b5371493b4..67227142b4 100644 --- a/beacon/light/canonical.go +++ b/beacon/light/canonical.go @@ -20,10 +20,10 @@ import ( "encoding/binary" "fmt" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // canonicalStore stores instances of the given type in a database and caches diff --git a/beacon/light/committee_chain.go b/beacon/light/committee_chain.go index d707f8cc34..c7aa22c67b 100644 --- a/beacon/light/committee_chain.go +++ b/beacon/light/committee_chain.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/beacon/types" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/params" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) var ( diff --git a/beacon/light/committee_chain_test.go b/beacon/light/committee_chain_test.go index 60ea2a0efd..ca933e17e1 100644 --- a/beacon/light/committee_chain_test.go +++ b/beacon/light/committee_chain_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/beacon/types" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/params" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" ) var ( diff --git a/beacon/light/test_helpers.go b/beacon/light/test_helpers.go index f537d963a6..c223825e8d 100644 --- a/beacon/light/test_helpers.go +++ b/beacon/light/test_helpers.go @@ -21,10 +21,10 @@ import ( "crypto/sha256" mrand "math/rand" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/beacon/types" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/merkle" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/params" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func GenerateTestCommittee() *types.SerializedSyncCommittee { diff --git a/beacon/merkle/merkle.go b/beacon/merkle/merkle.go index 30896f9b01..4b5b1a451a 100644 --- a/beacon/merkle/merkle.go +++ b/beacon/merkle/merkle.go @@ -22,8 +22,8 @@ import ( "errors" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // Value represents either a 32 byte leaf value or hash node in a binary merkle tree/partial proof. diff --git a/beacon/types/committee.go b/beacon/types/committee.go index 5f89c27554..d94cf99b4e 100644 --- a/beacon/types/committee.go +++ b/beacon/types/committee.go @@ -22,9 +22,9 @@ import ( "fmt" "math/bits" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" bls "github.com/protolambda/bls12-381-util" ) diff --git a/beacon/types/config.go b/beacon/types/config.go index 8cb8808b6f..042e40006a 100644 --- a/beacon/types/config.go +++ b/beacon/types/config.go @@ -24,9 +24,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/merkle" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" "gopkg.in/yaml.v3" ) diff --git a/beacon/types/gen_header_json.go b/beacon/types/gen_header_json.go index 9b3ffea06f..da3c1fda15 100644 --- a/beacon/types/gen_header_json.go +++ b/beacon/types/gen_header_json.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) var _ = (*headerMarshaling)(nil) diff --git a/beacon/types/gen_syncaggregate_json.go b/beacon/types/gen_syncaggregate_json.go index 1547ec5f01..336b00cafe 100644 --- a/beacon/types/gen_syncaggregate_json.go +++ b/beacon/types/gen_syncaggregate_json.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*syncAggregateMarshaling)(nil) diff --git a/beacon/types/header.go b/beacon/types/header.go index 2ddc4575f1..3586d04bdb 100644 --- a/beacon/types/header.go +++ b/beacon/types/header.go @@ -21,9 +21,9 @@ import ( "crypto/sha256" "encoding/binary" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/merkle" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) //go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go diff --git a/beacon/types/light_sync.go b/beacon/types/light_sync.go index 3284081e4d..91af87c345 100644 --- a/beacon/types/light_sync.go +++ b/beacon/types/light_sync.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/beacon/merkle" - "github.com/ethereum/go-ethereum/beacon/params" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/merkle" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // BootstrapData contains a sync committee where light sync can be started, diff --git a/build/ci.go b/build/ci.go index 1ffbf3074d..7bf78c3faf 100644 --- a/build/ci.go +++ b/build/ci.go @@ -53,10 +53,10 @@ import ( "time" "github.com/cespare/cp" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/signify" - "github.com/ethereum/go-ethereum/internal/build" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/signify" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/build" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( @@ -245,8 +245,8 @@ func doInstall(cmdline []string) { func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (flags []string) { var ld []string if env.Commit != "" { - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitCommit="+env.Commit) - ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitDate="+env.Date) + ld = append(ld, "-X", "github.com/paxosglobal/go-ethereum-arbitrum/internal/version.gitCommit="+env.Commit) + ld = append(ld, "-X", "github.com/paxosglobal/go-ethereum-arbitrum/internal/version.gitDate="+env.Date) } // Strip DWARF on darwin. This used to be required for certain things, // and there is no downside to this, so we just keep doing it. diff --git a/build/deb/ethereum/deb.control b/build/deb/ethereum/deb.control index 3b759f2d04..e7b42d2984 100644 --- a/build/deb/ethereum/deb.control +++ b/build/deb/ethereum/deb.control @@ -5,8 +5,8 @@ Maintainer: {{.Author}} Build-Depends: debhelper (>= 8.0.0), {{.GoBootPackage}} Standards-Version: 3.9.5 Homepage: https://ethereum.org -Vcs-Git: https://github.com/ethereum/go-ethereum.git -Vcs-Browser: https://github.com/ethereum/go-ethereum +Vcs-Git: https://github.com/paxosglobal/go-ethereum-arbitrum.git +Vcs-Browser: https://github.com/paxosglobal/go-ethereum-arbitrum Package: {{.Name}} Architecture: any diff --git a/build/nsis.install.nsh b/build/nsis.install.nsh index 9b73148a44..62e79aef72 100644 --- a/build/nsis.install.nsh +++ b/build/nsis.install.nsh @@ -3,9 +3,9 @@ InstallDir "$InstDir" OutFile "${OUTPUTFILE}" # set through command line arguments # Links for "Add/Remove Programs" -!define HELPURL "https://github.com/ethereum/go-ethereum/issues" -!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" -!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" +!define HELPURL "https://github.com/paxosglobal/go-ethereum-arbitrum/issues" +!define UPDATEURL "https://github.com/paxosglobal/go-ethereum-arbitrum/releases" +!define ABOUTURL "https://github.com/paxosglobal/go-ethereum-arbitrum#ethereum-go" !define /date NOW "%Y%m%d" PageEx license diff --git a/build/update-license.go b/build/update-license.go index 70e2de06c7..4a6ae1490d 100644 --- a/build/update-license.go +++ b/build/update-license.go @@ -79,7 +79,7 @@ var ( "internal/reexec", // skip special licenses - "crypto/secp256k1", // Relicensed to BSD-3 via https://github.com/ethereum/go-ethereum/pull/17225 + "crypto/secp256k1", // Relicensed to BSD-3 via https://github.com/paxosglobal/go-ethereum-arbitrum/pull/17225 } // paths with this prefix are licensed as GPL. all other files are LGPL. diff --git a/cmd/abidump/main.go b/cmd/abidump/main.go index ae1ac64139..3d681f4e2f 100644 --- a/cmd/abidump/main.go +++ b/cmd/abidump/main.go @@ -23,8 +23,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/fourbyte" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/fourbyte" ) func init() { diff --git a/cmd/abigen/main.go b/cmd/abigen/main.go index 0149dec527..e73db82b66 100644 --- a/cmd/abigen/main.go +++ b/cmd/abigen/main.go @@ -24,12 +24,12 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common/compiler" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common/compiler" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/bootnode/main.go b/cmd/bootnode/main.go index 350b85df1e..cf2193e55b 100644 --- a/cmd/bootnode/main.go +++ b/cmd/bootnode/main.go @@ -25,13 +25,13 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/nat" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) func main() { diff --git a/cmd/clef/main.go b/cmd/clef/main.go index f9b00e4a12..ebfa44b5c8 100644 --- a/cmd/clef/main.go +++ b/cmd/clef/main.go @@ -35,27 +35,27 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/fourbyte" - "github.com/ethereum/go-ethereum/signer/rules" - "github.com/ethereum/go-ethereum/signer/storage" "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/fourbyte" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/rules" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/storage" "github.com/urfave/cli/v2" ) @@ -873,7 +873,7 @@ func checkFile(filename string) error { } // Check the unix permission bits // However, on windows, we cannot use the unix perm-bits, see - // https://github.com/ethereum/go-ethereum/issues/20123 + // https://github.com/paxosglobal/go-ethereum-arbitrum/issues/20123 if runtime.GOOS != "windows" && info.Mode().Perm()&0377 != 0 { return fmt.Errorf("file (%v) has insecure file permissions (%v)", filename, info.Mode().String()) } diff --git a/cmd/clef/run_test.go b/cmd/clef/run_test.go index 5fa6e02e14..295504f4c6 100644 --- a/cmd/clef/run_test.go +++ b/cmd/clef/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/cmdtest" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" ) const registeredName = "clef-test" diff --git a/cmd/clef/tutorial.md b/cmd/clef/tutorial.md index 3ea662b5d4..7347cf5641 100644 --- a/cmd/clef/tutorial.md +++ b/cmd/clef/tutorial.md @@ -100,9 +100,9 @@ or {"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"Request denied"}} ``` -Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/extapi_changelog.md). +Apart from listing accounts, you can also *request* creating a new account; signing transactions and data; and recovering signatures. You can find the available methods in the Clef [External API Spec](https://github.com/paxosglobal/go-ethereum-arbitrum/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/cmd/clef/extapi_changelog.md). -*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/ethereum/go-ethereum/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.* +*Note, the number of things you can do from the External API is deliberately small, since we want to limit the power of remote calls by as much as possible! Clef has an [Internal API](https://github.com/paxosglobal/go-ethereum-arbitrum/tree/master/cmd/clef#ui-api-1) too for the UI (User Interface) which is much richer and can support custom interfaces on top. But that's out of scope here.* ## Automatic rules @@ -288,7 +288,7 @@ t=2019-07-01T15:52:23+0300 lvl=info msg=SignData api=signer type=request meta t=2019-07-01T15:52:23+0300 lvl=info msg=SignData api=signer type=response data= error="Request denied" ``` -For more details on writing automatic rules, please see the [rules spec](https://github.com/ethereum/go-ethereum/blob/master/cmd/clef/rules.md). +For more details on writing automatic rules, please see the [rules spec](https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/cmd/clef/rules.md). ## Geth integration diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go index 4288a5feb8..a890af4756 100644 --- a/cmd/devp2p/crawl.go +++ b/cmd/devp2p/crawl.go @@ -22,8 +22,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) type crawler struct { diff --git a/cmd/devp2p/discv4cmd.go b/cmd/devp2p/discv4cmd.go index 45bcdcd367..b6dc8b14fe 100644 --- a/cmd/devp2p/discv4cmd.go +++ b/cmd/devp2p/discv4cmd.go @@ -24,13 +24,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/devp2p/internal/v4test" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/discv5cmd.go b/cmd/devp2p/discv5cmd.go index 0dac945269..1f5c916550 100644 --- a/cmd/devp2p/discv5cmd.go +++ b/cmd/devp2p/discv5cmd.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v5test" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p/discover" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/devp2p/internal/v5test" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/dns_cloudflare.go b/cmd/devp2p/dns_cloudflare.go index a3cc69cf19..872e5141fa 100644 --- a/cmd/devp2p/dns_cloudflare.go +++ b/cmd/devp2p/dns_cloudflare.go @@ -23,8 +23,8 @@ import ( "strings" "github.com/cloudflare/cloudflare-go" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/dnsdisc" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/dns_route53.go b/cmd/devp2p/dns_route53.go index 21a32f9414..a798605ab4 100644 --- a/cmd/devp2p/dns_route53.go +++ b/cmd/devp2p/dns_route53.go @@ -29,8 +29,8 @@ import ( "github.com/aws/aws-sdk-go-v2/credentials" "github.com/aws/aws-sdk-go-v2/service/route53" "github.com/aws/aws-sdk-go-v2/service/route53/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/dnsdisc" "github.com/urfave/cli/v2" "golang.org/x/exp/slices" ) diff --git a/cmd/devp2p/dnscmd.go b/cmd/devp2p/dnscmd.go index 0fce7b1030..559af7da01 100644 --- a/cmd/devp2p/dnscmd.go +++ b/cmd/devp2p/dnscmd.go @@ -25,11 +25,11 @@ import ( "path/filepath" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/dnsdisc" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/enrcmd.go b/cmd/devp2p/enrcmd.go index c5a97c8411..62d20ab1ed 100644 --- a/cmd/devp2p/enrcmd.go +++ b/cmd/devp2p/enrcmd.go @@ -28,9 +28,9 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/internal/ethtest/chain.go b/cmd/devp2p/internal/ethtest/chain.go index e8b3725b17..6123f3838f 100644 --- a/cmd/devp2p/internal/ethtest/chain.go +++ b/cmd/devp2p/internal/ethtest/chain.go @@ -30,16 +30,16 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/exp/slices" ) diff --git a/cmd/devp2p/internal/ethtest/chain_test.go b/cmd/devp2p/internal/ethtest/chain_test.go index 62bd6d26ea..55d10030f3 100644 --- a/cmd/devp2p/internal/ethtest/chain_test.go +++ b/cmd/devp2p/internal/ethtest/chain_test.go @@ -21,9 +21,9 @@ import ( "strconv" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" "github.com/stretchr/testify/assert" ) diff --git a/cmd/devp2p/internal/ethtest/conn.go b/cmd/devp2p/internal/ethtest/conn.go index ba3c0585fd..a58681b6d4 100644 --- a/cmd/devp2p/internal/ethtest/conn.go +++ b/cmd/devp2p/internal/ethtest/conn.go @@ -25,12 +25,12 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/rlpx" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/cmd/devp2p/internal/ethtest/engine.go b/cmd/devp2p/internal/ethtest/engine.go index ea4fc76e6f..1e481ca081 100644 --- a/cmd/devp2p/internal/ethtest/engine.go +++ b/cmd/devp2p/internal/ethtest/engine.go @@ -25,8 +25,8 @@ import ( "path" "time" - "github.com/ethereum/go-ethereum/common" "github.com/golang-jwt/jwt/v4" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // EngineClient is a wrapper around engine-related data. diff --git a/cmd/devp2p/internal/ethtest/protocol.go b/cmd/devp2p/internal/ethtest/protocol.go index f5f5f7e489..be9b1fb9ae 100644 --- a/cmd/devp2p/internal/ethtest/protocol.go +++ b/cmd/devp2p/internal/ethtest/protocol.go @@ -16,8 +16,8 @@ package ethtest import ( - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Unexported devp2p message codes from p2p/peer.go. diff --git a/cmd/devp2p/internal/ethtest/snap.go b/cmd/devp2p/internal/ethtest/snap.go index 64e0633585..fbc31a69b5 100644 --- a/cmd/devp2p/internal/ethtest/snap.go +++ b/cmd/devp2p/internal/ethtest/snap.go @@ -24,14 +24,14 @@ import ( "math/rand" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/utesting" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/cmd/devp2p/internal/ethtest/suite.go b/cmd/devp2p/internal/ethtest/suite.go index 9409d6f083..8368f408d7 100644 --- a/cmd/devp2p/internal/ethtest/suite.go +++ b/cmd/devp2p/internal/ethtest/suite.go @@ -21,16 +21,16 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/utesting" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // Suite represents a structure used to test a node's conformance diff --git a/cmd/devp2p/internal/ethtest/suite_test.go b/cmd/devp2p/internal/ethtest/suite_test.go index ad73bc9f90..ea61e5c978 100644 --- a/cmd/devp2p/internal/ethtest/suite_test.go +++ b/cmd/devp2p/internal/ethtest/suite_test.go @@ -24,14 +24,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/catalyst" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/utesting" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" ) func makeJWTSecret() (string, [32]byte, error) { diff --git a/cmd/devp2p/internal/ethtest/transaction.go b/cmd/devp2p/internal/ethtest/transaction.go index acf93a041e..7bf7c4091a 100644 --- a/cmd/devp2p/internal/ethtest/transaction.go +++ b/cmd/devp2p/internal/ethtest/transaction.go @@ -22,9 +22,9 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" ) // sendTxs sends the given transactions to the node and diff --git a/cmd/devp2p/internal/v4test/discv4tests.go b/cmd/devp2p/internal/v4test/discv4tests.go index ca556851b4..f7e72481bf 100644 --- a/cmd/devp2p/internal/v4test/discv4tests.go +++ b/cmd/devp2p/internal/v4test/discv4tests.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/utesting" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v4wire" ) const ( diff --git a/cmd/devp2p/internal/v4test/framework.go b/cmd/devp2p/internal/v4test/framework.go index 9286594181..990634c139 100644 --- a/cmd/devp2p/internal/v4test/framework.go +++ b/cmd/devp2p/internal/v4test/framework.go @@ -22,9 +22,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v4wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) const waitTime = 300 * time.Millisecond diff --git a/cmd/devp2p/internal/v5test/discv5tests.go b/cmd/devp2p/internal/v5test/discv5tests.go index 56624a0ca8..ea7daa1217 100644 --- a/cmd/devp2p/internal/v5test/discv5tests.go +++ b/cmd/devp2p/internal/v5test/discv5tests.go @@ -22,10 +22,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/utesting" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v5wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) // Suite is the discv5 test suite. diff --git a/cmd/devp2p/internal/v5test/framework.go b/cmd/devp2p/internal/v5test/framework.go index 10856a50bc..aec9f0d3bf 100644 --- a/cmd/devp2p/internal/v5test/framework.go +++ b/cmd/devp2p/internal/v5test/framework.go @@ -24,11 +24,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v5wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) // readError represents an error during packet reading. diff --git a/cmd/devp2p/keycmd.go b/cmd/devp2p/keycmd.go index 98d7bd76ae..9f617090e5 100644 --- a/cmd/devp2p/keycmd.go +++ b/cmd/devp2p/keycmd.go @@ -21,9 +21,9 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/main.go b/cmd/devp2p/main.go index 8461a8b9b5..ad9702c726 100644 --- a/cmd/devp2p/main.go +++ b/cmd/devp2p/main.go @@ -20,9 +20,9 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/debug" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/nodeset.go b/cmd/devp2p/nodeset.go index 7360dc5bcf..83ae1ad889 100644 --- a/cmd/devp2p/nodeset.go +++ b/cmd/devp2p/nodeset.go @@ -23,8 +23,8 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" "golang.org/x/exp/slices" ) diff --git a/cmd/devp2p/nodesetcmd.go b/cmd/devp2p/nodesetcmd.go index 6fbc185ad8..920ef4c3e7 100644 --- a/cmd/devp2p/nodesetcmd.go +++ b/cmd/devp2p/nodesetcmd.go @@ -25,11 +25,11 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/rlpxcmd.go b/cmd/devp2p/rlpxcmd.go index aa7d065818..3547ec3647 100644 --- a/cmd/devp2p/rlpxcmd.go +++ b/cmd/devp2p/rlpxcmd.go @@ -21,12 +21,12 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/ethtest" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/devp2p/internal/ethtest" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/rlpx" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/devp2p/runtest.go b/cmd/devp2p/runtest.go index 7e3723c641..eea4d7ee7f 100644 --- a/cmd/devp2p/runtest.go +++ b/cmd/devp2p/runtest.go @@ -19,10 +19,10 @@ package main import ( "os" - "github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/internal/utesting" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/devp2p/internal/v4test" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/utesting" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/era/main.go b/cmd/era/main.go index e27d8ccec6..8849394d11 100644 --- a/cmd/era/main.go +++ b/cmd/era/main.go @@ -26,13 +26,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/era" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/era" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/changepassword.go b/cmd/ethkey/changepassword.go index 4298e2b834..f583e59c66 100644 --- a/cmd/ethkey/changepassword.go +++ b/cmd/ethkey/changepassword.go @@ -21,8 +21,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/generate.go b/cmd/ethkey/generate.go index 60d8b3c779..fa03cd8e3a 100644 --- a/cmd/ethkey/generate.go +++ b/cmd/ethkey/generate.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" "github.com/google/uuid" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/inspect.go b/cmd/ethkey/inspect.go index 29b1c13e85..62b03f9b87 100644 --- a/cmd/ethkey/inspect.go +++ b/cmd/ethkey/inspect.go @@ -21,9 +21,9 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/main.go b/cmd/ethkey/main.go index 25c0d104f6..d66388deae 100644 --- a/cmd/ethkey/main.go +++ b/cmd/ethkey/main.go @@ -20,7 +20,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/message.go b/cmd/ethkey/message.go index 6b8dec03cd..d53724d732 100644 --- a/cmd/ethkey/message.go +++ b/cmd/ethkey/message.go @@ -21,11 +21,11 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" "github.com/urfave/cli/v2" ) diff --git a/cmd/ethkey/run_test.go b/cmd/ethkey/run_test.go index 73506e5da1..54dc9d1cd3 100644 --- a/cmd/ethkey/run_test.go +++ b/cmd/ethkey/run_test.go @@ -21,8 +21,8 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/cmdtest" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" ) type testEthkey struct { diff --git a/cmd/ethkey/utils.go b/cmd/ethkey/utils.go index 2821145089..9f120a3695 100644 --- a/cmd/ethkey/utils.go +++ b/cmd/ethkey/utils.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/blockrunner.go b/cmd/evm/blockrunner.go index c5d836e0ea..225a7274d8 100644 --- a/cmd/evm/blockrunner.go +++ b/cmd/evm/blockrunner.go @@ -24,11 +24,11 @@ import ( "regexp" "sort" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/compiler.go b/cmd/evm/compiler.go index c071834b59..2efebaae81 100644 --- a/cmd/evm/compiler.go +++ b/cmd/evm/compiler.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/evm/internal/compiler" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/disasm.go b/cmd/evm/disasm.go index b1f35cbaf5..e97dda0685 100644 --- a/cmd/evm/disasm.go +++ b/cmd/evm/disasm.go @@ -22,7 +22,7 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/paxosglobal/go-ethereum-arbitrum/core/asm" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/compiler/compiler.go b/cmd/evm/internal/compiler/compiler.go index 54981b6697..15d510492c 100644 --- a/cmd/evm/internal/compiler/compiler.go +++ b/cmd/evm/internal/compiler/compiler.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/asm" + "github.com/paxosglobal/go-ethereum-arbitrum/core/asm" ) func Compile(fn string, src []byte, debug bool) (string, error) { diff --git a/cmd/evm/internal/t8ntool/block.go b/cmd/evm/internal/t8ntool/block.go index a2dc473437..de278aa306 100644 --- a/cmd/evm/internal/t8ntool/block.go +++ b/cmd/evm/internal/t8ntool/block.go @@ -24,13 +24,13 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index 59296c0e1c..625e29d3e4 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -20,23 +20,23 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/crypto/sha3" ) diff --git a/cmd/evm/internal/t8ntool/flags.go b/cmd/evm/internal/t8ntool/flags.go index c2eca8cc21..a5244217e5 100644 --- a/cmd/evm/internal/t8ntool/flags.go +++ b/cmd/evm/internal/t8ntool/flags.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/gen_header.go b/cmd/evm/internal/t8ntool/gen_header.go index a8c8668978..44df513b62 100644 --- a/cmd/evm/internal/t8ntool/gen_header.go +++ b/cmd/evm/internal/t8ntool/gen_header.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var _ = (*headerMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/gen_stenv.go b/cmd/evm/internal/t8ntool/gen_stenv.go index d47db4a876..f625593378 100644 --- a/cmd/evm/internal/t8ntool/gen_stenv.go +++ b/cmd/evm/internal/t8ntool/gen_stenv.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var _ = (*stEnvMarshaling)(nil) diff --git a/cmd/evm/internal/t8ntool/tracewriter.go b/cmd/evm/internal/t8ntool/tracewriter.go index 0dffe14b86..eca7c65e88 100644 --- a/cmd/evm/internal/t8ntool/tracewriter.go +++ b/cmd/evm/internal/t8ntool/tracewriter.go @@ -21,10 +21,10 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // traceWriter is an vm.EVMLogger which also holds an inner logger/tracer. diff --git a/cmd/evm/internal/t8ntool/transaction.go b/cmd/evm/internal/t8ntool/transaction.go index 6ba815f150..de6d5368fe 100644 --- a/cmd/evm/internal/t8ntool/transaction.go +++ b/cmd/evm/internal/t8ntool/transaction.go @@ -24,13 +24,13 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go index 94496919f9..e37d66ffc1 100644 --- a/cmd/evm/internal/t8ntool/transition.go +++ b/cmd/evm/internal/t8ntool/transition.go @@ -24,18 +24,18 @@ import ( "os" "path" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/internal/t8ntool/tx_iterator.go b/cmd/evm/internal/t8ntool/tx_iterator.go index 8f28dc7022..0991203896 100644 --- a/cmd/evm/internal/t8ntool/tx_iterator.go +++ b/cmd/evm/internal/t8ntool/tx_iterator.go @@ -25,12 +25,12 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // txWithKey is a helper-struct, to allow us to use the types.Transaction along with diff --git a/cmd/evm/main.go b/cmd/evm/main.go index c3e6a4af91..1128642f27 100644 --- a/cmd/evm/main.go +++ b/cmd/evm/main.go @@ -22,14 +22,14 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/evm/internal/t8ntool" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/debug" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" "github.com/urfave/cli/v2" // Force-load the tracer engines to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" - _ "github.com/ethereum/go-ethereum/eth/tracers/native" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/js" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/native" ) var ( diff --git a/cmd/evm/runner.go b/cmd/evm/runner.go index f3ffb3ed9f..97e2cb60a0 100644 --- a/cmd/evm/runner.go +++ b/cmd/evm/runner.go @@ -27,19 +27,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/cmd/evm/internal/compiler" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/core/vm/runtime" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/evm/internal/compiler" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm/runtime" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/staterunner.go b/cmd/evm/staterunner.go index 6e751b630f..cafa0b666d 100644 --- a/cmd/evm/staterunner.go +++ b/cmd/evm/staterunner.go @@ -22,13 +22,13 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" "github.com/urfave/cli/v2" ) diff --git a/cmd/evm/t8n_test.go b/cmd/evm/t8n_test.go index ad36540de5..c7a8edd77c 100644 --- a/cmd/evm/t8n_test.go +++ b/cmd/evm/t8n_test.go @@ -24,9 +24,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/cmd/evm/internal/t8ntool" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/evm/internal/t8ntool" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/cmdtest" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" ) func TestMain(m *testing.M) { diff --git a/cmd/evm/testdata/30/README.txt b/cmd/evm/testdata/30/README.txt index 84c92de853..b6e9abb43c 100644 --- a/cmd/evm/testdata/30/README.txt +++ b/cmd/evm/testdata/30/README.txt @@ -1,4 +1,4 @@ -This example comes from https://github.com/ethereum/go-ethereum/issues/27730. +This example comes from https://github.com/paxosglobal/go-ethereum-arbitrum/issues/27730. The input transactions contain three transactions, number `0` and `2` are taken from `testdata/13`, whereas number `1` is taken from #27730. diff --git a/cmd/geth/accountcmd.go b/cmd/geth/accountcmd.go index cc22684e0b..a5263dfdc2 100644 --- a/cmd/geth/accountcmd.go +++ b/cmd/geth/accountcmd.go @@ -20,11 +20,11 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/accountcmd_test.go b/cmd/geth/accountcmd_test.go index ea3a7c3b64..8f1d1f429f 100644 --- a/cmd/geth/accountcmd_test.go +++ b/cmd/geth/accountcmd_test.go @@ -249,7 +249,7 @@ Fatal: Failed to unlock account f466859ead1932d743d622cb74fc058882e8648a (could `) } -// https://github.com/ethereum/go-ethereum/issues/1785 +// https://github.com/paxosglobal/go-ethereum-arbitrum/issues/1785 func TestUnlockFlagMultiIndex(t *testing.T) { t.Parallel() geth := runMinimalGeth(t, "--port", "0", "--ipcdisable", "--datadir", tmpDatadirWithKeystore(t), diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index d333c17559..87074ea94c 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -26,21 +26,21 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/era" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/era" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/config.go b/cmd/geth/config.go index 5f52f1df54..d9018a47db 100644 --- a/cmd/geth/config.go +++ b/cmd/geth/config.go @@ -26,24 +26,24 @@ import ( "strings" "unicode" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/external" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" "github.com/naoina/toml" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/external" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/scwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/usbwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/catalyst" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/version" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/consolecmd.go b/cmd/geth/consolecmd.go index 526ede9619..0533436c20 100644 --- a/cmd/geth/consolecmd.go +++ b/cmd/geth/consolecmd.go @@ -20,9 +20,9 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/console" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/console" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/consolecmd_test.go b/cmd/geth/consolecmd_test.go index 0749cea3be..0d971616b0 100644 --- a/cmd/geth/consolecmd_test.go +++ b/cmd/geth/consolecmd_test.go @@ -26,8 +26,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/version" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) const ( diff --git a/cmd/geth/dbcmd.go b/cmd/geth/dbcmd.go index 1d885bd58d..6b0396f730 100644 --- a/cmd/geth/dbcmd.go +++ b/cmd/geth/dbcmd.go @@ -27,18 +27,18 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie" "github.com/olekukonko/tablewriter" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/exportcmd_test.go b/cmd/geth/exportcmd_test.go index 9570b1ffd2..25f00df1aa 100644 --- a/cmd/geth/exportcmd_test.go +++ b/cmd/geth/exportcmd_test.go @@ -22,7 +22,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // TestExport does a basic test of "geth export", exporting the test-genesis. diff --git a/cmd/geth/logging_test.go b/cmd/geth/logging_test.go index e56c679dae..d5419c1f6a 100644 --- a/cmd/geth/logging_test.go +++ b/cmd/geth/logging_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" ) func runSelf(args ...string) ([]byte, error) { diff --git a/cmd/geth/logtestcmd_active.go b/cmd/geth/logtestcmd_active.go index f2a2c5ded5..319d8c6eaf 100644 --- a/cmd/geth/logtestcmd_active.go +++ b/cmd/geth/logtestcmd_active.go @@ -25,9 +25,9 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 2f7d37fdd7..d7edb9ab7b 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -25,25 +25,25 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/ethclient" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/debug" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/node" "go.uber.org/automaxprocs/maxprocs" // Force-load the tracer engines to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" - _ "github.com/ethereum/go-ethereum/eth/tracers/native" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/js" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/native" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/misccmd.go b/cmd/geth/misccmd.go index f3530c30fb..48c1a9184b 100644 --- a/cmd/geth/misccmd.go +++ b/cmd/geth/misccmd.go @@ -22,8 +22,8 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/version" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/run_test.go b/cmd/geth/run_test.go index 1d32880325..2f4a576441 100644 --- a/cmd/geth/run_test.go +++ b/cmd/geth/run_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/cmdtest" - "github.com/ethereum/go-ethereum/internal/reexec" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/cmdtest" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type testgeth struct { diff --git a/cmd/geth/snapshot.go b/cmd/geth/snapshot.go index cb7a918ff9..1712e1f33d 100644 --- a/cmd/geth/snapshot.go +++ b/cmd/geth/snapshot.go @@ -24,18 +24,18 @@ import ( "os" "time" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/pruner" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/pruner" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" cli "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/testdata/vcheck/data.json b/cmd/geth/testdata/vcheck/data.json index e7ee2bf7e4..a22f4ed379 100644 --- a/cmd/geth/testdata/vcheck/data.json +++ b/cmd/geth/testdata/vcheck/data.json @@ -5,9 +5,9 @@ "summary": "Mining nodes will generate erroneous PoW on epochs > `385`.", "description": "A mining flaw could cause miners to erroneously calculate PoW, due to an index overflow, if DAG size is exceeding the maximum 32 bit unsigned value.\n\nThis occurred on the ETC chain on 2020-11-06. This is likely to trigger for ETH mainnet around block `11550000`/epoch `385`, slated to occur early January 2021.\n\nThis issue is relevant only for miners, non-mining nodes are unaffected, since non-mining nodes use a smaller verification cache instead of a full DAG.", "links": [ - "https://github.com/ethereum/go-ethereum/pull/21793", + "https://github.com/paxosglobal/go-ethereum-arbitrum/pull/21793", "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/commit/567d41d9363706b4b13ce0903804e8acf214af49" + "https://github.com/paxosglobal/go-ethereum-arbitrum/commit/567d41d9363706b4b13ce0903804e8acf214af49" ], "introduced": "v1.6.0", "fixed": "v1.9.24", diff --git a/cmd/geth/testdata/vcheck/vulnerabilities.json b/cmd/geth/testdata/vcheck/vulnerabilities.json index bee0e66dd8..60ca549c1c 100644 --- a/cmd/geth/testdata/vcheck/vulnerabilities.json +++ b/cmd/geth/testdata/vcheck/vulnerabilities.json @@ -5,10 +5,10 @@ "summary": "Mining nodes will generate erroneous PoW on epochs > `385`.", "description": "A mining flaw could cause miners to erroneously calculate PoW, due to an index overflow, if DAG size is exceeding the maximum 32 bit unsigned value.\n\nThis occurred on the ETC chain on 2020-11-06. This is likely to trigger for ETH mainnet around block `11550000`/epoch `385`, slated to occur early January 2021.\n\nThis issue is relevant only for miners, non-mining nodes are unaffected, since non-mining nodes use a smaller verification cache instead of a full DAG.", "links": [ - "https://github.com/ethereum/go-ethereum/pull/21793", + "https://github.com/paxosglobal/go-ethereum-arbitrum/pull/21793", "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/commit/567d41d9363706b4b13ce0903804e8acf214af49", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-v592-xf75-856p" + "https://github.com/paxosglobal/go-ethereum-arbitrum/commit/567d41d9363706b4b13ce0903804e8acf214af49", + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-v592-xf75-856p" ], "introduced": "v1.6.0", "fixed": "v1.9.24", @@ -26,7 +26,7 @@ "https://blog.ethereum.org/2020/11/12/geth_security_release/", "https://groups.google.com/g/golang-announce/c/NpBGTTmKzpM", "https://github.com/golang/go/issues/42552", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-m6gx-rhvj-fh52" + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-m6gx-rhvj-fh52" ], "introduced": "v0.0.0", "fixed": "v1.9.24", @@ -42,7 +42,7 @@ "description": "Geth erroneously performed a 'shallow' copy when the precompiled `datacopy` (at `0x00...04`) was invoked. An attacker could deploy a contract that uses the shallow copy to corrupt the contents of the `RETURNDATA`, thus causing a consensus failure.", "links": [ "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-69v6-xc2j-r2jf" + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-69v6-xc2j-r2jf" ], "introduced": "v1.9.7", "fixed": "v1.9.17", @@ -55,13 +55,13 @@ "name": "Geth DoS via MULMOD", "uid": "GETH-2020-04", "summary": "A denial-of-service issue can be used to crash Geth nodes during block processing", - "description": "Affected versions suffer from a vulnerability which can be exploited through the `MULMOD` operation, by specifying a modulo of `0`: `mulmod(a,b,0)`, causing a `panic` in the underlying library. \nThe crash was in the `uint256` library, where a buffer [underflowed](https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L442).\n\n\tif `d == 0`, `dLen` remains `0`\n\nand https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L451 will try to access index `[-1]`.\n\nThe `uint256` library was first merged in this [commit](https://github.com/ethereum/go-ethereum/commit/cf6674539c589f80031f3371a71c6a80addbe454), on 2020-06-08. \nExploiting this vulnerabilty would cause all vulnerable nodes to drop off the network. \n\nThe issue was brought to our attention through a [bug report](https://github.com/ethereum/go-ethereum/issues/21367), showing a `panic` occurring on sync from genesis on the Ropsten network.\n \nIt was estimated that the least obvious way to fix this would be to merge the fix into `uint256`, make a new release of that library and then update the geth-dependency.\n", + "description": "Affected versions suffer from a vulnerability which can be exploited through the `MULMOD` operation, by specifying a modulo of `0`: `mulmod(a,b,0)`, causing a `panic` in the underlying library. \nThe crash was in the `uint256` library, where a buffer [underflowed](https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L442).\n\n\tif `d == 0`, `dLen` remains `0`\n\nand https://github.com/holiman/uint256/blob/4ce82e695c10ddad57215bdbeafb68b8c5df2c30/uint256.go#L451 will try to access index `[-1]`.\n\nThe `uint256` library was first merged in this [commit](https://github.com/paxosglobal/go-ethereum-arbitrum/commit/cf6674539c589f80031f3371a71c6a80addbe454), on 2020-06-08. \nExploiting this vulnerabilty would cause all vulnerable nodes to drop off the network. \n\nThe issue was brought to our attention through a [bug report](https://github.com/paxosglobal/go-ethereum-arbitrum/issues/21367), showing a `panic` occurring on sync from genesis on the Ropsten network.\n \nIt was estimated that the least obvious way to fix this would be to merge the fix into `uint256`, make a new release of that library and then update the geth-dependency.\n", "links": [ "https://blog.ethereum.org/2020/11/12/geth_security_release/", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-jm5c-rv3w-w83m", + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-jm5c-rv3w-w83m", "https://github.com/holiman/uint256/releases/tag/v1.1.1", "https://github.com/holiman/uint256/pull/80", - "https://github.com/ethereum/go-ethereum/pull/21368" + "https://github.com/paxosglobal/go-ethereum-arbitrum/pull/21368" ], "introduced": "v1.9.16", "fixed": "v1.9.18", @@ -76,8 +76,8 @@ "summary": "A DoS vulnerability can make a LES server crash.", "description": "A DoS vulnerability can make a LES server crash via malicious GetProofsV2 request from a connected LES client.\n\nThe vulnerability was patched in #21896.\n\nThis vulnerability only concern users explicitly running geth as a light server", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-r33q-22hv-j29q", - "https://github.com/ethereum/go-ethereum/pull/21896" + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-r33q-22hv-j29q", + "https://github.com/paxosglobal/go-ethereum-arbitrum/pull/21896" ], "introduced": "v1.8.0", "fixed": "v1.9.25", @@ -92,9 +92,9 @@ "introduced": "v1.9.4", "fixed": "v1.9.20", "summary": "A consensus-vulnerability in Geth could cause a chain split, where vulnerable versions refuse to accept the canonical chain.", - "description": "A flaw was repoted at 2020-08-11 by John Youngseok Yang (Software Platform Lab), where a particular sequence of transactions could cause a consensus failure.\n\n- Tx 1:\n - `sender` invokes `caller`.\n - `caller` invokes `0xaa`. `0xaa` has 3 wei, does a self-destruct-to-self\n - `caller` does a `1 wei` -call to `0xaa`, who thereby has 1 wei (the code in `0xaa` still executed, since the tx is still ongoing, but doesn't redo the selfdestruct, it takes a different path if callvalue is non-zero)\n\n-Tx 2:\n - `sender` does a 5-wei call to 0xaa. No exec (since no code). \n\nIn geth, the result would be that `0xaa` had `6 wei`, whereas OE reported (correctly) `5` wei. Furthermore, in geth, if the second tx was not executed, the `0xaa` would be destructed, resulting in `0 wei`. Thus obviously wrong. \n\nIt was determined that the root cause was this [commit](https://github.com/ethereum/go-ethereum/commit/223b950944f494a5b4e0957fd9f92c48b09037ad) from [this PR](https://github.com/ethereum/go-ethereum/pull/19953). The semantics of `createObject` was subtly changd, into returning a non-nil object (with `deleted=true`) where it previously did not if the account had been destructed. This return value caused the new object to inherit the old `balance`.\n", + "description": "A flaw was repoted at 2020-08-11 by John Youngseok Yang (Software Platform Lab), where a particular sequence of transactions could cause a consensus failure.\n\n- Tx 1:\n - `sender` invokes `caller`.\n - `caller` invokes `0xaa`. `0xaa` has 3 wei, does a self-destruct-to-self\n - `caller` does a `1 wei` -call to `0xaa`, who thereby has 1 wei (the code in `0xaa` still executed, since the tx is still ongoing, but doesn't redo the selfdestruct, it takes a different path if callvalue is non-zero)\n\n-Tx 2:\n - `sender` does a 5-wei call to 0xaa. No exec (since no code). \n\nIn geth, the result would be that `0xaa` had `6 wei`, whereas OE reported (correctly) `5` wei. Furthermore, in geth, if the second tx was not executed, the `0xaa` would be destructed, resulting in `0 wei`. Thus obviously wrong. \n\nIt was determined that the root cause was this [commit](https://github.com/paxosglobal/go-ethereum-arbitrum/commit/223b950944f494a5b4e0957fd9f92c48b09037ad) from [this PR](https://github.com/paxosglobal/go-ethereum-arbitrum/pull/19953). The semantics of `createObject` was subtly changd, into returning a non-nil object (with `deleted=true`) where it previously did not if the account had been destructed. This return value caused the new object to inherit the old `balance`.\n", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-xw37-57qp-9mm4" + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-xw37-57qp-9mm4" ], "published": "2020-12-10", "severity": "High", @@ -122,9 +122,9 @@ "summary": "A consensus-flaw in the Geth EVM could cause a node to deviate from the canonical chain.", "description": "A memory-corruption bug within the EVM can cause a consensus error, where vulnerable nodes obtain a different `stateRoot` when processing a maliciously crafted transaction. This, in turn, would lead to the chain being split: mainnet splitting in two forks.\n\nAll Geth versions supporting the London hard fork are vulnerable (the bug is older than London), so all users should update.\n\nThis bug was exploited on Mainnet at block 13107518.\n\nCredits for the discovery go to @guidovranken (working for Sentnl during an audit of the Telos EVM) and reported via bounty@ethereum.org.", "links": [ - "https://github.com/ethereum/go-ethereum/blob/master/docs/postmortems/2021-08-22-split-postmortem.md", - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-9856-9gg9-qcmq", - "https://github.com/ethereum/go-ethereum/releases/tag/v1.10.8" + "https://github.com/paxosglobal/go-ethereum-arbitrum/blob/master/docs/postmortems/2021-08-22-split-postmortem.md", + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-9856-9gg9-qcmq", + "https://github.com/paxosglobal/go-ethereum-arbitrum/releases/tag/v1.10.8" ], "introduced": "v1.10.0", "fixed": "v1.10.8", @@ -137,11 +137,11 @@ "name": "DoS via malicious `snap/1` request", "uid": "GETH-2021-03", "summary": "A vulnerable node is susceptible to crash when processing a maliciously crafted message from a peer, via the snap/1 protocol. The crash can be triggered by sending a malicious snap/1 GetTrieNodes package.", - "description": "The `snap/1` protocol handler contains two vulnerabilities related to the `GetTrieNodes` packet, which can be exploited to crash the node. Full details are available at the Github security [advisory](https://github.com/ethereum/go-ethereum/security/advisories/GHSA-59hh-656j-3p7v)", + "description": "The `snap/1` protocol handler contains two vulnerabilities related to the `GetTrieNodes` packet, which can be exploited to crash the node. Full details are available at the Github security [advisory](https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-59hh-656j-3p7v)", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-59hh-656j-3p7v", + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-59hh-656j-3p7v", "https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities", - "https://github.com/ethereum/go-ethereum/pull/23657" + "https://github.com/paxosglobal/go-ethereum-arbitrum/pull/23657" ], "introduced": "v1.10.0", "fixed": "v1.10.9", @@ -154,11 +154,11 @@ "name": "DoS via malicious p2p message", "uid": "GETH-2022-01", "summary": "A vulnerable node can crash via p2p messages sent from an attacker node, if running with non-default log options.", - "description": "A vulnerable node, if configured to use high verbosity logging, can be made to crash when handling specially crafted p2p messages sent from an attacker node. Full details are available at the Github security [advisory](https://github.com/ethereum/go-ethereum/security/advisories/GHSA-wjxw-gh3m-7pm5)", + "description": "A vulnerable node, if configured to use high verbosity logging, can be made to crash when handling specially crafted p2p messages sent from an attacker node. Full details are available at the Github security [advisory](https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-wjxw-gh3m-7pm5)", "links": [ - "https://github.com/ethereum/go-ethereum/security/advisories/GHSA-wjxw-gh3m-7pm5", + "https://github.com/paxosglobal/go-ethereum-arbitrum/security/advisories/GHSA-wjxw-gh3m-7pm5", "https://geth.ethereum.org/docs/vulnerabilities/vulnerabilities", - "https://github.com/ethereum/go-ethereum/pull/24507" + "https://github.com/paxosglobal/go-ethereum-arbitrum/pull/24507" ], "introduced": "v1.10.0", "fixed": "v1.10.17", diff --git a/cmd/geth/verkle.go b/cmd/geth/verkle.go index 420b063d8b..c0a24ef5a5 100644 --- a/cmd/geth/verkle.go +++ b/cmd/geth/verkle.go @@ -23,12 +23,12 @@ import ( "fmt" "os" - "github.com/ethereum/go-ethereum/cmd/utils" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" "github.com/gballet/go-verkle" + "github.com/paxosglobal/go-ethereum-arbitrum/cmd/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" cli "github.com/urfave/cli/v2" ) diff --git a/cmd/geth/version_check.go b/cmd/geth/version_check.go index 237556788e..aa529315cb 100644 --- a/cmd/geth/version_check.go +++ b/cmd/geth/version_check.go @@ -26,8 +26,8 @@ import ( "regexp" "strings" - "github.com/ethereum/go-ethereum/log" "github.com/jedisct1/go-minisign" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/urfave/cli/v2" ) diff --git a/cmd/p2psim/main.go b/cmd/p2psim/main.go index a0f5f0d288..9e82ae9255 100644 --- a/cmd/p2psim/main.go +++ b/cmd/p2psim/main.go @@ -44,13 +44,13 @@ import ( "strings" "text/tabwriter" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/urfave/cli/v2" ) diff --git a/cmd/rlpdump/main.go b/cmd/rlpdump/main.go index 7e1d314d49..4e4ba2134a 100644 --- a/cmd/rlpdump/main.go +++ b/cmd/rlpdump/main.go @@ -30,8 +30,8 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/cmd/rlpdump/rlpdump_test.go b/cmd/rlpdump/rlpdump_test.go index 4b0ae680ac..9abd5875e1 100644 --- a/cmd/rlpdump/rlpdump_test.go +++ b/cmd/rlpdump/rlpdump_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) func TestRoundtrip(t *testing.T) { diff --git a/cmd/utils/cmd.go b/cmd/utils/cmd.go index 4b57164665..c2010308fc 100644 --- a/cmd/utils/cmd.go +++ b/cmd/utils/cmd.go @@ -33,20 +33,20 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/internal/era" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/debug" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/era" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/urfave/cli/v2" ) diff --git a/cmd/utils/export_test.go b/cmd/utils/export_test.go index 84ba8d0c31..8c08a2d865 100644 --- a/cmd/utils/export_test.go +++ b/cmd/utils/export_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // TestExport does basic sanity checks on the export/import functionality diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index a4b5b24ae3..9b2df8a3b7 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -34,45 +34,45 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/remotedb" - "github.com/ethereum/go-ethereum/ethstats" - "github.com/ethereum/go-ethereum/graphql" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" - "github.com/ethereum/go-ethereum/metrics/influxdb" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" pcsclite "github.com/gballet/go-libpcsclite" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/fdlimit" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/catalyst" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasprice" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/remotedb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethstats" + "github.com/paxosglobal/go-ethereum-arbitrum/graphql" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics/exp" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics/influxdb" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/nat" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" gopsutil "github.com/shirou/gopsutil/mem" "github.com/urfave/cli/v2" ) diff --git a/cmd/utils/flags_legacy.go b/cmd/utils/flags_legacy.go index 243abd8311..e6b461b222 100644 --- a/cmd/utils/flags_legacy.go +++ b/cmd/utils/flags_legacy.go @@ -19,8 +19,8 @@ package utils import ( "fmt" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" "github.com/urfave/cli/v2" ) diff --git a/cmd/utils/history_test.go b/cmd/utils/history_test.go index 1d19e3f4ad..abb28759f0 100644 --- a/cmd/utils/history_test.go +++ b/cmd/utils/history_test.go @@ -26,16 +26,16 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/era" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/era" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/cmd/utils/prompt.go b/cmd/utils/prompt.go index f513e38188..ed4e3c41d1 100644 --- a/cmd/utils/prompt.go +++ b/cmd/utils/prompt.go @@ -20,7 +20,7 @@ package utils import ( "fmt" - "github.com/ethereum/go-ethereum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" ) // GetPassPhrase displays the given text(prompt) to the user and requests some textual diff --git a/common/bitutil/compress_test.go b/common/bitutil/compress_test.go index c6f6fe8bcf..788d3d32ef 100644 --- a/common/bitutil/compress_test.go +++ b/common/bitutil/compress_test.go @@ -22,7 +22,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // Tests that data bitset encoding and decoding works and is bijective. diff --git a/common/bytes.go b/common/bytes.go index d1f5c6c995..d276e93b64 100644 --- a/common/bytes.go +++ b/common/bytes.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "errors" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // FromHex returns the bytes represented by the hexadecimal string s. diff --git a/common/debug.go b/common/debug.go index 28c52b4a9c..b4504d60b6 100644 --- a/common/debug.go +++ b/common/debug.go @@ -26,7 +26,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/ethereum/go-ethereum/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/paxosglobal/go-ethereum-arbitrum/issues") fmt.Fprintln(os.Stderr, extra...) _, file, line, _ := runtime.Caller(1) diff --git a/common/hexutil/json_example_test.go b/common/hexutil/json_example_test.go index 80180d9186..9b254664cf 100644 --- a/common/hexutil/json_example_test.go +++ b/common/hexutil/json_example_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) type MyType [5]byte diff --git a/common/math/big_test.go b/common/math/big_test.go index 803b5e1cc6..ac96fdcc9b 100644 --- a/common/math/big_test.go +++ b/common/math/big_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func TestHexOrDecimal256(t *testing.T) { diff --git a/common/prque/lazyqueue.go b/common/prque/lazyqueue.go index 59bda72fa7..b3e475a3bf 100644 --- a/common/prque/lazyqueue.go +++ b/common/prque/lazyqueue.go @@ -20,7 +20,7 @@ import ( "container/heap" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" "golang.org/x/exp/constraints" ) diff --git a/common/prque/lazyqueue_test.go b/common/prque/lazyqueue_test.go index ffb7e5e9e3..ffd86375db 100644 --- a/common/prque/lazyqueue_test.go +++ b/common/prque/lazyqueue_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" ) const ( diff --git a/common/types.go b/common/types.go index aadca87f82..b1ad056955 100644 --- a/common/types.go +++ b/common/types.go @@ -29,7 +29,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" "golang.org/x/crypto/sha3" ) diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go index 7c4ded7d7f..a849acc99d 100644 --- a/consensus/beacon/consensus.go +++ b/consensus/beacon/consensus.go @@ -21,16 +21,16 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // Proof-of-stake protocol constants. diff --git a/consensus/beacon/faker.go b/consensus/beacon/faker.go index 981e345e3e..3aea06fb21 100644 --- a/consensus/beacon/faker.go +++ b/consensus/beacon/faker.go @@ -19,8 +19,8 @@ package beacon import ( "math/big" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // NewFaker creates a fake consensus engine for testing. diff --git a/consensus/clique/api.go b/consensus/clique/api.go index 374b50692d..7100ecd291 100644 --- a/consensus/clique/api.go +++ b/consensus/clique/api.go @@ -20,12 +20,12 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // 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 69d972eecf..9917335a63 100644 --- a/consensus/clique/clique.go +++ b/consensus/clique/clique.go @@ -27,22 +27,22 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - lru "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + lru "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/crypto/sha3" ) diff --git a/consensus/clique/clique_test.go b/consensus/clique/clique_test.go index 6e2b17c8c8..a7e80f84f2 100644 --- a/consensus/clique/clique_test.go +++ b/consensus/clique/clique_test.go @@ -20,13 +20,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // This test case is a repro of an annoying bug that took us forever to catch. diff --git a/consensus/clique/snapshot.go b/consensus/clique/snapshot.go index a97115121b..c91e01f1e6 100644 --- a/consensus/clique/snapshot.go +++ b/consensus/clique/snapshot.go @@ -21,13 +21,13 @@ import ( "encoding/json" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "golang.org/x/exp/slices" ) diff --git a/consensus/clique/snapshot_test.go b/consensus/clique/snapshot_test.go index ada234c9f6..2bc271937e 100644 --- a/consensus/clique/snapshot_test.go +++ b/consensus/clique/snapshot_test.go @@ -23,13 +23,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "golang.org/x/exp/slices" ) @@ -367,7 +367,7 @@ func TestClique(t *testing.T) { failure: errRecentlySigned, }, { // Recent signatures should not reset on checkpoint blocks imported in a new - // batch (https://github.com/ethereum/go-ethereum/issues/17593). Whilst this + // batch (https://github.com/paxosglobal/go-ethereum-arbitrum/issues/17593). Whilst this // seems overly specific and weird, it was a Rinkeby consensus split. epoch: 3, signers: []string{"A", "B", "C"}, diff --git a/consensus/consensus.go b/consensus/consensus.go index 3a2c2d2229..1fcd32d610 100644 --- a/consensus/consensus.go +++ b/consensus/consensus.go @@ -20,11 +20,11 @@ package consensus import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // ChainHeaderReader defines a small collection of methods needed to access the local diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go index d0b0da8fd2..14042b6290 100644 --- a/consensus/ethash/consensus.go +++ b/consensus/ethash/consensus.go @@ -23,17 +23,17 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/crypto/sha3" ) diff --git a/consensus/ethash/consensus_test.go b/consensus/ethash/consensus_test.go index e3793cd1b0..278097780f 100644 --- a/consensus/ethash/consensus_test.go +++ b/consensus/ethash/consensus_test.go @@ -26,10 +26,10 @@ import ( "path/filepath" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) type diffTest struct { diff --git a/consensus/ethash/difficulty.go b/consensus/ethash/difficulty.go index 66a18059c6..e45d0f5af5 100644 --- a/consensus/ethash/difficulty.go +++ b/consensus/ethash/difficulty.go @@ -19,8 +19,8 @@ package ethash import ( "math/big" - "github.com/ethereum/go-ethereum/core/types" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) const ( diff --git a/consensus/ethash/ethash.go b/consensus/ethash/ethash.go index f37ec26056..1eae411b15 100644 --- a/consensus/ethash/ethash.go +++ b/consensus/ethash/ethash.go @@ -20,9 +20,9 @@ package ethash import ( "time" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Ethash is a consensus engine based on proof-of-work implementing the ethash diff --git a/consensus/merger.go b/consensus/merger.go index ffbcbf2b85..fee0b7d248 100644 --- a/consensus/merger.go +++ b/consensus/merger.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // transitionStatus describes the status of eth1/2 transition. This switch diff --git a/consensus/misc/dao.go b/consensus/misc/dao.go index e21a44f63d..c183b1883b 100644 --- a/consensus/misc/dao.go +++ b/consensus/misc/dao.go @@ -21,10 +21,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/consensus/misc/eip1559/eip1559.go b/consensus/misc/eip1559/eip1559.go index 84b82c4c49..f3df203169 100644 --- a/consensus/misc/eip1559/eip1559.go +++ b/consensus/misc/eip1559/eip1559.go @@ -21,11 +21,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // VerifyEIP1559Header verifies some header attributes which were changed in EIP-1559, diff --git a/consensus/misc/eip1559/eip1559_test.go b/consensus/misc/eip1559/eip1559_test.go index b5afdf0fe5..40af694353 100644 --- a/consensus/misc/eip1559/eip1559_test.go +++ b/consensus/misc/eip1559/eip1559_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // copyConfig does a _shallow_ copy of a given config. Safe to set new values, but diff --git a/consensus/misc/eip4844/eip4844.go b/consensus/misc/eip4844/eip4844.go index 2dad9a0cd3..7c7471c038 100644 --- a/consensus/misc/eip4844/eip4844.go +++ b/consensus/misc/eip4844/eip4844.go @@ -21,8 +21,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/consensus/misc/eip4844/eip4844_test.go b/consensus/misc/eip4844/eip4844_test.go index ec417380fc..93525587db 100644 --- a/consensus/misc/eip4844/eip4844_test.go +++ b/consensus/misc/eip4844/eip4844_test.go @@ -21,7 +21,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func TestCalcExcessBlobGas(t *testing.T) { diff --git a/consensus/misc/gaslimit.go b/consensus/misc/gaslimit.go index dfcabd9a80..241ee2c4ba 100644 --- a/consensus/misc/gaslimit.go +++ b/consensus/misc/gaslimit.go @@ -19,7 +19,7 @@ package misc import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // VerifyGaslimit verifies the header gas limit according increase/decrease diff --git a/console/bridge.go b/console/bridge.go index 37578041ca..d7ae5b5086 100644 --- a/console/bridge.go +++ b/console/bridge.go @@ -26,12 +26,12 @@ import ( "time" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/scwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/usbwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/jsre" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // bridge is a collection of JavaScript utility methods to bride the .js runtime diff --git a/console/bridge_test.go b/console/bridge_test.go index e57e294fc5..75726ef82d 100644 --- a/console/bridge_test.go +++ b/console/bridge_test.go @@ -20,7 +20,7 @@ import ( "testing" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/jsre" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/jsre" ) // TestUndefinedAsParam ensures that personal functions can receive diff --git a/console/console.go b/console/console.go index cdee53684e..b0e2c73cef 100644 --- a/console/console.go +++ b/console/console.go @@ -30,13 +30,13 @@ import ( "syscall" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/internal/jsre/deps" - "github.com/ethereum/go-ethereum/internal/web3ext" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" "github.com/mattn/go-colorable" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/jsre" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/jsre/deps" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/web3ext" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/peterh/liner" ) diff --git a/console/console_test.go b/console/console_test.go index a13be6a99d..838e0c9507 100644 --- a/console/console_test.go +++ b/console/console_test.go @@ -25,14 +25,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/internal/jsre" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/jsre" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" ) const ( diff --git a/core/arbitrum_hooks.go b/core/arbitrum_hooks.go index f959395b7a..ac3c05d659 100644 --- a/core/arbitrum_hooks.go +++ b/core/arbitrum_hooks.go @@ -19,12 +19,12 @@ package core import ( "context" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Installs an Arbitrum TxProcessor, enabling ArbOS for this state transition (see vm/evm_arbitrum.go) diff --git a/core/asm/asm.go b/core/asm/asm.go index 294eb6ffaa..269801cec0 100644 --- a/core/asm/asm.go +++ b/core/asm/asm.go @@ -21,7 +21,7 @@ import ( "encoding/hex" "fmt" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) // Iterator for disassembled EVM instructions diff --git a/core/asm/compiler.go b/core/asm/compiler.go index 02c589b2c1..5d8ba514e3 100644 --- a/core/asm/compiler.go +++ b/core/asm/compiler.go @@ -24,8 +24,8 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) // Compiler contains information about the parsed source diff --git a/core/bench_test.go b/core/bench_test.go index f0eb19fb14..2cee51d7d9 100644 --- a/core/bench_test.go +++ b/core/bench_test.go @@ -21,15 +21,15 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func BenchmarkInsertChain_empty_memdb(b *testing.B) { diff --git a/core/block_validator.go b/core/block_validator.go index f3d65cea25..18f9f1b302 100644 --- a/core/block_validator.go +++ b/core/block_validator.go @@ -20,11 +20,11 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // BlockValidator is responsible for validating block headers, uncles and diff --git a/core/block_validator_test.go b/core/block_validator_test.go index 40848fdb01..a0c5f07ce2 100644 --- a/core/block_validator_test.go +++ b/core/block_validator_test.go @@ -21,16 +21,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Tests that simple header verification works, for both good and bad blocks. diff --git a/core/blockchain.go b/core/blockchain.go index 98b5cbc55c..4e631289ca 100644 --- a/core/blockchain.go +++ b/core/blockchain.go @@ -29,28 +29,28 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/syncx" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/syncx" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/version" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" "golang.org/x/exp/slices" ) diff --git a/core/blockchain_arbitrum.go b/core/blockchain_arbitrum.go index 55966e98cc..39c93fa30c 100644 --- a/core/blockchain_arbitrum.go +++ b/core/blockchain_arbitrum.go @@ -21,10 +21,10 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // WriteBlockAndSetHeadWithTime also counts processTime, which will cause intermittent TrieDirty cache writes diff --git a/core/blockchain_insert.go b/core/blockchain_insert.go index 9bf662b6b7..b5d11f569c 100644 --- a/core/blockchain_insert.go +++ b/core/blockchain_insert.go @@ -19,10 +19,10 @@ package core import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // insertStats tracks and reports on block insertion. diff --git a/core/blockchain_reader.go b/core/blockchain_reader.go index 706844171d..d780310d03 100644 --- a/core/blockchain_reader.go +++ b/core/blockchain_reader.go @@ -20,17 +20,17 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // CurrentHeader retrieves the current head header of the canonical chain. The diff --git a/core/blockchain_repair_test.go b/core/blockchain_repair_test.go index d7a0eba502..80387722df 100644 --- a/core/blockchain_repair_test.go +++ b/core/blockchain_repair_test.go @@ -26,12 +26,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Tests a recovery for a short canonical chain where a recent block was already @@ -1887,7 +1887,7 @@ func testRepairWithScheme(t *testing.T, tt *rewindTest, snapshots bool, scheme s } } -// TestIssue23496 tests scenario described in https://github.com/ethereum/go-ethereum/pull/23496#issuecomment-926393893 +// TestIssue23496 tests scenario described in https://github.com/paxosglobal/go-ethereum-arbitrum/pull/23496#issuecomment-926393893 // Credits to @zzyalbert for finding the issue. // // Local chain owns these blocks: diff --git a/core/blockchain_sethead_test.go b/core/blockchain_sethead_test.go index 8c36b84eda..d787b786e5 100644 --- a/core/blockchain_sethead_test.go +++ b/core/blockchain_sethead_test.go @@ -27,16 +27,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) // rewindTest is a test case for chain rollback upon user request. diff --git a/core/blockchain_snapshot_test.go b/core/blockchain_snapshot_test.go index 547ebccfec..0a826be9ea 100644 --- a/core/blockchain_snapshot_test.go +++ b/core/blockchain_snapshot_test.go @@ -29,13 +29,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // snapshotTestBasic wraps the common testing fields in the snapshot tests. diff --git a/core/blockchain_test.go b/core/blockchain_test.go index 1a969b3656..d17c755088 100644 --- a/core/blockchain_test.go +++ b/core/blockchain_test.go @@ -26,21 +26,21 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // So we can deterministically seed different blockchains @@ -1755,7 +1755,7 @@ func testEIP161AccountRemoval(t *testing.T, scheme string) { // tests that under weird reorg conditions the blockchain and its internal header- // chain return the same latest block/header. // -// https://github.com/ethereum/go-ethereum/pull/15941 +// https://github.com/paxosglobal/go-ethereum-arbitrum/pull/15941 func TestBlockchainHeaderchainReorgConsistency(t *testing.T) { testBlockchainHeaderchainReorgConsistency(t, rawdb.HashScheme) testBlockchainHeaderchainReorgConsistency(t, rawdb.PathScheme) @@ -2057,8 +2057,8 @@ func testInsertReceiptChainRollback(t *testing.T, scheme string) { // overtake the 'canon' chain until after it's passed canon by about 200 blocks. // // Details at: -// - https://github.com/ethereum/go-ethereum/issues/18977 -// - https://github.com/ethereum/go-ethereum/pull/18988 +// - https://github.com/paxosglobal/go-ethereum-arbitrum/issues/18977 +// - https://github.com/paxosglobal/go-ethereum-arbitrum/pull/18988 func TestLowDiffLongChain(t *testing.T) { testLowDiffLongChain(t, rawdb.HashScheme) testLowDiffLongChain(t, rawdb.PathScheme) diff --git a/core/blocks.go b/core/blocks.go index f20ba4aaf2..1b85fb5024 100644 --- a/core/blocks.go +++ b/core/blocks.go @@ -16,7 +16,7 @@ package core -import "github.com/ethereum/go-ethereum/common" +import "github.com/paxosglobal/go-ethereum-arbitrum/common" // BadHashes represent a set of manually tracked bad hashes (usually hard forks) var BadHashes = map[common.Hash]bool{ diff --git a/core/bloom_indexer.go b/core/bloom_indexer.go index 68a35d811e..495afd96ce 100644 --- a/core/bloom_indexer.go +++ b/core/bloom_indexer.go @@ -20,12 +20,12 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) const ( diff --git a/core/bloombits/generator.go b/core/bloombits/generator.go index 646151db0b..6e439dbb32 100644 --- a/core/bloombits/generator.go +++ b/core/bloombits/generator.go @@ -19,7 +19,7 @@ package bloombits import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var ( diff --git a/core/bloombits/generator_test.go b/core/bloombits/generator_test.go index ac1aee0b25..79fe323bc6 100644 --- a/core/bloombits/generator_test.go +++ b/core/bloombits/generator_test.go @@ -22,7 +22,7 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // Tests that batched bloom bits are correctly rotated from the input bloom diff --git a/core/bloombits/matcher.go b/core/bloombits/matcher.go index 6a4cfb23db..1ce8a06435 100644 --- a/core/bloombits/matcher.go +++ b/core/bloombits/matcher.go @@ -26,8 +26,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) // bloomIndexes represents the bit indexes inside the bloom filter that belong diff --git a/core/bloombits/matcher_test.go b/core/bloombits/matcher_test.go index 7f3d5f279c..cfde86be72 100644 --- a/core/bloombits/matcher_test.go +++ b/core/bloombits/matcher_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) const testSectionSize = 4096 @@ -86,7 +86,7 @@ func TestMatcherRandom(t *testing.T) { // Tests that the matcher can properly find matches if the starting block is // shifted from a multiple of 8. This is needed to cover an optimisation with -// bitset matching https://github.com/ethereum/go-ethereum/issues/15309. +// bitset matching https://github.com/paxosglobal/go-ethereum-arbitrum/issues/15309. func TestMatcherShifted(t *testing.T) { t.Parallel() // Block 0 always matches in the tests, skip ahead of first 8 blocks with the diff --git a/core/chain_indexer.go b/core/chain_indexer.go index f5fce72588..30524b7aaa 100644 --- a/core/chain_indexer.go +++ b/core/chain_indexer.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // ChainIndexerBackend defines the methods needed to process chain segments in diff --git a/core/chain_indexer_test.go b/core/chain_indexer_test.go index f099609015..1b54f19f78 100644 --- a/core/chain_indexer_test.go +++ b/core/chain_indexer_test.go @@ -25,9 +25,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // Runs multiple tests with randomized parameters. diff --git a/core/chain_makers.go b/core/chain_makers.go index aad4258204..697a898793 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -20,19 +20,19 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // BlockGen creates blocks for testing. diff --git a/core/chain_makers_test.go b/core/chain_makers_test.go index 2c54fff41f..3f6ce577cc 100644 --- a/core/chain_makers_test.go +++ b/core/chain_makers_test.go @@ -23,15 +23,15 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) func TestGeneratePOSChain(t *testing.T) { diff --git a/core/dao_test.go b/core/dao_test.go index 8383db7f97..1481b3ee51 100644 --- a/core/dao_test.go +++ b/core/dao_test.go @@ -20,10 +20,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Tests that DAO-fork enabled clients can properly filter out fork-commencing diff --git a/core/error.go b/core/error.go index 72cacf8c78..c90727af73 100644 --- a/core/error.go +++ b/core/error.go @@ -19,7 +19,7 @@ package core import ( "errors" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var ( diff --git a/core/events.go b/core/events.go index ac935a137f..a6a9cba3b0 100644 --- a/core/events.go +++ b/core/events.go @@ -17,8 +17,8 @@ package core import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 81144af213..cebb1cf657 100644 --- a/core/evm.go +++ b/core/evm.go @@ -19,12 +19,12 @@ package core import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) // ChainContext supports retrieving headers and consensus parameters from the diff --git a/core/forkchoice.go b/core/forkchoice.go index b293c851bf..08ddf2d6cd 100644 --- a/core/forkchoice.go +++ b/core/forkchoice.go @@ -22,11 +22,11 @@ import ( "math/big" mrand "math/rand" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // ChainReader defines a small collection of methods needed to access the local diff --git a/core/forkid/forkid.go b/core/forkid/forkid.go index 76825d3bef..dc9bfacc89 100644 --- a/core/forkid/forkid.go +++ b/core/forkid/forkid.go @@ -26,9 +26,9 @@ import ( "reflect" "strings" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "golang.org/x/exp/slices" ) diff --git a/core/forkid/forkid_test.go b/core/forkid/forkid_test.go index b9d346bd90..f88ee0d07c 100644 --- a/core/forkid/forkid_test.go +++ b/core/forkid/forkid_test.go @@ -23,11 +23,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // TestCreation tests that different genesis and fork rule combinations result in diff --git a/core/gen_genesis.go b/core/gen_genesis.go index 38614252a3..afe2d5e17f 100644 --- a/core/gen_genesis.go +++ b/core/gen_genesis.go @@ -7,10 +7,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var _ = (*genesisSpecMarshaling)(nil) diff --git a/core/gen_genesis_account.go b/core/gen_genesis_account.go index a9d47e6ba3..476d42b669 100644 --- a/core/gen_genesis_account.go +++ b/core/gen_genesis_account.go @@ -7,9 +7,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) var _ = (*genesisAccountMarshaling)(nil) diff --git a/core/genesis.go b/core/genesis.go index 6d8929c6b9..e48a67d02a 100644 --- a/core/genesis.go +++ b/core/genesis.go @@ -25,20 +25,20 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) //go:generate go run github.com/fjl/gencodec -type Genesis -field-override genesisSpecMarshaling -out gen_genesis.go diff --git a/core/genesis_test.go b/core/genesis_test.go index 4bdb2a2e87..660ae6cbd1 100644 --- a/core/genesis_test.go +++ b/core/genesis_test.go @@ -24,14 +24,14 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) func TestInvalidCliqueConfig(t *testing.T) { diff --git a/core/headerchain.go b/core/headerchain.go index 519a32ab80..bc97b4a165 100644 --- a/core/headerchain.go +++ b/core/headerchain.go @@ -26,15 +26,15 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) const ( diff --git a/core/headerchain_test.go b/core/headerchain_test.go index 2c0323e6f7..52429f7100 100644 --- a/core/headerchain_test.go +++ b/core/headerchain_test.go @@ -23,12 +23,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) func verifyUnbrokenCanonchain(hc *HeaderChain) error { diff --git a/core/mkalloc.go b/core/mkalloc.go index 12c40c14fb..877c198442 100644 --- a/core/mkalloc.go +++ b/core/mkalloc.go @@ -32,9 +32,9 @@ import ( "os" "strconv" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/exp/slices" ) diff --git a/core/rawdb/accessors_chain.go b/core/rawdb/accessors_chain.go index a4c1b736d0..59882df7d5 100644 --- a/core/rawdb/accessors_chain.go +++ b/core/rawdb/accessors_chain.go @@ -23,14 +23,14 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/exp/slices" ) diff --git a/core/rawdb/accessors_chain_test.go b/core/rawdb/accessors_chain_test.go index a7ceb72998..cfc1dcf540 100644 --- a/core/rawdb/accessors_chain_test.go +++ b/core/rawdb/accessors_chain_test.go @@ -26,11 +26,11 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/accessors_indexes.go b/core/rawdb/accessors_indexes.go index 4f2ef0a880..73c6203126 100644 --- a/core/rawdb/accessors_indexes.go +++ b/core/rawdb/accessors_indexes.go @@ -20,12 +20,12 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // ReadTxLookupEntry retrieves the positional metadata associated with a transaction diff --git a/core/rawdb/accessors_indexes_test.go b/core/rawdb/accessors_indexes_test.go index 124389ba7a..bc2ea179fd 100644 --- a/core/rawdb/accessors_indexes_test.go +++ b/core/rawdb/accessors_indexes_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/blocktest" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/blocktest" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var newTestHasher = blocktest.NewHasher diff --git a/core/rawdb/accessors_metadata.go b/core/rawdb/accessors_metadata.go index 859566f722..1786efcdfa 100644 --- a/core/rawdb/accessors_metadata.go +++ b/core/rawdb/accessors_metadata.go @@ -20,11 +20,11 @@ import ( "encoding/json" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // ReadDatabaseVersion retrieves the version number of the database. diff --git a/core/rawdb/accessors_snapshot.go b/core/rawdb/accessors_snapshot.go index 3c82b3f731..f4271f08fb 100644 --- a/core/rawdb/accessors_snapshot.go +++ b/core/rawdb/accessors_snapshot.go @@ -19,9 +19,9 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // ReadSnapshotDisabled retrieves if the snapshot maintenance is disabled. diff --git a/core/rawdb/accessors_state.go b/core/rawdb/accessors_state.go index 9ce58e7d27..6e7d0ffe24 100644 --- a/core/rawdb/accessors_state.go +++ b/core/rawdb/accessors_state.go @@ -19,9 +19,9 @@ package rawdb import ( "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // ReadPreimage retrieves a single preimage of the provided hash. diff --git a/core/rawdb/accessors_state_arbitrum.go b/core/rawdb/accessors_state_arbitrum.go index 32ccb1c94d..e166b563cf 100644 --- a/core/rawdb/accessors_state_arbitrum.go +++ b/core/rawdb/accessors_state_arbitrum.go @@ -17,9 +17,9 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Stores the activated asm and module for a given codeHash diff --git a/core/rawdb/accessors_sync.go b/core/rawdb/accessors_sync.go index 2dc08b3b72..bd87eb09fe 100644 --- a/core/rawdb/accessors_sync.go +++ b/core/rawdb/accessors_sync.go @@ -17,10 +17,10 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // ReadSkeletonSyncStatus retrieves the serialized sync status saved at shutdown. diff --git a/core/rawdb/accessors_trie.go b/core/rawdb/accessors_trie.go index ea3367db36..7f9fdb3d7a 100644 --- a/core/rawdb/accessors_trie.go +++ b/core/rawdb/accessors_trie.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "golang.org/x/crypto/sha3" ) diff --git a/core/rawdb/ancient_utils.go b/core/rawdb/ancient_utils.go index 428cda544b..12367d1b38 100644 --- a/core/rawdb/ancient_utils.go +++ b/core/rawdb/ancient_utils.go @@ -20,8 +20,8 @@ import ( "fmt" "path/filepath" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) type tableSize struct { diff --git a/core/rawdb/chain_freezer.go b/core/rawdb/chain_freezer.go index bb2c409dbb..6e9687db13 100644 --- a/core/rawdb/chain_freezer.go +++ b/core/rawdb/chain_freezer.go @@ -22,10 +22,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) const ( diff --git a/core/rawdb/chain_iterator.go b/core/rawdb/chain_iterator.go index 759e5913d1..e6015538a9 100644 --- a/core/rawdb/chain_iterator.go +++ b/core/rawdb/chain_iterator.go @@ -21,12 +21,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // InitDatabaseFromFreezer reinitializes an empty database from a previous batch diff --git a/core/rawdb/chain_iterator_test.go b/core/rawdb/chain_iterator_test.go index 78b0a82e10..8afda02429 100644 --- a/core/rawdb/chain_iterator_test.go +++ b/core/rawdb/chain_iterator_test.go @@ -23,8 +23,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) func TestChainIterator(t *testing.T) { diff --git a/core/rawdb/database.go b/core/rawdb/database.go index 3aa099c0f8..3d29f975c9 100644 --- a/core/rawdb/database.go +++ b/core/rawdb/database.go @@ -26,13 +26,13 @@ import ( "strings" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/leveldb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/ethdb/pebble" - "github.com/ethereum/go-ethereum/log" "github.com/olekukonko/tablewriter" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/leveldb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/pebble" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // freezerdb is a database wrapper that enables freezer data retrievals. diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go index dbee468e8a..949289aada 100644 --- a/core/rawdb/freezer.go +++ b/core/rawdb/freezer.go @@ -26,10 +26,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/core/rawdb/freezer_batch.go b/core/rawdb/freezer_batch.go index 84a63a4518..2613f9f4ec 100644 --- a/core/rawdb/freezer_batch.go +++ b/core/rawdb/freezer_batch.go @@ -19,9 +19,9 @@ package rawdb import ( "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" "github.com/golang/snappy" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // This is the maximum amount of data that will be buffered in memory diff --git a/core/rawdb/freezer_meta.go b/core/rawdb/freezer_meta.go index 9eef9df351..578a91f847 100644 --- a/core/rawdb/freezer_meta.go +++ b/core/rawdb/freezer_meta.go @@ -20,8 +20,8 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) const freezerVersion = 1 // The initial version tag of freezer table metadata diff --git a/core/rawdb/freezer_resettable.go b/core/rawdb/freezer_resettable.go index 7a85489738..d37e20eb4e 100644 --- a/core/rawdb/freezer_resettable.go +++ b/core/rawdb/freezer_resettable.go @@ -21,8 +21,8 @@ import ( "path/filepath" "sync" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) const tmpSuffix = ".tmp" diff --git a/core/rawdb/freezer_resettable_test.go b/core/rawdb/freezer_resettable_test.go index d741bc14e5..1c87196a3d 100644 --- a/core/rawdb/freezer_resettable_test.go +++ b/core/rawdb/freezer_resettable_test.go @@ -21,7 +21,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) func TestResetFreezer(t *testing.T) { diff --git a/core/rawdb/freezer_table.go b/core/rawdb/freezer_table.go index 4b9d510e82..29ebd1c4f0 100644 --- a/core/rawdb/freezer_table.go +++ b/core/rawdb/freezer_table.go @@ -27,10 +27,10 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" "github.com/golang/snappy" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/core/rawdb/freezer_table_test.go b/core/rawdb/freezer_table_test.go index 91b4943e59..9c11acc53f 100644 --- a/core/rawdb/freezer_table_test.go +++ b/core/rawdb/freezer_table_test.go @@ -28,7 +28,7 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/freezer_test.go b/core/rawdb/freezer_test.go index b4bd6a382a..fe1412b1b5 100644 --- a/core/rawdb/freezer_test.go +++ b/core/rawdb/freezer_test.go @@ -27,8 +27,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/require" ) diff --git a/core/rawdb/key_length_iterator.go b/core/rawdb/key_length_iterator.go index d1c5af269a..cce003eb7c 100644 --- a/core/rawdb/key_length_iterator.go +++ b/core/rawdb/key_length_iterator.go @@ -16,7 +16,7 @@ package rawdb -import "github.com/ethereum/go-ethereum/ethdb" +import "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" // KeyLengthIterator is a wrapper for a database iterator that ensures only key-value pairs // with a specific key length will be returned. diff --git a/core/rawdb/schema.go b/core/rawdb/schema.go index 11cf5b40fe..6dd8f7ed54 100644 --- a/core/rawdb/schema.go +++ b/core/rawdb/schema.go @@ -21,9 +21,9 @@ import ( "bytes" "encoding/binary" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) // The fields below define the low level database schema prefixing. diff --git a/core/rawdb/schema_arbitrum.go b/core/rawdb/schema_arbitrum.go index 72a3f755bb..43b48d6f90 100644 --- a/core/rawdb/schema_arbitrum.go +++ b/core/rawdb/schema_arbitrum.go @@ -21,7 +21,7 @@ package rawdb import ( "bytes" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) var ( diff --git a/core/rawdb/table.go b/core/rawdb/table.go index 5f09b48203..81de927c73 100644 --- a/core/rawdb/table.go +++ b/core/rawdb/table.go @@ -17,7 +17,7 @@ package rawdb import ( - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) // table is a wrapper around a database that prefixes each key access with a pre- diff --git a/core/rawdb/table_test.go b/core/rawdb/table_test.go index aa6adf3e72..91e63cbcf5 100644 --- a/core/rawdb/table_test.go +++ b/core/rawdb/table_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) func TestTableDatabase(t *testing.T) { testTableDatabase(t, "prefix") } diff --git a/core/rlp_test.go b/core/rlp_test.go index a2fb4937f8..e11a6a3852 100644 --- a/core/rlp_test.go +++ b/core/rlp_test.go @@ -21,12 +21,12 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/sender_cacher.go b/core/sender_cacher.go index 4be53619eb..2cae7bfabd 100644 --- a/core/sender_cacher.go +++ b/core/sender_cacher.go @@ -19,7 +19,7 @@ package core import ( "runtime" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // SenderCacher is a concurrent transaction sender recoverer and cacher. diff --git a/core/state/access_list.go b/core/state/access_list.go index 4194691345..3989c53180 100644 --- a/core/state/access_list.go +++ b/core/state/access_list.go @@ -17,7 +17,7 @@ package state import ( - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) type accessList struct { diff --git a/core/state/database.go b/core/state/database.go index aa671be038..69402b0277 100644 --- a/core/state/database.go +++ b/core/state/database.go @@ -21,15 +21,15 @@ import ( "fmt" "github.com/crate-crypto/go-ipa/banderwagon" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/utils" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/utils" ) const ( diff --git a/core/state/database_arbitrum.go b/core/state/database_arbitrum.go index 6171b4cd10..2dddadd2c5 100644 --- a/core/state/database_arbitrum.go +++ b/core/state/database_arbitrum.go @@ -3,8 +3,8 @@ package state import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" ) func (db *cachingDB) ActivatedAsm(moduleHash common.Hash) ([]byte, error) { diff --git a/core/state/dump.go b/core/state/dump.go index 55abb50f1c..9cfd165b50 100644 --- a/core/state/dump.go +++ b/core/state/dump.go @@ -21,12 +21,12 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // DumpConfig is a set of options to control what portions of the state will be diff --git a/core/state/iterator.go b/core/state/iterator.go index dc84ce689b..7b5d0ebf86 100644 --- a/core/state/iterator.go +++ b/core/state/iterator.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // nodeIterator is an iterator to traverse the entire state trie post-order, diff --git a/core/state/iterator_test.go b/core/state/iterator_test.go index 73cc22490b..5feefc5924 100644 --- a/core/state/iterator_test.go +++ b/core/state/iterator_test.go @@ -19,9 +19,9 @@ package state import ( "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) // Tests that the node iterator indeed walks over the entire database contents. diff --git a/core/state/journal.go b/core/state/journal.go index 5b7cb40c7e..4b7bb32f95 100644 --- a/core/state/journal.go +++ b/core/state/journal.go @@ -17,8 +17,8 @@ package state import ( - "github.com/ethereum/go-ethereum/common" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // journalEntry is a modification entry in the state change journal that can be diff --git a/core/state/journal_arbitrum.go b/core/state/journal_arbitrum.go index 69b2415b79..2a93a7740a 100644 --- a/core/state/journal_arbitrum.go +++ b/core/state/journal_arbitrum.go @@ -1,7 +1,7 @@ package state import ( - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) type wasmActivation struct { diff --git a/core/state/metrics.go b/core/state/metrics.go index 64c651461e..19367ac9bd 100644 --- a/core/state/metrics.go +++ b/core/state/metrics.go @@ -16,7 +16,7 @@ package state -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/paxosglobal/go-ethereum-arbitrum/metrics" var ( accountUpdatedMeter = metrics.NewRegisteredMeter("state/update/account", nil) diff --git a/core/state/pruner/bloom.go b/core/state/pruner/bloom.go index b71610af07..c6a8370fd4 100644 --- a/core/state/pruner/bloom.go +++ b/core/state/pruner/bloom.go @@ -24,11 +24,11 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" bloomfilter "github.com/holiman/bloomfilter/v2" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // stateBloomHash is used to convert a trie hash or contract code hash into a 64 bit mini hash. diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go index ce53715f27..3654222b30 100644 --- a/core/state/pruner/pruner.go +++ b/core/state/pruner/pruner.go @@ -28,17 +28,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" ) const ( diff --git a/core/state/snapshot/context.go b/core/state/snapshot/context.go index 67d7e41a03..aba9be1358 100644 --- a/core/state/snapshot/context.go +++ b/core/state/snapshot/context.go @@ -22,12 +22,12 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) const ( diff --git a/core/state/snapshot/conversion.go b/core/state/snapshot/conversion.go index 4352b3321e..1960ca2c76 100644 --- a/core/state/snapshot/conversion.go +++ b/core/state/snapshot/conversion.go @@ -25,13 +25,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // trieKV represents a trie key-value pair diff --git a/core/state/snapshot/difflayer.go b/core/state/snapshot/difflayer.go index 70c9f44189..7453ff60bc 100644 --- a/core/state/snapshot/difflayer.go +++ b/core/state/snapshot/difflayer.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" bloomfilter "github.com/holiman/bloomfilter/v2" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/exp/slices" ) diff --git a/core/state/snapshot/difflayer_test.go b/core/state/snapshot/difflayer_test.go index 674a031b16..0f5c3e8a14 100644 --- a/core/state/snapshot/difflayer_test.go +++ b/core/state/snapshot/difflayer_test.go @@ -23,9 +23,9 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" ) func copyDestructs(destructs map[common.Hash]struct{}) map[common.Hash]struct{} { diff --git a/core/state/snapshot/disklayer.go b/core/state/snapshot/disklayer.go index d563b67ca4..c92d7a7462 100644 --- a/core/state/snapshot/disklayer.go +++ b/core/state/snapshot/disklayer.go @@ -21,12 +21,12 @@ import ( "sync" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // diskLayer is a low level persistent snapshot built on top of a key-value store. diff --git a/core/state/snapshot/disklayer_test.go b/core/state/snapshot/disklayer_test.go index 168458c405..8f3950f4e1 100644 --- a/core/state/snapshot/disklayer_test.go +++ b/core/state/snapshot/disklayer_test.go @@ -21,10 +21,10 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // reverse reverses the contents of a byte slice. It's used to update random accs diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go index f455a6db3f..8b3b36c6b4 100644 --- a/core/state/snapshot/generate.go +++ b/core/state/snapshot/generate.go @@ -23,15 +23,15 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) var ( diff --git a/core/state/snapshot/generate_test.go b/core/state/snapshot/generate_test.go index 7d941f6285..c73e08f9f0 100644 --- a/core/state/snapshot/generate_test.go +++ b/core/state/snapshot/generate_test.go @@ -22,17 +22,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/core/state/snapshot/holdable_iterator.go b/core/state/snapshot/holdable_iterator.go index 1e86ff9d82..32557b31ab 100644 --- a/core/state/snapshot/holdable_iterator.go +++ b/core/state/snapshot/holdable_iterator.go @@ -17,8 +17,8 @@ package snapshot import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) // holdableIterator is a wrapper of underlying database iterator. It extends diff --git a/core/state/snapshot/holdable_iterator_test.go b/core/state/snapshot/holdable_iterator_test.go index ce4cf6bb8a..06cc64c78d 100644 --- a/core/state/snapshot/holdable_iterator_test.go +++ b/core/state/snapshot/holdable_iterator_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" ) func TestIteratorHold(t *testing.T) { diff --git a/core/state/snapshot/iterator.go b/core/state/snapshot/iterator.go index c1a196c7ff..e5eaf7b20c 100644 --- a/core/state/snapshot/iterator.go +++ b/core/state/snapshot/iterator.go @@ -21,9 +21,9 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) // Iterator is an iterator to step over all the accounts or the specific diff --git a/core/state/snapshot/iterator_binary.go b/core/state/snapshot/iterator_binary.go index 22184b2545..25809695ec 100644 --- a/core/state/snapshot/iterator_binary.go +++ b/core/state/snapshot/iterator_binary.go @@ -19,7 +19,7 @@ package snapshot import ( "bytes" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // binaryIterator is a simplistic iterator to step over the accounts or storage diff --git a/core/state/snapshot/iterator_fast.go b/core/state/snapshot/iterator_fast.go index 0502d9cf85..8116df5ef7 100644 --- a/core/state/snapshot/iterator_fast.go +++ b/core/state/snapshot/iterator_fast.go @@ -21,7 +21,7 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" "golang.org/x/exp/slices" ) diff --git a/core/state/snapshot/iterator_test.go b/core/state/snapshot/iterator_test.go index 54614427a5..00a755ea5d 100644 --- a/core/state/snapshot/iterator_test.go +++ b/core/state/snapshot/iterator_test.go @@ -25,8 +25,8 @@ import ( "testing" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" ) // TestAccountIteratorBasics tests some simple single-layer(diff and disk) iteration diff --git a/core/state/snapshot/journal.go b/core/state/snapshot/journal.go index 4d070208f5..6825c483b0 100644 --- a/core/state/snapshot/journal.go +++ b/core/state/snapshot/journal.go @@ -25,12 +25,12 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) const journalVersion uint64 = 0 diff --git a/core/state/snapshot/metrics.go b/core/state/snapshot/metrics.go index b2e884588b..35d252fe00 100644 --- a/core/state/snapshot/metrics.go +++ b/core/state/snapshot/metrics.go @@ -16,7 +16,7 @@ package snapshot -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/paxosglobal/go-ethereum-arbitrum/metrics" // Metrics in generation var ( diff --git a/core/state/snapshot/snapshot.go b/core/state/snapshot/snapshot.go index 066e7dbe9e..351cdd7fe7 100644 --- a/core/state/snapshot/snapshot.go +++ b/core/state/snapshot/snapshot.go @@ -23,14 +23,14 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/core/state/snapshot/snapshot_test.go b/core/state/snapshot/snapshot_test.go index 6d7e8209b8..c82083ec74 100644 --- a/core/state/snapshot/snapshot_test.go +++ b/core/state/snapshot/snapshot_test.go @@ -25,11 +25,11 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // randomHash generates a random blob of data and returns it as a hash. @@ -185,7 +185,7 @@ func TestDiskLayerExternalInvalidationPartialFlatten(t *testing.T) { // layer to check the usual mode of operation where the accumulator is retained. func TestDiffLayerExternalInvalidationPartialFlatten(t *testing.T) { // Un-commenting this triggers the bloom set to be deterministic. The values below - // were used to trigger the flaw described in https://github.com/ethereum/go-ethereum/issues/27254. + // were used to trigger the flaw described in https://github.com/paxosglobal/go-ethereum-arbitrum/issues/27254. // bloomDestructHasherOffset, bloomAccountHasherOffset, bloomStorageHasherOffset = 14, 24, 5 // Create an empty base layer and a snapshot tree out of it diff --git a/core/state/snapshot/utils.go b/core/state/snapshot/utils.go index 62f073d2e1..df4d271611 100644 --- a/core/state/snapshot/utils.go +++ b/core/state/snapshot/utils.go @@ -21,11 +21,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // CheckDanglingStorage iterates the snap storage data, and verifies that all diff --git a/core/state/state_object.go b/core/state/state_object.go index d956bf02c2..945acd1e31 100644 --- a/core/state/state_object.go +++ b/core/state/state_object.go @@ -23,13 +23,13 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) type Code []byte diff --git a/core/state/state_object_test.go b/core/state/state_object_test.go index 42fd778025..f08290c2e8 100644 --- a/core/state/state_object_test.go +++ b/core/state/state_object_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func BenchmarkCutOriginal(b *testing.B) { diff --git a/core/state/state_test.go b/core/state/state_test.go index df7ebd2456..f01e5c6cca 100644 --- a/core/state/state_test.go +++ b/core/state/state_test.go @@ -21,13 +21,13 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) type stateEnv struct { diff --git a/core/state/statedb.go b/core/state/statedb.go index 6dc72f88e6..65ea0a8e96 100644 --- a/core/state/statedb.go +++ b/core/state/statedb.go @@ -24,18 +24,18 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) const ( @@ -755,7 +755,7 @@ func (s *StateDB) Copy() *StateDB { } // Copy the dirty states, logs, and preimages for addr := range s.journal.dirties { - // As documented [here](https://github.com/ethereum/go-ethereum/pull/16485#issuecomment-380438527), + // As documented [here](https://github.com/paxosglobal/go-ethereum-arbitrum/pull/16485#issuecomment-380438527), // and in the Finalise-method, there is a case where an object is in the journal but not // in the stateObjects: OOG after touch on ripeMD prior to Byzantium. Thus, we need to check for // nil diff --git a/core/state/statedb_arbitrum.go b/core/state/statedb_arbitrum.go index e459ad4570..039eab9af5 100644 --- a/core/state/statedb_arbitrum.go +++ b/core/state/statedb_arbitrum.go @@ -25,12 +25,12 @@ import ( "errors" "runtime" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/core/state/statedb_fuzz_test.go b/core/state/statedb_fuzz_test.go index a183337404..9f5a6dbc8e 100644 --- a/core/state/statedb_fuzz_test.go +++ b/core/state/statedb_fuzz_test.go @@ -28,16 +28,17 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/triestate" "github.com/holiman/uint256" + + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) // A stateTest checks that the state changes are correctly captured. Instances diff --git a/core/state/statedb_test.go b/core/state/statedb_test.go index 5ca7952fb7..12d3c11ab7 100644 --- a/core/state/statedb_test.go +++ b/core/state/statedb_test.go @@ -29,16 +29,16 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // Tests that updating a state trie does not leak any database writes prior to @@ -158,7 +158,7 @@ func TestIntermediateLeaks(t *testing.T) { // TestCopy tests that copying a StateDB object indeed makes the original and // the copy independent of each other. This test is a regression test against -// https://github.com/ethereum/go-ethereum/pull/15549. +// https://github.com/paxosglobal/go-ethereum-arbitrum/pull/15549. func TestCopy(t *testing.T) { // Create a random state test to copy and modify "independently" orig, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil) @@ -509,7 +509,7 @@ func TestTouchDelete(t *testing.T) { } // TestCopyOfCopy tests that modified objects are carried over to the copy, and the copy of the copy. -// See https://github.com/ethereum/go-ethereum/pull/15225#issuecomment-380191512 +// See https://github.com/paxosglobal/go-ethereum-arbitrum/pull/15225#issuecomment-380191512 func TestCopyOfCopy(t *testing.T) { state, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil) addr := common.HexToAddress("aaaa") @@ -526,7 +526,7 @@ func TestCopyOfCopy(t *testing.T) { // Tests a regression where committing a copy lost some internal meta information, // leading to corrupted subsequent copies. // -// See https://github.com/ethereum/go-ethereum/issues/20106. +// See https://github.com/paxosglobal/go-ethereum-arbitrum/issues/20106. func TestCopyCommitCopy(t *testing.T) { tdb := NewDatabase(rawdb.NewMemoryDatabase()) state, _ := New(types.EmptyRootHash, tdb, nil) @@ -600,7 +600,7 @@ func TestCopyCommitCopy(t *testing.T) { // Tests a regression where committing a copy lost some internal meta information, // leading to corrupted subsequent copies. // -// See https://github.com/ethereum/go-ethereum/issues/20106. +// See https://github.com/paxosglobal/go-ethereum-arbitrum/issues/20106. func TestCopyCopyCommitCopy(t *testing.T) { state, _ := New(types.EmptyRootHash, NewDatabase(rawdb.NewMemoryDatabase()), nil) diff --git a/core/state/sync.go b/core/state/sync.go index d6775e8896..20fa55e4a2 100644 --- a/core/state/sync.go +++ b/core/state/sync.go @@ -17,11 +17,11 @@ package state import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // NewStateSync create a new state trie download scheduler. diff --git a/core/state/sync_test.go b/core/state/sync_test.go index c0a397c3af..dc7870967c 100644 --- a/core/state/sync_test.go +++ b/core/state/sync_test.go @@ -20,16 +20,16 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) // testAccount is the data associated with an account used by the state tests. diff --git a/core/state/transient_storage.go b/core/state/transient_storage.go index 66e563efa7..fccd08baa5 100644 --- a/core/state/transient_storage.go +++ b/core/state/transient_storage.go @@ -17,7 +17,7 @@ package state import ( - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // transientStorage is a representation of EIP-1153 "Transient Storage". diff --git a/core/state/trie_prefetcher.go b/core/state/trie_prefetcher.go index c2a49417d4..c9e8cf3366 100644 --- a/core/state/trie_prefetcher.go +++ b/core/state/trie_prefetcher.go @@ -19,9 +19,9 @@ package state import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/core/state/trie_prefetcher_test.go b/core/state/trie_prefetcher_test.go index 711ec83250..3d3c97acd2 100644 --- a/core/state/trie_prefetcher_test.go +++ b/core/state/trie_prefetcher_test.go @@ -21,10 +21,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) func filledStateDB() *StateDB { diff --git a/core/state_prefetcher.go b/core/state_prefetcher.go index 572b715506..b0c52f4e00 100644 --- a/core/state_prefetcher.go +++ b/core/state_prefetcher.go @@ -19,11 +19,11 @@ package core import ( "sync/atomic" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // statePrefetcher is a basic Prefetcher, which blindly executes a block on top diff --git a/core/state_processor.go b/core/state_processor.go index af388487ad..0aa9e002ca 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -21,13 +21,13 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // StateProcessor is a basic Processor, which takes care of transitioning diff --git a/core/state_processor_test.go b/core/state_processor_test.go index c99f1a946c..cf5c133d68 100644 --- a/core/state_processor_test.go +++ b/core/state_processor_test.go @@ -21,20 +21,20 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/crypto/sha3" ) diff --git a/core/state_transition.go b/core/state_transition.go index 7fbdd797d5..a987a9ee00 100644 --- a/core/state_transition.go +++ b/core/state_transition.go @@ -21,13 +21,13 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - cmath "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + cmath "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // ExecutionResult includes all output after executing given evm diff --git a/core/txindexer.go b/core/txindexer.go index 70fe5f3322..c4d4e3365a 100644 --- a/core/txindexer.go +++ b/core/txindexer.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // TxIndexProgress is the struct describing the progress for transaction indexing. diff --git a/core/txindexer_test.go b/core/txindexer_test.go index b2c2dcec2b..ea09ff7cb1 100644 --- a/core/txindexer_test.go +++ b/core/txindexer_test.go @@ -21,13 +21,13 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // TestTxIndexer tests the functionalities for managing transaction indexes. diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go index 40c7f261f3..252407b4ff 100644 --- a/core/txpool/blobpool/blobpool.go +++ b/core/txpool/blobpool/blobpool.go @@ -29,20 +29,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/billy" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) const ( diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go index a71c452b79..175e8303b9 100644 --- a/core/txpool/blobpool/blobpool_test.go +++ b/core/txpool/blobpool/blobpool_test.go @@ -29,22 +29,22 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/billy" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/core/txpool/blobpool/config.go b/core/txpool/blobpool/config.go index 99a2002a30..55b0296b87 100644 --- a/core/txpool/blobpool/config.go +++ b/core/txpool/blobpool/config.go @@ -17,7 +17,7 @@ package blobpool import ( - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Config are the configuration parameters of the blob transaction pool. diff --git a/core/txpool/blobpool/evictheap.go b/core/txpool/blobpool/evictheap.go index df594099f7..a94c62f3cd 100644 --- a/core/txpool/blobpool/evictheap.go +++ b/core/txpool/blobpool/evictheap.go @@ -22,8 +22,8 @@ import ( "math" "sort" - "github.com/ethereum/go-ethereum/common" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // evictHeap is a helper data structure to keep track of the cheapest bottleneck diff --git a/core/txpool/blobpool/evictheap_test.go b/core/txpool/blobpool/evictheap_test.go index 01b136551c..97c366b380 100644 --- a/core/txpool/blobpool/evictheap_test.go +++ b/core/txpool/blobpool/evictheap_test.go @@ -21,9 +21,9 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var rand = mrand.New(mrand.NewSource(1)) diff --git a/core/txpool/blobpool/interface.go b/core/txpool/blobpool/interface.go index 6f296a54bd..cc62902ae8 100644 --- a/core/txpool/blobpool/interface.go +++ b/core/txpool/blobpool/interface.go @@ -17,10 +17,10 @@ package blobpool import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // BlockChain defines the minimal set of methods needed to back a blob pool with diff --git a/core/txpool/blobpool/limbo.go b/core/txpool/blobpool/limbo.go index ec754f6894..f5669110b0 100644 --- a/core/txpool/blobpool/limbo.go +++ b/core/txpool/blobpool/limbo.go @@ -19,11 +19,11 @@ package blobpool import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/billy" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // limboBlob is a wrapper around an opaque blobset that also contains the tx hash diff --git a/core/txpool/blobpool/metrics.go b/core/txpool/blobpool/metrics.go index 52419ade09..8dbad3afa2 100644 --- a/core/txpool/blobpool/metrics.go +++ b/core/txpool/blobpool/metrics.go @@ -16,7 +16,7 @@ package blobpool -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/paxosglobal/go-ethereum-arbitrum/metrics" var ( // datacapGauge tracks the user's configured capacity for the blob pool. It diff --git a/core/txpool/legacypool/journal.go b/core/txpool/legacypool/journal.go index f04ab8fc14..1d6d5f2df2 100644 --- a/core/txpool/legacypool/journal.go +++ b/core/txpool/legacypool/journal.go @@ -22,10 +22,10 @@ import ( "io/fs" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // errNoActiveJournal is returned if a transaction is attempted to be inserted diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go index 624dafc60d..69f8a8a11e 100644 --- a/core/txpool/legacypool/legacypool.go +++ b/core/txpool/legacypool/legacypool.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) const ( diff --git a/core/txpool/legacypool/legacypool2_test.go b/core/txpool/legacypool/legacypool2_test.go index 0f53000b3d..282e2fb264 100644 --- a/core/txpool/legacypool/legacypool2_test.go +++ b/core/txpool/legacypool/legacypool2_test.go @@ -20,13 +20,13 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" ) func pricedValuedTransaction(nonce uint64, value int64, gaslimit uint64, gasprice *big.Int, key *ecdsa.PrivateKey) *types.Transaction { diff --git a/core/txpool/legacypool/legacypool_test.go b/core/txpool/legacypool/legacypool_test.go index cd2cfb92e4..f15a90734c 100644 --- a/core/txpool/legacypool/legacypool_test.go +++ b/core/txpool/legacypool/legacypool_test.go @@ -29,17 +29,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/core/txpool/legacypool/list.go b/core/txpool/legacypool/list.go index 05ae0b58cd..1baa3a20fa 100644 --- a/core/txpool/legacypool/list.go +++ b/core/txpool/legacypool/list.go @@ -25,8 +25,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // nonceHeap is a heap.Interface implementation over 64bit unsigned integers for diff --git a/core/txpool/legacypool/list_test.go b/core/txpool/legacypool/list_test.go index b5cd34b23b..9bb36d5bac 100644 --- a/core/txpool/legacypool/list_test.go +++ b/core/txpool/legacypool/list_test.go @@ -21,8 +21,8 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) // Tests that transactions can be added to strict lists and list contents and diff --git a/core/txpool/legacypool/noncer.go b/core/txpool/legacypool/noncer.go index 2c65dd2cae..ca462a39ea 100644 --- a/core/txpool/legacypool/noncer.go +++ b/core/txpool/legacypool/noncer.go @@ -19,8 +19,8 @@ package legacypool import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" ) // noncer is a tiny virtual state database to manage the executable nonces of diff --git a/core/txpool/subpool.go b/core/txpool/subpool.go index 2722174d79..9507962e5b 100644 --- a/core/txpool/subpool.go +++ b/core/txpool/subpool.go @@ -20,10 +20,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" ) // LazyTransaction contains a small subset of the transaction properties that is diff --git a/core/txpool/txpool.go b/core/txpool/txpool.go index d03e025a9e..dd6779d87a 100644 --- a/core/txpool/txpool.go +++ b/core/txpool/txpool.go @@ -22,12 +22,12 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) // TxStatus is the current status of a transaction as seen by the pool. diff --git a/core/txpool/validation.go b/core/txpool/validation.go index d9a2755e67..b395d2a99a 100644 --- a/core/txpool/validation.go +++ b/core/txpool/validation.go @@ -21,13 +21,13 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // ValidationOptions define certain differences between transaction validation diff --git a/core/types.go b/core/types.go index 36eb0d1ded..6af4291be5 100644 --- a/core/types.go +++ b/core/types.go @@ -19,9 +19,9 @@ package core import ( "sync/atomic" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) // Validator is an interface which defines the standard for block validation. It diff --git a/core/types/arb_types.go b/core/types/arb_types.go index ae329c24bf..5151dbf170 100644 --- a/core/types/arb_types.go +++ b/core/types/arb_types.go @@ -6,12 +6,12 @@ import ( "encoding/binary" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // Returns true if nonce checks should be skipped based on inner's isFake() diff --git a/core/types/arbitrum_legacy_tx.go b/core/types/arbitrum_legacy_tx.go index 1269670476..5200228e0b 100644 --- a/core/types/arbitrum_legacy_tx.go +++ b/core/types/arbitrum_legacy_tx.go @@ -4,8 +4,8 @@ import ( "bytes" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) type ArbitrumLegacyTxData struct { diff --git a/core/types/arbitrum_signer.go b/core/types/arbitrum_signer.go index 5f2656b14b..6d39842942 100644 --- a/core/types/arbitrum_signer.go +++ b/core/types/arbitrum_signer.go @@ -3,7 +3,7 @@ package types import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) var ArbosAddress = common.HexToAddress("0xa4b05") diff --git a/core/types/block.go b/core/types/block.go index 1a357baa3a..2c5529914a 100644 --- a/core/types/block.go +++ b/core/types/block.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // A BlockNonce is a 64-bit hash which proves (combined with the diff --git a/core/types/block_test.go b/core/types/block_test.go index cf0b1dd85c..7a9491e949 100644 --- a/core/types/block_test.go +++ b/core/types/block_test.go @@ -22,12 +22,12 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/blocktest" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/blocktest" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // from bcValidBlockTest.json, "SimpleTx" diff --git a/core/types/bloom9.go b/core/types/bloom9.go index a560a20724..8d08fcaf03 100644 --- a/core/types/bloom9.go +++ b/core/types/bloom9.go @@ -21,8 +21,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) type bytesBacked interface { diff --git a/core/types/bloom9_test.go b/core/types/bloom9_test.go index d3178d112e..29136087d6 100644 --- a/core/types/bloom9_test.go +++ b/core/types/bloom9_test.go @@ -21,8 +21,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) func TestBloom(t *testing.T) { diff --git a/core/types/gen_access_tuple.go b/core/types/gen_access_tuple.go index d740b70981..62c47e1907 100644 --- a/core/types/gen_access_tuple.go +++ b/core/types/gen_access_tuple.go @@ -6,7 +6,7 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // MarshalJSON marshals as JSON. diff --git a/core/types/gen_account_rlp.go b/core/types/gen_account_rlp.go index 8b424493af..e3cc85147b 100644 --- a/core/types/gen_account_rlp.go +++ b/core/types/gen_account_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *StateAccount) EncodeRLP(_w io.Writer) error { diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go index fb1f915d01..90bfceb00f 100644 --- a/core/types/gen_header_json.go +++ b/core/types/gen_header_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*headerMarshaling)(nil) diff --git a/core/types/gen_header_rlp.go b/core/types/gen_header_rlp.go index ed6a1a002c..98a2fef965 100644 --- a/core/types/gen_header_rlp.go +++ b/core/types/gen_header_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Header) EncodeRLP(_w io.Writer) error { diff --git a/core/types/gen_log_json.go b/core/types/gen_log_json.go index 3ffa9c2feb..0762b5b624 100644 --- a/core/types/gen_log_json.go +++ b/core/types/gen_log_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*logMarshaling)(nil) diff --git a/core/types/gen_log_rlp.go b/core/types/gen_log_rlp.go index 7e89629668..b7e9ca9911 100644 --- a/core/types/gen_log_rlp.go +++ b/core/types/gen_log_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Log) EncodeRLP(_w io.Writer) error { diff --git a/core/types/gen_receipt_json.go b/core/types/gen_receipt_json.go index 152ecf33ce..bd31418999 100644 --- a/core/types/gen_receipt_json.go +++ b/core/types/gen_receipt_json.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*receiptMarshaling)(nil) diff --git a/core/types/gen_withdrawal_json.go b/core/types/gen_withdrawal_json.go index 983a7f7a12..8627b0bdf5 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/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*withdrawalMarshaling)(nil) diff --git a/core/types/gen_withdrawal_rlp.go b/core/types/gen_withdrawal_rlp.go index 6a97c04c81..815b587fbb 100644 --- a/core/types/gen_withdrawal_rlp.go +++ b/core/types/gen_withdrawal_rlp.go @@ -2,7 +2,7 @@ package types -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Withdrawal) EncodeRLP(_w io.Writer) error { diff --git a/core/types/hashes.go b/core/types/hashes.go index 43e9130fd1..8aa341f080 100644 --- a/core/types/hashes.go +++ b/core/types/hashes.go @@ -17,9 +17,9 @@ package types import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) var ( diff --git a/core/types/hashing.go b/core/types/hashing.go index 224d7a87ea..a90124dc08 100644 --- a/core/types/hashing.go +++ b/core/types/hashing.go @@ -22,9 +22,9 @@ import ( "math" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/core/types/hashing_test.go b/core/types/hashing_test.go index d2a98ed7bf..f842904e5d 100644 --- a/core/types/hashing_test.go +++ b/core/types/hashing_test.go @@ -24,13 +24,13 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) func TestDeriveSha(t *testing.T) { diff --git a/core/types/log.go b/core/types/log.go index 54c7ff6372..85b49c2cfc 100644 --- a/core/types/log.go +++ b/core/types/log.go @@ -17,8 +17,8 @@ package types import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) //go:generate go run ../../rlp/rlpgen -type Log -out gen_log_rlp.go diff --git a/core/types/log_test.go b/core/types/log_test.go index 02eef3ecd4..372614e782 100644 --- a/core/types/log_test.go +++ b/core/types/log_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var unmarshalLogTests = map[string]struct { diff --git a/core/types/receipt.go b/core/types/receipt.go index ff5c1b97e5..9438be5b37 100644 --- a/core/types/receipt.go +++ b/core/types/receipt.go @@ -24,11 +24,11 @@ import ( "math/big" "unsafe" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) //go:generate go run github.com/fjl/gencodec -type Receipt -field-override receiptMarshaling -out gen_receipt_json.go diff --git a/core/types/receipt_test.go b/core/types/receipt_test.go index 8fd48839b9..734cd594cc 100644 --- a/core/types/receipt_test.go +++ b/core/types/receipt_test.go @@ -24,11 +24,11 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/uint256" "github.com/kylelemons/godebug/diff" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/core/types/rlp_fuzzer_test.go b/core/types/rlp_fuzzer_test.go index a3b9f72436..70b843edb1 100644 --- a/core/types/rlp_fuzzer_test.go +++ b/core/types/rlp_fuzzer_test.go @@ -22,8 +22,8 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func decodeEncode(input []byte, val interface{}) error { diff --git a/core/types/state_account.go b/core/types/state_account.go index 52ef843b35..ebfd6a0598 100644 --- a/core/types/state_account.go +++ b/core/types/state_account.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) //go:generate go run ../../rlp/rlpgen -type StateAccount -out gen_account_rlp.go diff --git a/core/types/transaction.go b/core/types/transaction.go index 56fd8311ef..ce999c9d4d 100644 --- a/core/types/transaction.go +++ b/core/types/transaction.go @@ -25,10 +25,10 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/core/types/transaction_marshalling.go b/core/types/transaction_marshalling.go index 78c97c80ff..c740b52d63 100644 --- a/core/types/transaction_marshalling.go +++ b/core/types/transaction_marshalling.go @@ -21,10 +21,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" ) // txJSON is the JSON representation of transactions. diff --git a/core/types/transaction_signing.go b/core/types/transaction_signing.go index 675bdb4698..47a1cc75d7 100644 --- a/core/types/transaction_signing.go +++ b/core/types/transaction_signing.go @@ -22,9 +22,9 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) 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 b66577f7ed..5e7d83141d 100644 --- a/core/types/transaction_signing_test.go +++ b/core/types/transaction_signing_test.go @@ -22,10 +22,10 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func TestEIP155Signing(t *testing.T) { diff --git a/core/types/transaction_test.go b/core/types/transaction_test.go index 76a010d2e5..68a5b92efc 100644 --- a/core/types/transaction_test.go +++ b/core/types/transaction_test.go @@ -26,9 +26,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // The values in those tests are from the Transaction Tests diff --git a/core/types/tx_access_list.go b/core/types/tx_access_list.go index 730a77b752..796c1d684e 100644 --- a/core/types/tx_access_list.go +++ b/core/types/tx_access_list.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) //go:generate go run github.com/fjl/gencodec -type AccessTuple -out gen_access_tuple.go diff --git a/core/types/tx_blob.go b/core/types/tx_blob.go index 746203cb48..50197e60e1 100644 --- a/core/types/tx_blob.go +++ b/core/types/tx_blob.go @@ -21,11 +21,11 @@ import ( "crypto/sha256" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // BlobTx represents an EIP-4844 transaction. diff --git a/core/types/tx_blob_test.go b/core/types/tx_blob_test.go index 25d09e31ce..f0da67463f 100644 --- a/core/types/tx_blob_test.go +++ b/core/types/tx_blob_test.go @@ -4,10 +4,10 @@ import ( "crypto/ecdsa" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" ) // This test verifies that tx.Hash() is not affected by presence of a BlobTxSidecar. diff --git a/core/types/tx_dynamic_fee.go b/core/types/tx_dynamic_fee.go index 8b5b514fde..fb37ffae35 100644 --- a/core/types/tx_dynamic_fee.go +++ b/core/types/tx_dynamic_fee.go @@ -20,8 +20,8 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // DynamicFeeTx represents an EIP-1559 transaction. diff --git a/core/types/tx_legacy.go b/core/types/tx_legacy.go index 71025b78fc..454c986c6c 100644 --- a/core/types/tx_legacy.go +++ b/core/types/tx_legacy.go @@ -20,7 +20,7 @@ import ( "bytes" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // LegacyTx is the transaction data of the original Ethereum transactions. diff --git a/core/types/types_test.go b/core/types/types_test.go index 1fb386d5de..bc1cf19e79 100644 --- a/core/types/types_test.go +++ b/core/types/types_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) type devnull struct{ len int } diff --git a/core/types/withdrawal.go b/core/types/withdrawal.go index d1ad918f98..2bfe5e57c4 100644 --- a/core/types/withdrawal.go +++ b/core/types/withdrawal.go @@ -19,9 +19,9 @@ package types import ( "bytes" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) //go:generate go run github.com/fjl/gencodec -type Withdrawal -field-override withdrawalMarshaling -out gen_withdrawal_json.go diff --git a/core/vm/analysis_test.go b/core/vm/analysis_test.go index 398861f8ae..0934ffff45 100644 --- a/core/vm/analysis_test.go +++ b/core/vm/analysis_test.go @@ -20,7 +20,7 @@ import ( "math/bits" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) func TestJumpDestAnalysis(t *testing.T) { diff --git a/core/vm/common.go b/core/vm/common.go index 90ba4a4ad1..2376ada88d 100644 --- a/core/vm/common.go +++ b/core/vm/common.go @@ -17,9 +17,9 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) // calcMemSize64 calculates the required memory size, and returns diff --git a/core/vm/contract.go b/core/vm/contract.go index 327f7caff9..1178b3e29a 100644 --- a/core/vm/contract.go +++ b/core/vm/contract.go @@ -17,8 +17,8 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // ContractRef is a reference to the contract's backing object diff --git a/core/vm/contracts.go b/core/vm/contracts.go index 0b20cd38a3..f7665654fd 100644 --- a/core/vm/contracts.go +++ b/core/vm/contracts.go @@ -23,15 +23,15 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/blake2b" - "github.com/ethereum/go-ethereum/crypto/bls12381" - "github.com/ethereum/go-ethereum/crypto/bn256" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/crypto/secp256r1" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/blake2b" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/bls12381" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/bn256" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/secp256r1" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "golang.org/x/crypto/ripemd160" ) diff --git a/core/vm/contracts_arbitrum.go b/core/vm/contracts_arbitrum.go index f05defe191..668efc82c4 100644 --- a/core/vm/contracts_arbitrum.go +++ b/core/vm/contracts_arbitrum.go @@ -16,7 +16,7 @@ package vm -import "github.com/ethereum/go-ethereum/common" +import "github.com/paxosglobal/go-ethereum-arbitrum/common" var ( PrecompiledContractsArbitrum = make(map[common.Address]PrecompiledContract) diff --git a/core/vm/contracts_fuzz_test.go b/core/vm/contracts_fuzz_test.go index 1e5cc80074..512171c179 100644 --- a/core/vm/contracts_fuzz_test.go +++ b/core/vm/contracts_fuzz_test.go @@ -19,7 +19,7 @@ package vm import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func FuzzPrecompiledContracts(f *testing.F) { diff --git a/core/vm/contracts_test.go b/core/vm/contracts_test.go index 4d7d2b45de..b56397d4a8 100644 --- a/core/vm/contracts_test.go +++ b/core/vm/contracts_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // precompiledTest defines the input/output pairs for precompiled contract tests. diff --git a/core/vm/eips.go b/core/vm/eips.go index c3e337a67f..b03a2e6df0 100644 --- a/core/vm/eips.go +++ b/core/vm/eips.go @@ -21,9 +21,9 @@ import ( "fmt" "sort" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var activators = map[int]func(*JumpTable){ diff --git a/core/vm/evm.go b/core/vm/evm.go index c530a0ef0e..74735c5576 100644 --- a/core/vm/evm.go +++ b/core/vm/evm.go @@ -22,11 +22,11 @@ import ( "github.com/holiman/uint256" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) type ( diff --git a/core/vm/evm_arbitrum.go b/core/vm/evm_arbitrum.go index a77f2a7aa5..da4a2b84ed 100644 --- a/core/vm/evm_arbitrum.go +++ b/core/vm/evm_arbitrum.go @@ -19,9 +19,9 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Depth returns the current depth diff --git a/core/vm/gas_table.go b/core/vm/gas_table.go index 4ef945ef84..81fc526e83 100644 --- a/core/vm/gas_table.go +++ b/core/vm/gas_table.go @@ -19,9 +19,9 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/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 4a2545b6ed..ab70a1c62c 100644 --- a/core/vm/gas_table_test.go +++ b/core/vm/gas_table_test.go @@ -23,13 +23,13 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func TestMemoryGasCost(t *testing.T) { diff --git a/core/vm/instructions.go b/core/vm/instructions.go index ba938007bd..c215afcc48 100644 --- a/core/vm/instructions.go +++ b/core/vm/instructions.go @@ -19,12 +19,12 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func opAdd(pc *uint64, interpreter *EVMInterpreter, scope *ScopeContext) ([]byte, error) { diff --git a/core/vm/instructions_arbitrum.go b/core/vm/instructions_arbitrum.go index f8927b3c80..35ad559a96 100644 --- a/core/vm/instructions_arbitrum.go +++ b/core/vm/instructions_arbitrum.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // adaptation of opBlockHash that doesn't require an EVM stack diff --git a/core/vm/instructions_test.go b/core/vm/instructions_test.go index 8653864d11..b430751673 100644 --- a/core/vm/instructions_test.go +++ b/core/vm/instructions_test.go @@ -25,14 +25,14 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) type TwoOperandTestcase struct { diff --git a/core/vm/interface.go b/core/vm/interface.go index 43393b54f7..69eda4a1ce 100644 --- a/core/vm/interface.go +++ b/core/vm/interface.go @@ -19,11 +19,11 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // StateDB is an EVM database for full state querying. diff --git a/core/vm/interpreter.go b/core/vm/interpreter.go index 901425213d..d32067e6c6 100644 --- a/core/vm/interpreter.go +++ b/core/vm/interpreter.go @@ -17,11 +17,11 @@ package vm import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Config are the configuration options for the Interpreter diff --git a/core/vm/interpreter_test.go b/core/vm/interpreter_test.go index ff4977d728..beaf4616f9 100644 --- a/core/vm/interpreter_test.go +++ b/core/vm/interpreter_test.go @@ -20,13 +20,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var loopInterruptTests = []string{ diff --git a/core/vm/jump_table.go b/core/vm/jump_table.go index 65716f9442..bf36c077b8 100644 --- a/core/vm/jump_table.go +++ b/core/vm/jump_table.go @@ -19,7 +19,7 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) type ( diff --git a/core/vm/jump_table_export.go b/core/vm/jump_table_export.go index b74109da0a..f1fe17ef6d 100644 --- a/core/vm/jump_table_export.go +++ b/core/vm/jump_table_export.go @@ -19,7 +19,7 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // LookupInstructionSet returns the instruction set for the fork configured by diff --git a/core/vm/logger.go b/core/vm/logger.go index c3fdd341f7..c32bd1c638 100644 --- a/core/vm/logger.go +++ b/core/vm/logger.go @@ -19,7 +19,7 @@ package vm import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // EVMLogger is used to collect execution traces from an EVM transaction diff --git a/core/vm/memory_test.go b/core/vm/memory_test.go index ba36f8023c..7d56d6044d 100644 --- a/core/vm/memory_test.go +++ b/core/vm/memory_test.go @@ -5,7 +5,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func TestMemoryCopy(t *testing.T) { diff --git a/core/vm/operations_acl.go b/core/vm/operations_acl.go index bca6d1e83b..ace564ca62 100644 --- a/core/vm/operations_acl.go +++ b/core/vm/operations_acl.go @@ -19,9 +19,9 @@ package vm import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func makeGasSStoreFunc(clearingRefund uint64) gasFunc { diff --git a/core/vm/operations_acl_arbitrum.go b/core/vm/operations_acl_arbitrum.go index 8e0f6b90e0..7fbbce0d99 100644 --- a/core/vm/operations_acl_arbitrum.go +++ b/core/vm/operations_acl_arbitrum.go @@ -19,9 +19,9 @@ package vm import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Computes the cost of doing a state load in wasm diff --git a/core/vm/runtime/env.go b/core/vm/runtime/env.go index 621460f0e6..9fef5824cb 100644 --- a/core/vm/runtime/env.go +++ b/core/vm/runtime/env.go @@ -17,8 +17,8 @@ package runtime import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) func NewEnv(cfg *Config) *vm.EVM { diff --git a/core/vm/runtime/runtime.go b/core/vm/runtime/runtime.go index 8e398c3c2e..1ec2154712 100644 --- a/core/vm/runtime/runtime.go +++ b/core/vm/runtime/runtime.go @@ -20,14 +20,14 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // 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 b7d0ddc384..b77e16fd28 100644 --- a/core/vm/runtime/runtime_example_test.go +++ b/core/vm/runtime/runtime_example_test.go @@ -19,8 +19,8 @@ package runtime_test import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm/runtime" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm/runtime" ) func ExampleExecute() { diff --git a/core/vm/runtime/runtime_test.go b/core/vm/runtime/runtime_test.go index b9e3c8ed66..22a1883dac 100644 --- a/core/vm/runtime/runtime_test.go +++ b/core/vm/runtime/runtime_test.go @@ -23,22 +23,22 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/asm" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/asm" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/params" // force-load js tracers to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" "github.com/holiman/uint256" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/js" ) func TestDefaults(t *testing.T) { @@ -600,7 +600,7 @@ func TestEip2929Cases(t *testing.T) { // TestColdAccountAccessCost test that the cold account access cost is reported // correctly -// see: https://github.com/ethereum/go-ethereum/issues/22649 +// see: https://github.com/paxosglobal/go-ethereum-arbitrum/issues/22649 func TestColdAccountAccessCost(t *testing.T) { for i, tc := range []struct { code []byte diff --git a/core/vm/stack_table.go b/core/vm/stack_table.go index 10c12901af..f6be90a760 100644 --- a/core/vm/stack_table.go +++ b/core/vm/stack_table.go @@ -17,7 +17,7 @@ package vm import ( - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func minSwapStack(n int) int { diff --git a/crypto/bls12381/g1_test.go b/crypto/bls12381/g1_test.go index 87140459fb..e0a8b4a12d 100644 --- a/crypto/bls12381/g1_test.go +++ b/crypto/bls12381/g1_test.go @@ -6,7 +6,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func (g *G1) one() *PointG1 { diff --git a/crypto/bls12381/g2_test.go b/crypto/bls12381/g2_test.go index 4d1f3a19ac..4f47b7e1ff 100644 --- a/crypto/bls12381/g2_test.go +++ b/crypto/bls12381/g2_test.go @@ -6,7 +6,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func (g *G2) one() *PointG2 { diff --git a/crypto/bls12381/pairing_test.go b/crypto/bls12381/pairing_test.go index 77676fe9b1..bff7852770 100644 --- a/crypto/bls12381/pairing_test.go +++ b/crypto/bls12381/pairing_test.go @@ -4,7 +4,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func TestPairingExpected(t *testing.T) { diff --git a/crypto/bls12381/utils.go b/crypto/bls12381/utils.go index de8bf495fe..04a1074ef6 100644 --- a/crypto/bls12381/utils.go +++ b/crypto/bls12381/utils.go @@ -20,7 +20,7 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func bigFromHex(hex string) *big.Int { diff --git a/crypto/bn256/bn256_fast.go b/crypto/bn256/bn256_fast.go index e3c9b60518..8e6646b57a 100644 --- a/crypto/bn256/bn256_fast.go +++ b/crypto/bn256/bn256_fast.go @@ -9,7 +9,7 @@ package bn256 import ( - bn256cf "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" + bn256cf "github.com/paxosglobal/go-ethereum-arbitrum/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 4c0c351e2d..3924e0df21 100644 --- a/crypto/bn256/bn256_slow.go +++ b/crypto/bn256/bn256_slow.go @@ -8,7 +8,7 @@ // Package bn256 implements the Optimal Ate pairing over a 256-bit Barreto-Naehrig curve. package bn256 -import bn256 "github.com/ethereum/go-ethereum/crypto/bn256/google" +import bn256 "github.com/paxosglobal/go-ethereum-arbitrum/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 2492165d38..8389a8c7cc 100644 --- a/crypto/crypto.go +++ b/crypto/crypto.go @@ -29,9 +29,9 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/crypto/crypto_test.go b/crypto/crypto_test.go index da123cf980..9508111361 100644 --- a/crypto/crypto_test.go +++ b/crypto/crypto_test.go @@ -25,8 +25,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var testAddrHex = "970e8128ab834e8eac17ab8e3812f010678cf791" diff --git a/crypto/ecies/ecies_test.go b/crypto/ecies/ecies_test.go index e3da71010e..cc8c224939 100644 --- a/crypto/ecies/ecies_test.go +++ b/crypto/ecies/ecies_test.go @@ -39,7 +39,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) func TestKDF(t *testing.T) { diff --git a/crypto/ecies/params.go b/crypto/ecies/params.go index df7698ea0c..0aa1b10f88 100644 --- a/crypto/ecies/params.go +++ b/crypto/ecies/params.go @@ -43,7 +43,7 @@ import ( "fmt" "hash" - ethcrypto "github.com/ethereum/go-ethereum/crypto" + ethcrypto "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) var ( diff --git a/crypto/kzg4844/kzg4844.go b/crypto/kzg4844/kzg4844.go index 52124df674..e8375aa19b 100644 --- a/crypto/kzg4844/kzg4844.go +++ b/crypto/kzg4844/kzg4844.go @@ -24,7 +24,7 @@ import ( "reflect" "sync/atomic" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) //go:embed trusted_setup.json diff --git a/crypto/kzg4844/kzg4844_ckzg_cgo.go b/crypto/kzg4844/kzg4844_ckzg_cgo.go index 5400285698..7b9a915fed 100644 --- a/crypto/kzg4844/kzg4844_ckzg_cgo.go +++ b/crypto/kzg4844/kzg4844_ckzg_cgo.go @@ -25,7 +25,7 @@ import ( gokzg4844 "github.com/crate-crypto/go-kzg-4844" ckzg4844 "github.com/ethereum/c-kzg-4844/bindings/go" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // ckzgAvailable signals whether the library was compiled into Geth. diff --git a/crypto/secp256k1/dummy.go b/crypto/secp256k1/dummy.go index 65a75080f6..5c0afbe708 100644 --- a/crypto/secp256k1/dummy.go +++ b/crypto/secp256k1/dummy.go @@ -15,7 +15,7 @@ package secp256k1 import ( - _ "github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1/include" - _ "github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1/src" - _ "github.com/ethereum/go-ethereum/crypto/secp256k1/libsecp256k1/src/modules/recovery" + _ "github.com/paxosglobal/go-ethereum-arbitrum/crypto/secp256k1/libsecp256k1/include" + _ "github.com/paxosglobal/go-ethereum-arbitrum/crypto/secp256k1/libsecp256k1/src" + _ "github.com/paxosglobal/go-ethereum-arbitrum/crypto/secp256k1/libsecp256k1/src/modules/recovery" ) diff --git a/crypto/signature_cgo.go b/crypto/signature_cgo.go index 3a19489488..69560aed5e 100644 --- a/crypto/signature_cgo.go +++ b/crypto/signature_cgo.go @@ -25,8 +25,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/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 aecff76bfb..b8eb52c764 100644 --- a/crypto/signature_test.go +++ b/crypto/signature_test.go @@ -22,9 +22,9 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) var ( diff --git a/docs/postmortems/2021-08-22-split-postmortem.md b/docs/postmortems/2021-08-22-split-postmortem.md index 0986f00b65..044daee8a0 100644 --- a/docs/postmortems/2021-08-22-split-postmortem.md +++ b/docs/postmortems/2021-08-22-split-postmortem.md @@ -7,7 +7,7 @@ This is a post-mortem concerning the minority split that occurred on Ethereum ma - 2021-08-17: Guido Vranken submitted a bounty report. Investigation started, root cause identified, patch variations discussed. - 2021-08-18: Made public announcement over twitter about upcoming security release upcoming Tuesday. Downstream projects were also notified about the upcoming patch-release. -- 2021-08-24: Released [v1.10.8](https://github.com/ethereum/go-ethereum/releases/tag/v1.10.8) containing the fix on Tuesday morning (CET). Erigon released [v2021.08.04](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.04). +- 2021-08-24: Released [v1.10.8](https://github.com/paxosglobal/go-ethereum-arbitrum/releases/tag/v1.10.8) containing the fix on Tuesday morning (CET). Erigon released [v2021.08.04](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.04). - 2021-08-27: At 12:50:07 UTC, issue exploited. Analysis started roughly 30m later, @@ -62,7 +62,7 @@ Since we had merged the removal of `ETH65`, if the entire network were to upgrad - Announce an upcoming security release on Tuesday (August 24th), via Twitter and official channels, plus reach out to downstream projects. - Temporarily revert the `ETH65`-removal. -- Place the fix into the PR optimizing the jumpdest analysis [233381](https://github.com/ethereum/go-ethereum/pull/23381). +- Place the fix into the PR optimizing the jumpdest analysis [233381](https://github.com/paxosglobal/go-ethereum-arbitrum/pull/23381). - After 4-8 weeks, release details about the vulnerability. diff --git a/eth/api.go b/eth/api.go index 44e934fd04..44f142219f 100644 --- a/eth/api.go +++ b/eth/api.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // EthereumAPI provides an API to access Ethereum full node-related information. diff --git a/eth/api_admin.go b/eth/api_admin.go index 9620cf1b0a..72eaf9ae0b 100644 --- a/eth/api_admin.go +++ b/eth/api_admin.go @@ -24,9 +24,9 @@ import ( "os" "strings" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // AdminAPI is the collection of Ethereum full node related APIs for node diff --git a/eth/api_backend.go b/eth/api_backend.go index 01016d6f1f..d09fadc529 100644 --- a/eth/api_backend.go +++ b/eth/api_backend.go @@ -22,24 +22,24 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasprice" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // EthAPIBackend implements ethapi.Backend and tracers.Backend for full nodes diff --git a/eth/api_debug.go b/eth/api_debug.go index 601c9f39cd..23b6860296 100644 --- a/eth/api_debug.go +++ b/eth/api_debug.go @@ -22,17 +22,17 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // DebugAPI is the collection of Ethereum full node APIs for debugging the diff --git a/eth/api_debug_test.go b/eth/api_debug_test.go index 4641735cce..54e1ae6746 100644 --- a/eth/api_debug_test.go +++ b/eth/api_debug_test.go @@ -24,13 +24,13 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/exp/slices" ) diff --git a/eth/api_miner.go b/eth/api_miner.go index 2fe296548a..abf90de04d 100644 --- a/eth/api_miner.go +++ b/eth/api_miner.go @@ -20,8 +20,8 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // MinerAPI provides an API to control the miner. diff --git a/eth/backend.go b/eth/backend.go index 924aa71de1..0fec6f5a3d 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -25,39 +25,39 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/pruner" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/shutdowncheck" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/dnsdisc" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/pruner" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/blobpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasprice" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/shutdowncheck" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/dnsdisc" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Config contains the configuration options of the ETH protocol. diff --git a/eth/backend_arbitrum.go b/eth/backend_arbitrum.go index 4af923e266..0ee6b61d14 100644 --- a/eth/backend_arbitrum.go +++ b/eth/backend_arbitrum.go @@ -3,12 +3,12 @@ package eth import ( "context" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) func NewArbEthereum( diff --git a/eth/bloombits.go b/eth/bloombits.go index 1f8ae83fc1..484c3cc2d8 100644 --- a/eth/bloombits.go +++ b/eth/bloombits.go @@ -19,10 +19,10 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) const ( diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go index dbf6715984..29984828cd 100644 --- a/eth/catalyst/api.go +++ b/eth/catalyst/api.go @@ -23,18 +23,18 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params/forks" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/engine" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params/forks" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Register adds the engine API to the full node. diff --git a/eth/catalyst/api_test.go b/eth/catalyst/api_test.go index ddf71484ab..b3712b71e9 100644 --- a/eth/catalyst/api_test.go +++ b/eth/catalyst/api_test.go @@ -28,27 +28,27 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - beaconConsensus "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" "github.com/mattn/go-colorable" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/engine" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + beaconConsensus "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/eth/catalyst/queue.go b/eth/catalyst/queue.go index 634dc1b2e6..e4df08dcb6 100644 --- a/eth/catalyst/queue.go +++ b/eth/catalyst/queue.go @@ -19,10 +19,10 @@ package catalyst import ( "sync" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/engine" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" ) // maxTrackedPayloads is the maximum number of prepared payloads the execution diff --git a/eth/catalyst/simulated_beacon.go b/eth/catalyst/simulated_beacon.go index 5ad50f14c1..f2e022e87a 100644 --- a/eth/catalyst/simulated_beacon.go +++ b/eth/catalyst/simulated_beacon.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/engine" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const devEpochLength = 32 diff --git a/eth/catalyst/simulated_beacon_api.go b/eth/catalyst/simulated_beacon_api.go index 32ea3940b5..233c087c3d 100644 --- a/eth/catalyst/simulated_beacon_api.go +++ b/eth/catalyst/simulated_beacon_api.go @@ -20,10 +20,10 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) type api struct { diff --git a/eth/catalyst/simulated_beacon_test.go b/eth/catalyst/simulated_beacon_test.go index b6d37134ae..5e6209616a 100644 --- a/eth/catalyst/simulated_beacon_test.go +++ b/eth/catalyst/simulated_beacon_test.go @@ -22,16 +22,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func startSimulatedBeaconEthService(t *testing.T, genesis *core.Genesis) (*node.Node, *eth.Ethereum, *SimulatedBeacon) { diff --git a/eth/catalyst/tester.go b/eth/catalyst/tester.go index 0922ac0ba6..f80c3500d8 100644 --- a/eth/catalyst/tester.go +++ b/eth/catalyst/tester.go @@ -20,11 +20,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" ) // FullSyncTester is an auxiliary service that allows Geth to perform full sync diff --git a/eth/downloader/api.go b/eth/downloader/api.go index f09122904c..f00a529323 100644 --- a/eth/downloader/api.go +++ b/eth/downloader/api.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // DownloaderAPI provides an API which gives information about the current diff --git a/eth/downloader/beacondevsync.go b/eth/downloader/beacondevsync.go index 9a38fedd46..0761118a2c 100644 --- a/eth/downloader/beacondevsync.go +++ b/eth/downloader/beacondevsync.go @@ -20,8 +20,8 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // BeaconDevSync is a development helper to test synchronization by providing diff --git a/eth/downloader/beaconsync.go b/eth/downloader/beaconsync.go index d3f75c8527..b0a8d0978d 100644 --- a/eth/downloader/beaconsync.go +++ b/eth/downloader/beaconsync.go @@ -21,10 +21,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // beaconBackfiller is the chain and state backfilling that can be commenced once diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go index 8d449246a6..e11f1ed554 100644 --- a/eth/downloader/downloader.go +++ b/eth/downloader/downloader.go @@ -25,17 +25,17 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/eth/downloader/downloader_test.go b/eth/downloader/downloader_test.go index f8abfd2b22..77269abdf8 100644 --- a/eth/downloader/downloader_test.go +++ b/eth/downloader/downloader_test.go @@ -26,20 +26,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // downloadTester is a test simulator for mocking out local block chain. diff --git a/eth/downloader/events.go b/eth/downloader/events.go index 25255a3a72..ed86662a0d 100644 --- a/eth/downloader/events.go +++ b/eth/downloader/events.go @@ -16,7 +16,7 @@ package downloader -import "github.com/ethereum/go-ethereum/core/types" +import "github.com/paxosglobal/go-ethereum-arbitrum/core/types" type DoneEvent struct { Latest *types.Header diff --git a/eth/downloader/fetchers.go b/eth/downloader/fetchers.go index cc4279b0da..b115b1020c 100644 --- a/eth/downloader/fetchers.go +++ b/eth/downloader/fetchers.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" ) // fetchHeadersByHash is a blocking version of Peer.RequestHeadersByHash which diff --git a/eth/downloader/fetchers_concurrent.go b/eth/downloader/fetchers_concurrent.go index 649aa27615..11f1a3ab0c 100644 --- a/eth/downloader/fetchers_concurrent.go +++ b/eth/downloader/fetchers_concurrent.go @@ -21,10 +21,10 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // timeoutGracePeriod is the amount of time to allow for a peer to deliver a diff --git a/eth/downloader/fetchers_concurrent_bodies.go b/eth/downloader/fetchers_concurrent_bodies.go index 5105fda66b..c553f0f9bf 100644 --- a/eth/downloader/fetchers_concurrent_bodies.go +++ b/eth/downloader/fetchers_concurrent_bodies.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // bodyQueue implements typedQueue and is a type adapter between the generic diff --git a/eth/downloader/fetchers_concurrent_headers.go b/eth/downloader/fetchers_concurrent_headers.go index 8201f4ca74..3531dfdd2c 100644 --- a/eth/downloader/fetchers_concurrent_headers.go +++ b/eth/downloader/fetchers_concurrent_headers.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // headerQueue implements typedQueue and is a type adapter between the generic diff --git a/eth/downloader/fetchers_concurrent_receipts.go b/eth/downloader/fetchers_concurrent_receipts.go index 3169f030ba..3369aa46a2 100644 --- a/eth/downloader/fetchers_concurrent_receipts.go +++ b/eth/downloader/fetchers_concurrent_receipts.go @@ -19,9 +19,9 @@ package downloader import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // receiptQueue implements typedQueue and is a type adapter between the generic diff --git a/eth/downloader/metrics.go b/eth/downloader/metrics.go index 23c033a8ad..4613ec3ead 100644 --- a/eth/downloader/metrics.go +++ b/eth/downloader/metrics.go @@ -19,7 +19,7 @@ package downloader import ( - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go index 4c43af5270..c08de5a0c3 100644 --- a/eth/downloader/peer.go +++ b/eth/downloader/peer.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/msgrate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/msgrate" ) const ( diff --git a/eth/downloader/queue.go b/eth/downloader/queue.go index 6ff858d755..21c6e61844 100644 --- a/eth/downloader/queue.go +++ b/eth/downloader/queue.go @@ -26,13 +26,13 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) const ( diff --git a/eth/downloader/queue_test.go b/eth/downloader/queue_test.go index 50b9031a27..90499da368 100644 --- a/eth/downloader/queue_test.go +++ b/eth/downloader/queue_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/exp/slog" ) diff --git a/eth/downloader/resultstore.go b/eth/downloader/resultstore.go index e4323c04eb..e8d01107ca 100644 --- a/eth/downloader/resultstore.go +++ b/eth/downloader/resultstore.go @@ -21,7 +21,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // resultStore implements a structure for maintaining fetchResults, tracking their diff --git a/eth/downloader/skeleton.go b/eth/downloader/skeleton.go index 873ee950b6..afa43f6142 100644 --- a/eth/downloader/skeleton.go +++ b/eth/downloader/skeleton.go @@ -24,12 +24,12 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // scratchHeaders is the number of headers to store in a scratch space to allow diff --git a/eth/downloader/skeleton_test.go b/eth/downloader/skeleton_test.go index 2b108dfe93..e3724cffae 100644 --- a/eth/downloader/skeleton_test.go +++ b/eth/downloader/skeleton_test.go @@ -25,11 +25,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // hookedBackfiller is a tester backfiller with all interface methods mocked and diff --git a/eth/downloader/statesync.go b/eth/downloader/statesync.go index 501af63ed5..6d366abf63 100644 --- a/eth/downloader/statesync.go +++ b/eth/downloader/statesync.go @@ -19,8 +19,8 @@ package downloader import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // syncState starts downloading state with the given root hash. diff --git a/eth/downloader/testchain_test.go b/eth/downloader/testchain_test.go index 9da3c7b1b8..3aa23f6416 100644 --- a/eth/downloader/testchain_test.go +++ b/eth/downloader/testchain_test.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) // Test chain parameters. diff --git a/eth/ethconfig/config.go b/eth/ethconfig/config.go index ad664afb5b..eb9b85c233 100644 --- a/eth/ethconfig/config.go +++ b/eth/ethconfig/config.go @@ -21,19 +21,19 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/blobpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasprice" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // FullNodeGPO contains default gasprice oracle settings for full node. diff --git a/eth/ethconfig/config_arbitrum.go b/eth/ethconfig/config_arbitrum.go index f80d99ce2c..d18f70fef5 100644 --- a/eth/ethconfig/config_arbitrum.go +++ b/eth/ethconfig/config_arbitrum.go @@ -16,7 +16,7 @@ package ethconfig -import "github.com/ethereum/go-ethereum/eth/downloader" +import "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" // The default config with archive mode enabled var ArchiveDefaults = Defaults diff --git a/eth/ethconfig/gen_config.go b/eth/ethconfig/gen_config.go index 2abddc9e0d..766eff2045 100644 --- a/eth/ethconfig/gen_config.go +++ b/eth/ethconfig/gen_config.go @@ -5,13 +5,13 @@ package ethconfig import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/txpool/blobpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/gasprice" - "github.com/ethereum/go-ethereum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/blobpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasprice" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" ) // MarshalTOML marshals as TOML. diff --git a/eth/fetcher/block_fetcher.go b/eth/fetcher/block_fetcher.go index 126eaaea7f..c41b587f61 100644 --- a/eth/fetcher/block_fetcher.go +++ b/eth/fetcher/block_fetcher.go @@ -22,14 +22,14 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) const ( diff --git a/eth/fetcher/block_fetcher_test.go b/eth/fetcher/block_fetcher_test.go index 6927300b1d..f392054585 100644 --- a/eth/fetcher/block_fetcher_test.go +++ b/eth/fetcher/block_fetcher_test.go @@ -24,15 +24,15 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/eth/fetcher/tx_fetcher.go b/eth/fetcher/tx_fetcher.go index ea7892d8d8..b3a20eabaa 100644 --- a/eth/fetcher/tx_fetcher.go +++ b/eth/fetcher/tx_fetcher.go @@ -25,13 +25,13 @@ import ( "sort" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) const ( diff --git a/eth/fetcher/tx_fetcher_test.go b/eth/fetcher/tx_fetcher_test.go index 4a62e579b6..447f5aa69b 100644 --- a/eth/fetcher/tx_fetcher_test.go +++ b/eth/fetcher/tx_fetcher_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/eth/filters/api.go b/eth/filters/api.go index 8cf701ec57..52b5babd55 100644 --- a/eth/filters/api.go +++ b/eth/filters/api.go @@ -25,12 +25,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) var ( diff --git a/eth/filters/api_test.go b/eth/filters/api_test.go index 822bc826f6..4c3acb1199 100644 --- a/eth/filters/api_test.go +++ b/eth/filters/api_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) func TestUnmarshalJSONNewFilterArgs(t *testing.T) { diff --git a/eth/filters/bench_test.go b/eth/filters/bench_test.go index 73b96b77af..4770258c79 100644 --- a/eth/filters/bench_test.go +++ b/eth/filters/bench_test.go @@ -22,13 +22,13 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/node" ) func BenchmarkBloomBits512(b *testing.B) { diff --git a/eth/filters/filter.go b/eth/filters/filter.go index 83e3284a2b..9d849af54e 100644 --- a/eth/filters/filter.go +++ b/eth/filters/filter.go @@ -21,10 +21,10 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Filter can be used to retrieve and filter logs. diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go index f98a1f84ce..4a1bc9f8ed 100644 --- a/eth/filters/filter_system.go +++ b/eth/filters/filter_system.go @@ -25,18 +25,18 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Config represents the configuration of the filter system. diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go index 27cad8826a..7c22093245 100644 --- a/eth/filters/filter_system_test.go +++ b/eth/filters/filter_system_test.go @@ -27,19 +27,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type testBackend struct { diff --git a/eth/filters/filter_test.go b/eth/filters/filter_test.go index 7d981da6e7..f21480b340 100644 --- a/eth/filters/filter_test.go +++ b/eth/filters/filter_test.go @@ -24,17 +24,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) func makeReceipt(addr common.Address) *types.Receipt { diff --git a/eth/gasestimator/gasestimator.go b/eth/gasestimator/gasestimator.go index f6d8358574..1b86bd513b 100644 --- a/eth/gasestimator/gasestimator.go +++ b/eth/gasestimator/gasestimator.go @@ -23,13 +23,13 @@ import ( "math" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // EstimateGasErrorRatio is the amount of overestimation eth_estimateGas is diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go index d657eb6d99..d8b674e838 100644 --- a/eth/gasprice/feehistory.go +++ b/eth/gasprice/feehistory.go @@ -25,11 +25,11 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "golang.org/x/exp/slices" ) diff --git a/eth/gasprice/feehistory_test.go b/eth/gasprice/feehistory_test.go index 1bcfb287a5..662083a972 100644 --- a/eth/gasprice/feehistory_test.go +++ b/eth/gasprice/feehistory_test.go @@ -22,7 +22,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) func TestFeeHistory(t *testing.T) { diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go index b719649811..d688bade25 100644 --- a/eth/gasprice/gasprice.go +++ b/eth/gasprice/gasprice.go @@ -21,14 +21,14 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "golang.org/x/exp/slices" ) diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go index 5f2a46d73a..7b7758e39c 100644 --- a/eth/gasprice/gasprice_test.go +++ b/eth/gasprice/gasprice_test.go @@ -22,16 +22,16 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const testHead = 32 diff --git a/eth/handler.go b/eth/handler.go index a327af6113..80966a138c 100644 --- a/eth/handler.go +++ b/eth/handler.go @@ -24,24 +24,24 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/fetcher" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/fetcher" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) const ( diff --git a/eth/handler_eth.go b/eth/handler_eth.go index f1284c10e6..b9a2ef8d6c 100644 --- a/eth/handler_eth.go +++ b/eth/handler_eth.go @@ -22,11 +22,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // ethHandler implements the eth.Backend interface to handle the various network diff --git a/eth/handler_eth_test.go b/eth/handler_eth_test.go index 194a43ee33..0bc993d409 100644 --- a/eth/handler_eth_test.go +++ b/eth/handler_eth_test.go @@ -22,20 +22,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // testEthHandler is a mock event handler to listen for inbound network requests diff --git a/eth/handler_snap.go b/eth/handler_snap.go index 767416ffd6..457955d388 100644 --- a/eth/handler_snap.go +++ b/eth/handler_snap.go @@ -17,9 +17,9 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // snapHandler implements the snap.Backend interface to handle the various network diff --git a/eth/handler_test.go b/eth/handler_test.go index f907c81633..fe9a8b6073 100644 --- a/eth/handler_test.go +++ b/eth/handler_test.go @@ -21,19 +21,19 @@ import ( "sort" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/eth/peer.go b/eth/peer.go index 7618777716..43eb5f6edf 100644 --- a/eth/peer.go +++ b/eth/peer.go @@ -17,8 +17,8 @@ package eth import ( - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" ) // ethPeerInfo represents a short summary of the `eth` sub-protocol metadata known diff --git a/eth/peerset.go b/eth/peerset.go index c0c11e3e85..fe6943faf2 100644 --- a/eth/peerset.go +++ b/eth/peerset.go @@ -22,10 +22,10 @@ import ( "math/big" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" ) var ( diff --git a/eth/protocols/eth/broadcast.go b/eth/protocols/eth/broadcast.go index ad5395cb8d..4764b4d01c 100644 --- a/eth/protocols/eth/broadcast.go +++ b/eth/protocols/eth/broadcast.go @@ -19,8 +19,8 @@ package eth import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) const ( diff --git a/eth/protocols/eth/discovery.go b/eth/protocols/eth/discovery.go index a7bdd47daf..1df3a82948 100644 --- a/eth/protocols/eth/discovery.go +++ b/eth/protocols/eth/discovery.go @@ -17,10 +17,10 @@ package eth import ( - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // enrEntry is the ENR entry which advertises `eth` protocol on the discovery. diff --git a/eth/protocols/eth/dispatcher.go b/eth/protocols/eth/dispatcher.go index ae98820cd6..e59b174ba9 100644 --- a/eth/protocols/eth/dispatcher.go +++ b/eth/protocols/eth/dispatcher.go @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" ) var ( diff --git a/eth/protocols/eth/handler.go b/eth/protocols/eth/handler.go index 54e7972a44..07d11cd4fc 100644 --- a/eth/protocols/eth/handler.go +++ b/eth/protocols/eth/handler.go @@ -21,14 +21,14 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) const ( diff --git a/eth/protocols/eth/handler_test.go b/eth/protocols/eth/handler_test.go index f003ff2528..214e80ce5c 100644 --- a/eth/protocols/eth/handler_test.go +++ b/eth/protocols/eth/handler_test.go @@ -22,21 +22,21 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/eth/protocols/eth/handlers.go b/eth/protocols/eth/handlers.go index 0275708a6c..9cba79ac0e 100644 --- a/eth/protocols/eth/handlers.go +++ b/eth/protocols/eth/handlers.go @@ -20,12 +20,12 @@ import ( "encoding/json" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) func handleGetBlockHeaders(backend Backend, msg Decoder, peer *Peer) error { diff --git a/eth/protocols/eth/handshake.go b/eth/protocols/eth/handshake.go index ea16a85b1e..8434ec72dd 100644 --- a/eth/protocols/eth/handshake.go +++ b/eth/protocols/eth/handshake.go @@ -22,10 +22,10 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" ) const ( diff --git a/eth/protocols/eth/handshake_test.go b/eth/protocols/eth/handshake_test.go index b9fd13d863..23631dd734 100644 --- a/eth/protocols/eth/handshake_test.go +++ b/eth/protocols/eth/handshake_test.go @@ -20,10 +20,10 @@ import ( "errors" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // Tests that handshake failures are detected and reported correctly. diff --git a/eth/protocols/eth/metrics.go b/eth/protocols/eth/metrics.go index 5e0aee39f8..11c1949112 100644 --- a/eth/protocols/eth/metrics.go +++ b/eth/protocols/eth/metrics.go @@ -16,7 +16,7 @@ package eth -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/paxosglobal/go-ethereum-arbitrum/metrics" // meters stores ingress and egress handshake meters. var meters bidirectionalMeters diff --git a/eth/protocols/eth/peer.go b/eth/protocols/eth/peer.go index caa5239cf9..199925c1d1 100644 --- a/eth/protocols/eth/peer.go +++ b/eth/protocols/eth/peer.go @@ -22,10 +22,10 @@ import ( "sync" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) const ( diff --git a/eth/protocols/eth/peer_test.go b/eth/protocols/eth/peer_test.go index efbbbc6fff..8c65f924b7 100644 --- a/eth/protocols/eth/peer_test.go +++ b/eth/protocols/eth/peer_test.go @@ -23,9 +23,9 @@ import ( "crypto/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // testPeer is a simulated peer to allow testing direct network calls. diff --git a/eth/protocols/eth/protocol.go b/eth/protocols/eth/protocol.go index 47e8d97244..841495a441 100644 --- a/eth/protocols/eth/protocol.go +++ b/eth/protocols/eth/protocol.go @@ -22,10 +22,10 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/forkid" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/forkid" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocols/eth/protocol_test.go b/eth/protocols/eth/protocol_test.go index bc2545dea2..7b74b4b100 100644 --- a/eth/protocols/eth/protocol_test.go +++ b/eth/protocols/eth/protocol_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Tests that the custom union field encoder and decoder works correctly. diff --git a/eth/protocols/eth/tracker.go b/eth/protocols/eth/tracker.go index 324fd22839..fde2c0b259 100644 --- a/eth/protocols/eth/tracker.go +++ b/eth/protocols/eth/tracker.go @@ -19,7 +19,7 @@ package eth import ( "time" - "github.com/ethereum/go-ethereum/p2p/tracker" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/tracker" ) // requestTracker is a singleton tracker for eth/66 and newer request times. diff --git a/eth/protocols/snap/discovery.go b/eth/protocols/snap/discovery.go index 684ec7e632..549bf20691 100644 --- a/eth/protocols/snap/discovery.go +++ b/eth/protocols/snap/discovery.go @@ -17,7 +17,7 @@ package snap import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // enrEntry is the ENR entry which advertises `snap` protocol on the discovery. diff --git a/eth/protocols/snap/handler.go b/eth/protocols/snap/handler.go index 968fcfbfa5..c8fbe2bf31 100644 --- a/eth/protocols/snap/handler.go +++ b/eth/protocols/snap/handler.go @@ -21,16 +21,16 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) const ( diff --git a/eth/protocols/snap/handler_fuzzing_test.go b/eth/protocols/snap/handler_fuzzing_test.go index ddc7a44a2a..373a5be192 100644 --- a/eth/protocols/snap/handler_fuzzing_test.go +++ b/eth/protocols/snap/handler_fuzzing_test.go @@ -24,16 +24,16 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" fuzz "github.com/google/gofuzz" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func FuzzARange(f *testing.F) { diff --git a/eth/protocols/snap/metrics.go b/eth/protocols/snap/metrics.go index a7d071953f..7d89a1ca6d 100644 --- a/eth/protocols/snap/metrics.go +++ b/eth/protocols/snap/metrics.go @@ -17,7 +17,7 @@ package snap import ( - metrics "github.com/ethereum/go-ethereum/metrics" + metrics "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/eth/protocols/snap/peer.go b/eth/protocols/snap/peer.go index 3db6e22cbd..83bb774d07 100644 --- a/eth/protocols/snap/peer.go +++ b/eth/protocols/snap/peer.go @@ -17,9 +17,9 @@ package snap import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" ) // Peer is a collection of relevant information we have about a `snap` peer. diff --git a/eth/protocols/snap/protocol.go b/eth/protocols/snap/protocol.go index 0db206b081..9d1ffad6c6 100644 --- a/eth/protocols/snap/protocol.go +++ b/eth/protocols/snap/protocol.go @@ -20,9 +20,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Constants to match up protocol versions and messages diff --git a/eth/protocols/snap/range.go b/eth/protocols/snap/range.go index 8c98c71d50..7733bd6f46 100644 --- a/eth/protocols/snap/range.go +++ b/eth/protocols/snap/range.go @@ -19,8 +19,8 @@ package snap import ( "math/big" - "github.com/ethereum/go-ethereum/common" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // hashRange is a utility to handle ranges of hashes, Split up the diff --git a/eth/protocols/snap/range_test.go b/eth/protocols/snap/range_test.go index ea643f1361..18afdabaf9 100644 --- a/eth/protocols/snap/range_test.go +++ b/eth/protocols/snap/range_test.go @@ -19,7 +19,7 @@ package snap import ( "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // Tests that given a starting hash and a density, the hash ranger can correctly diff --git a/eth/protocols/snap/sort_test.go b/eth/protocols/snap/sort_test.go index be0a8c5706..d4114f2774 100644 --- a/eth/protocols/snap/sort_test.go +++ b/eth/protocols/snap/sort_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func hexToNibbles(s string) []byte { diff --git a/eth/protocols/snap/sync.go b/eth/protocols/snap/sync.go index 887a50775d..6b2abea21f 100644 --- a/eth/protocols/snap/sync.go +++ b/eth/protocols/snap/sync.go @@ -29,19 +29,19 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/msgrate" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/msgrate" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/eth/protocols/snap/sync_test.go b/eth/protocols/snap/sync_test.go index 73d61c2ffd..47c35012bd 100644 --- a/eth/protocols/snap/sync_test.go +++ b/eth/protocols/snap/sync_test.go @@ -27,18 +27,18 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/testutil" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" ) diff --git a/eth/protocols/snap/tracker.go b/eth/protocols/snap/tracker.go index 2cf59cc23a..65e980d405 100644 --- a/eth/protocols/snap/tracker.go +++ b/eth/protocols/snap/tracker.go @@ -19,7 +19,7 @@ package snap import ( "time" - "github.com/ethereum/go-ethereum/p2p/tracker" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/tracker" ) // requestTracker is a singleton tracker for request times. diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 3e76c01c83..9ca9038cee 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -22,16 +22,16 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) var ( diff --git a/eth/sync.go b/eth/sync.go index c2a0f453bf..4be1c9d506 100644 --- a/eth/sync.go +++ b/eth/sync.go @@ -21,11 +21,11 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) const ( diff --git a/eth/sync_test.go b/eth/sync_test.go index a31986730f..bad3f71cd1 100644 --- a/eth/sync_test.go +++ b/eth/sync_test.go @@ -20,11 +20,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/eth/protocols/snap" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // Tests that snap sync is disabled after a successful sync cycle. diff --git a/eth/tracers/api.go b/eth/tracers/api.go index e6c7adadec..8c124caaa6 100644 --- a/eth/tracers/api.go +++ b/eth/tracers/api.go @@ -27,21 +27,21 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const ( diff --git a/eth/tracers/api_test.go b/eth/tracers/api_test.go index 18e9153374..d4dfc8c853 100644 --- a/eth/tracers/api_test.go +++ b/eth/tracers/api_test.go @@ -28,21 +28,21 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "golang.org/x/exp/slices" ) diff --git a/eth/tracers/internal/tracetest/calltrace_test.go b/eth/tracers/internal/tracetest/calltrace_test.go index a43ea1ff86..a6827ae200 100644 --- a/eth/tracers/internal/tracetest/calltrace_test.go +++ b/eth/tracers/internal/tracetest/calltrace_test.go @@ -24,17 +24,17 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" ) type callContext struct { diff --git a/eth/tracers/internal/tracetest/flat_calltrace_test.go b/eth/tracers/internal/tracetest/flat_calltrace_test.go index 124cc9b38a..c92d0142ba 100644 --- a/eth/tracers/internal/tracetest/flat_calltrace_test.go +++ b/eth/tracers/internal/tracetest/flat_calltrace_test.go @@ -10,17 +10,17 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" // Force-load the native, to trigger registration - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" ) // flatCallTrace is the result of a callTracerParity run. diff --git a/eth/tracers/internal/tracetest/prestate_test.go b/eth/tracers/internal/tracetest/prestate_test.go index b8c239d0d7..7cf7008d02 100644 --- a/eth/tracers/internal/tracetest/prestate_test.go +++ b/eth/tracers/internal/tracetest/prestate_test.go @@ -24,13 +24,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" ) // 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 95d292c924..7c068196e6 100644 --- a/eth/tracers/internal/tracetest/util.go +++ b/eth/tracers/internal/tracetest/util.go @@ -5,8 +5,8 @@ import ( "unicode" // Force-load native and js packages, to trigger registration - _ "github.com/ethereum/go-ethereum/eth/tracers/js" - _ "github.com/ethereum/go-ethereum/eth/tracers/native" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/js" + _ "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/native" ) // 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 bf7a48a634..89ce0a61a7 100644 --- a/eth/tracers/js/goja.go +++ b/eth/tracers/js/goja.go @@ -24,12 +24,12 @@ import ( "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers" - jsassets "github.com/ethereum/go-ethereum/eth/tracers/js/internal/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + jsassets "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/js/internal/tracers" ) var assetTracers = make(map[string]string) diff --git a/eth/tracers/js/tracer_arbitrum.go b/eth/tracers/js/tracer_arbitrum.go index 093b6d3540..2b4424a410 100644 --- a/eth/tracers/js/tracer_arbitrum.go +++ b/eth/tracers/js/tracer_arbitrum.go @@ -20,8 +20,8 @@ import ( "math/big" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) func (jst *jsTracer) CaptureArbitrumTransfer( diff --git a/eth/tracers/js/tracer_test.go b/eth/tracers/js/tracer_test.go index b7f2693770..36683cf27d 100644 --- a/eth/tracers/js/tracer_test.go +++ b/eth/tracers/js/tracer_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) type account struct{} diff --git a/eth/tracers/logger/access_list_tracer.go b/eth/tracers/logger/access_list_tracer.go index 766ee4e4b9..d969048539 100644 --- a/eth/tracers/logger/access_list_tracer.go +++ b/eth/tracers/logger/access_list_tracer.go @@ -19,9 +19,9 @@ package logger import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) // accessList is an accumulator for the set of accounts and storage slots an EVM diff --git a/eth/tracers/logger/gen_structlog.go b/eth/tracers/logger/gen_structlog.go index b406cb3445..5b13cf22b0 100644 --- a/eth/tracers/logger/gen_structlog.go +++ b/eth/tracers/logger/gen_structlog.go @@ -5,10 +5,10 @@ package logger import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" "github.com/holiman/uint256" ) diff --git a/eth/tracers/logger/logger.go b/eth/tracers/logger/logger.go index 2b36f9f492..05b58e8589 100644 --- a/eth/tracers/logger/logger.go +++ b/eth/tracers/logger/logger.go @@ -25,13 +25,13 @@ import ( "strings" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Storage represents a contract's storage. diff --git a/eth/tracers/logger/logger_arbitrum.go b/eth/tracers/logger/logger_arbitrum.go index 6c48146897..788769f181 100644 --- a/eth/tracers/logger/logger_arbitrum.go +++ b/eth/tracers/logger/logger_arbitrum.go @@ -19,8 +19,8 @@ package logger import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) func (*AccessListTracer) CaptureArbitrumTransfer(env *vm.EVM, from, to *common.Address, value *big.Int, before bool, purpose string) { diff --git a/eth/tracers/logger/logger_json.go b/eth/tracers/logger/logger_json.go index a2cb4cd9fc..ef58496572 100644 --- a/eth/tracers/logger/logger_json.go +++ b/eth/tracers/logger/logger_json.go @@ -21,9 +21,9 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) type JSONLogger struct { diff --git a/eth/tracers/logger/logger_test.go b/eth/tracers/logger/logger_test.go index 1d8eb320f6..8292953d2f 100644 --- a/eth/tracers/logger/logger_test.go +++ b/eth/tracers/logger/logger_test.go @@ -22,11 +22,11 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) type dummyContractRef struct { @@ -77,7 +77,7 @@ func TestStoreCapture(t *testing.T) { } // Tests that blank fields don't appear in logs when JSON marshalled, to reduce -// logs bloat and confusion. See https://github.com/ethereum/go-ethereum/issues/24487 +// logs bloat and confusion. See https://github.com/paxosglobal/go-ethereum-arbitrum/issues/24487 func TestStructLogMarshalingOmitEmpty(t *testing.T) { tests := []struct { name string diff --git a/eth/tracers/native/4byte.go b/eth/tracers/native/4byte.go index ddc0b56904..576bfd5921 100644 --- a/eth/tracers/native/4byte.go +++ b/eth/tracers/native/4byte.go @@ -22,9 +22,9 @@ import ( "strconv" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" ) func init() { diff --git a/eth/tracers/native/call.go b/eth/tracers/native/call.go index 9e4ec6a5c0..c2cb5f58cb 100644 --- a/eth/tracers/native/call.go +++ b/eth/tracers/native/call.go @@ -22,12 +22,12 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) //go:generate go run github.com/fjl/gencodec -type callFrame -field-override callFrameMarshaling -out gen_callframe_json.go @@ -41,7 +41,7 @@ type callLog struct { Topics []common.Hash `json:"topics"` Data hexutil.Bytes `json:"data"` // Position of the log relative to subcalls within the same trace - // See https://github.com/ethereum/go-ethereum/pull/28389 for details + // See https://github.com/paxosglobal/go-ethereum-arbitrum/pull/28389 for details Position hexutil.Uint `json:"position"` } diff --git a/eth/tracers/native/call_flat.go b/eth/tracers/native/call_flat.go index 3d888decc3..9a172c8635 100644 --- a/eth/tracers/native/call_flat.go +++ b/eth/tracers/native/call_flat.go @@ -24,10 +24,10 @@ import ( "strings" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" ) //go:generate go run github.com/fjl/gencodec -type flatCallAction -field-override flatCallActionMarshaling -out gen_flatcallaction_json.go diff --git a/eth/tracers/native/gen_account_json.go b/eth/tracers/native/gen_account_json.go index 4c39cbc38c..d91d452ea3 100644 --- a/eth/tracers/native/gen_account_json.go +++ b/eth/tracers/native/gen_account_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*accountMarshaling)(nil) diff --git a/eth/tracers/native/gen_callframe_json.go b/eth/tracers/native/gen_callframe_json.go index ceb652b32e..669d388cae 100644 --- a/eth/tracers/native/gen_callframe_json.go +++ b/eth/tracers/native/gen_callframe_json.go @@ -6,9 +6,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) var _ = (*callFrameMarshaling)(nil) diff --git a/eth/tracers/native/gen_flatcallaction_json.go b/eth/tracers/native/gen_flatcallaction_json.go index c075606983..e0c299f12b 100644 --- a/eth/tracers/native/gen_flatcallaction_json.go +++ b/eth/tracers/native/gen_flatcallaction_json.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*flatCallActionMarshaling)(nil) diff --git a/eth/tracers/native/gen_flatcallresult_json.go b/eth/tracers/native/gen_flatcallresult_json.go index e9fa5e44da..7f6f6937f3 100644 --- a/eth/tracers/native/gen_flatcallresult_json.go +++ b/eth/tracers/native/gen_flatcallresult_json.go @@ -5,8 +5,8 @@ package native import ( "encoding/json" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var _ = (*flatCallResultMarshaling)(nil) diff --git a/eth/tracers/native/mux.go b/eth/tracers/native/mux.go index e487c5a7fe..c9cf03e8e5 100644 --- a/eth/tracers/native/mux.go +++ b/eth/tracers/native/mux.go @@ -20,9 +20,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" ) func init() { diff --git a/eth/tracers/native/noop.go b/eth/tracers/native/noop.go index 3beecd8abf..d77e3e2c4b 100644 --- a/eth/tracers/native/noop.go +++ b/eth/tracers/native/noop.go @@ -20,9 +20,9 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" ) func init() { diff --git a/eth/tracers/native/prestate.go b/eth/tracers/native/prestate.go index d7e10173cf..295ff96ea0 100644 --- a/eth/tracers/native/prestate.go +++ b/eth/tracers/native/prestate.go @@ -22,12 +22,12 @@ import ( "math/big" "sync/atomic" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) //go:generate go run github.com/fjl/gencodec -type account -field-override accountMarshaling -out gen_account_json.go diff --git a/eth/tracers/native/tracer_arbitrum.go b/eth/tracers/native/tracer_arbitrum.go index 8c17c436cf..6fac1f014c 100644 --- a/eth/tracers/native/tracer_arbitrum.go +++ b/eth/tracers/native/tracer_arbitrum.go @@ -19,8 +19,8 @@ package native import ( "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) type arbitrumTransfer struct { diff --git a/eth/tracers/tracers.go b/eth/tracers/tracers.go index 7b43b7cf83..e84c213dbc 100644 --- a/eth/tracers/tracers.go +++ b/eth/tracers/tracers.go @@ -23,8 +23,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/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 09aa5010cd..6739f18f7b 100644 --- a/eth/tracers/tracers_test.go +++ b/eth/tracers/tracers_test.go @@ -20,15 +20,15 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/tests" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/tests" ) func BenchmarkTransactionTrace(b *testing.B) { diff --git a/ethclient/ethclient.go b/ethclient/ethclient.go index 6e7e2e1599..b14d306f29 100644 --- a/ethclient/ethclient.go +++ b/ethclient/ethclient.go @@ -24,11 +24,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Client defines typed wrappers for the Ethereum RPC API. diff --git a/ethclient/ethclient_test.go b/ethclient/ethclient_test.go index fd053c1d73..4215edf0b4 100644 --- a/ethclient/ethclient_test.go +++ b/ethclient/ethclient_test.go @@ -25,17 +25,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Verify that Client implements the ethereum interfaces. diff --git a/ethclient/gethclient/gethclient.go b/ethclient/gethclient/gethclient.go index 73d05d499e..297ecaa359 100644 --- a/ethclient/gethclient/gethclient.go +++ b/ethclient/gethclient/gethclient.go @@ -25,12 +25,12 @@ import ( "runtime" "runtime/debug" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Client is a wrapper around rpc.Client that implements geth-specific functionality. diff --git a/ethclient/gethclient/gethclient_test.go b/ethclient/gethclient/gethclient_test.go index dbe2310a62..74db902ddc 100644 --- a/ethclient/gethclient/gethclient_test.go +++ b/ethclient/gethclient/gethclient_test.go @@ -23,19 +23,19 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/ethclient" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) var ( diff --git a/ethclient/signer.go b/ethclient/signer.go index f827d4eb56..6da47e2c34 100644 --- a/ethclient/signer.go +++ b/ethclient/signer.go @@ -20,8 +20,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // senderFromServer is a types.Signer that remembers the sender address returned by the RPC diff --git a/ethclient/simulated/backend.go b/ethclient/simulated/backend.go index 6169dde61b..9fee5127ed 100644 --- a/ethclient/simulated/backend.go +++ b/ethclient/simulated/backend.go @@ -19,19 +19,19 @@ package simulated import ( "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/catalyst" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/ethclient" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/catalyst" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/ethclient" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Client exposes the methods provided by the Ethereum RPC client. diff --git a/ethclient/simulated/backend_test.go b/ethclient/simulated/backend_test.go index 49b1065ec5..cc52781ad0 100644 --- a/ethclient/simulated/backend_test.go +++ b/ethclient/simulated/backend_test.go @@ -24,12 +24,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/abi/bind" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi/bind" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var _ bind.ContractBackend = (Client)(nil) diff --git a/ethclient/simulated/options.go b/ethclient/simulated/options.go index 6db995c917..8b6ed3001b 100644 --- a/ethclient/simulated/options.go +++ b/ethclient/simulated/options.go @@ -19,8 +19,8 @@ package simulated import ( "math/big" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/node" ) // WithBlockGasLimit configures the simulated backend to target a specific gas limit diff --git a/ethclient/simulated/options_test.go b/ethclient/simulated/options_test.go index d9ff3b428a..0a81dd8c6a 100644 --- a/ethclient/simulated/options_test.go +++ b/ethclient/simulated/options_test.go @@ -22,9 +22,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Tests that the simulator starts with the initial gas limit in the genesis block, diff --git a/ethdb/dbtest/testsuite.go b/ethdb/dbtest/testsuite.go index 29bd24364e..d72ec9cb03 100644 --- a/ethdb/dbtest/testsuite.go +++ b/ethdb/dbtest/testsuite.go @@ -23,7 +23,7 @@ import ( "sort" "testing" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" "golang.org/x/exp/slices" ) diff --git a/ethdb/leveldb/fake_leveldb.go b/ethdb/leveldb/fake_leveldb.go index 28f19d1ddf..64508ed314 100644 --- a/ethdb/leveldb/fake_leveldb.go +++ b/ethdb/leveldb/fake_leveldb.go @@ -23,7 +23,7 @@ package leveldb import ( "errors" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) type Database struct { diff --git a/ethdb/leveldb/leveldb.go b/ethdb/leveldb/leveldb.go index a4270bfaf2..8dee32e2c1 100644 --- a/ethdb/leveldb/leveldb.go +++ b/ethdb/leveldb/leveldb.go @@ -26,10 +26,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/filter" diff --git a/ethdb/leveldb/leveldb_test.go b/ethdb/leveldb/leveldb_test.go index d8c6386016..d1fce64096 100644 --- a/ethdb/leveldb/leveldb_test.go +++ b/ethdb/leveldb/leveldb_test.go @@ -19,8 +19,8 @@ package leveldb import ( "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/dbtest" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/ethdb/memorydb/memorydb.go b/ethdb/memorydb/memorydb.go index 86570feeec..1d19bc5013 100644 --- a/ethdb/memorydb/memorydb.go +++ b/ethdb/memorydb/memorydb.go @@ -23,8 +23,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) var ( diff --git a/ethdb/memorydb/memorydb_test.go b/ethdb/memorydb/memorydb_test.go index 51499c3b1f..dc3b69802d 100644 --- a/ethdb/memorydb/memorydb_test.go +++ b/ethdb/memorydb/memorydb_test.go @@ -20,8 +20,8 @@ import ( "encoding/binary" "testing" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/dbtest" ) func TestMemoryDB(t *testing.T) { diff --git a/ethdb/pebble/pebble.go b/ethdb/pebble/pebble.go index ab6bb1d72d..436900e73f 100644 --- a/ethdb/pebble/pebble.go +++ b/ethdb/pebble/pebble.go @@ -29,10 +29,10 @@ import ( "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/bloom" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) const ( @@ -275,7 +275,7 @@ func New(file string, cache int, handles int, namespace string, readonly bool, e WALMinSyncInterval: extraOptions.WALMinSyncInterval, TargetByteDeletionRate: extraOptions.TargetByteDeletionRate, } - // Disable seek compaction explicitly. Check https://github.com/ethereum/go-ethereum/pull/20130 + // Disable seek compaction explicitly. Check https://github.com/paxosglobal/go-ethereum-arbitrum/pull/20130 // for more details. opt.Experimental.ReadSamplingMultiplier = -1 diff --git a/ethdb/pebble/pebble_non64bit.go b/ethdb/pebble/pebble_non64bit.go index bd503aadea..a81b290119 100644 --- a/ethdb/pebble/pebble_non64bit.go +++ b/ethdb/pebble/pebble_non64bit.go @@ -5,7 +5,7 @@ package pebble import ( "errors" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) func New(file string, cache int, handles int, namespace string, readonly bool, ephemeral bool, extraOptions *ExtraOptions) (ethdb.Database, error) { diff --git a/ethdb/pebble/pebble_test.go b/ethdb/pebble/pebble_test.go index 590d5bf035..fe2ed5769e 100644 --- a/ethdb/pebble/pebble_test.go +++ b/ethdb/pebble/pebble_test.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/pebble" "github.com/cockroachdb/pebble/vfs" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/dbtest" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/dbtest" ) func TestPebbleDB(t *testing.T) { diff --git a/ethdb/remotedb/remotedb.go b/ethdb/remotedb/remotedb.go index ef38ce786d..0ab1672080 100644 --- a/ethdb/remotedb/remotedb.go +++ b/ethdb/remotedb/remotedb.go @@ -22,9 +22,9 @@ package remotedb import ( - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Database is a key-value lookup for a remote database via debug_dbGet. diff --git a/ethstats/ethstats.go b/ethstats/ethstats.go index 29559991be..d15b0f7cc5 100644 --- a/ethstats/ethstats.go +++ b/ethstats/ethstats.go @@ -30,20 +30,20 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - ethproto "github.com/ethereum/go-ethereum/eth/protocols/eth" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" "github.com/gorilla/websocket" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + ethproto "github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const ( diff --git a/event/example_feed_test.go b/event/example_feed_test.go index 9b5ad50df5..3c2692cbd9 100644 --- a/event/example_feed_test.go +++ b/event/example_feed_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/event" ) func ExampleFeed_acknowledgedEvents() { diff --git a/event/example_scope_test.go b/event/example_scope_test.go index 825a8deeac..08df1d25e6 100644 --- a/event/example_scope_test.go +++ b/event/example_scope_test.go @@ -20,7 +20,7 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/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 5c76b55d98..5f271d957c 100644 --- a/event/example_subscription_test.go +++ b/event/example_subscription_test.go @@ -19,7 +19,7 @@ package event_test import ( "fmt" - "github.com/ethereum/go-ethereum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/event" ) func ExampleNewSubscription() { diff --git a/event/subscription.go b/event/subscription.go index 07e059c6db..a2c25fba6b 100644 --- a/event/subscription.go +++ b/event/subscription.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/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 e0c4f52124..c27693f49f 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/ethereum/go-ethereum +module github.com/paxosglobal/go-ethereum-arbitrum go 1.20 @@ -35,7 +35,7 @@ require ( github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb github.com/google/gofuzz v1.2.0 github.com/google/uuid v1.3.0 - github.com/gorilla/websocket v1.4.2 + github.com/gorilla/websocket v1.5.0 github.com/graph-gophers/graphql-go v1.3.0 github.com/hashicorp/go-bexpr v0.1.10 github.com/holiman/billy v0.0.0-20230718173358-1c7e68d277a7 @@ -50,7 +50,7 @@ require ( github.com/karalabe/usb v0.0.2 github.com/kylelemons/godebug v1.1.0 github.com/mattn/go-colorable v0.1.13 - github.com/mattn/go-isatty v0.0.17 + github.com/mattn/go-isatty v0.0.20 github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 github.com/olekukonko/tablewriter v0.0.5 github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 @@ -66,13 +66,13 @@ require ( github.com/tyler-smith/go-bip39 v1.1.0 github.com/urfave/cli/v2 v2.25.7 go.uber.org/automaxprocs v1.5.2 - golang.org/x/crypto v0.17.0 + golang.org/x/crypto v0.21.0 golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa golang.org/x/sync v0.5.0 - golang.org/x/sys v0.16.0 + golang.org/x/sys v0.18.0 golang.org/x/text v0.14.0 golang.org/x/time v0.3.0 - golang.org/x/tools v0.15.0 + golang.org/x/tools v0.16.0 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -94,34 +94,34 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.10.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect - github.com/cockroachdb/errors v1.8.1 // indirect - github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect - github.com/cockroachdb/redact v1.0.8 // indirect - github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect + github.com/cockroachdb/errors v1.9.1 // indirect + github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect + github.com/cockroachdb/redact v1.1.3 // indirect github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect github.com/consensys/bavard v0.1.13 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect - github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect + github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect github.com/deepmap/oapi-codegen v1.6.0 // indirect github.com/dlclark/regexp2 v1.7.0 // indirect github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61 // indirect + github.com/getsentry/sentry-go v0.12.0 // indirect github.com/go-ole/go-ole v1.3.0 // indirect github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect github.com/goccy/go-json v0.10.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/go-querystring v1.1.0 // indirect - github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect + github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-retryablehttp v0.7.4 // indirect github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/kilic/bls12-381 v0.1.0 // indirect - github.com/klauspost/compress v1.15.15 // indirect + github.com/klauspost/compress v1.17.2 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect github.com/kr/pretty v0.3.1 // indirect github.com/kr/text v0.2.0 // indirect - github.com/mattn/go-runewidth v0.0.13 // indirect + github.com/mattn/go-runewidth v0.0.15 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect github.com/minio/sha256-simd v1.0.0 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect @@ -130,19 +130,19 @@ require ( github.com/naoina/go-stringutil v0.1.0 // indirect github.com/opentracing/opentracing-go v1.1.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.12.0 // indirect - github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - github.com/rivo/uniseg v0.2.0 // indirect + github.com/prometheus/client_golang v1.14.0 // indirect + github.com/prometheus/client_model v0.4.0 // indirect + github.com/prometheus/common v0.37.0 // indirect + github.com/prometheus/procfs v0.8.0 // indirect + github.com/rivo/uniseg v0.4.7 // indirect github.com/rogpeppe/go-internal v1.9.0 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/tklauser/go-sysconf v0.3.12 // indirect github.com/tklauser/numcpus v0.6.1 // indirect github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect golang.org/x/mod v0.14.0 // indirect - golang.org/x/net v0.18.0 // indirect - google.golang.org/protobuf v1.27.1 // indirect + golang.org/x/net v0.21.0 // indirect + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect rsc.io/tmplfunc v0.0.3 // indirect ) diff --git a/go.sum b/go.sum index 556a42be48..9bec784292 100644 --- a/go.sum +++ b/go.sum @@ -44,12 +44,11 @@ github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 h1:OBhqkivkhkM github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= -github.com/CloudyKit/fastprinter v0.0.0-20170127035650-74b38d55f37a/go.mod h1:EFZQ978U7x8IRnstaskI3IysnWY5Ao3QgZUKOXlsAdw= -github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible/go.mod h1:HPYO+50pSWkPoj9Q/eq0aRGByCL6ScRlUmiEX5Zgm+w= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= -github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7/go.mod h1:6E6s8o2AE4KhCrqr6GRJjdC/gNfTdxkIXvuGZZda2VM= github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow= github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM= github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= @@ -119,19 +118,17 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk github.com/cloudflare/cloudflare-go v0.79.0 h1:ErwCYDjFCYppDJlDJ/5WhsSmzegAUe2+K9qgFyQDg3M= github.com/cloudflare/cloudflare-go v0.79.0/go.mod h1:gkHQf9xEubaQPEuerBuoinR9P8bf8a05Lq0X6WKy1Oc= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= -github.com/cockroachdb/datadriven v1.0.0/go.mod h1:5Ib8Meh+jk1RlHIXej6Pzevx/NLlNvQB9pmSBZErGA4= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4= -github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM= -github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y= -github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY= -github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= +github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A= github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo= -github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw= -github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM= -github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ= +github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= +github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo= github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ= github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= @@ -156,10 +153,9 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deckarep/golang-set/v2 v2.1.0 h1:g47V4Or+DUdzbs8FxCCmgb6VYd+ptPAngjM6dtGktsI= github.com/deckarep/golang-set/v2 v2.1.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4= -github.com/decred/dcrd/crypto/blake256 v1.0.0 h1:/8DMNYp9SGi5f0w7uCm6d6M4OU2rGFK09Y2A4Xv7EE0= -github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 h1:YLtO71vCjJRCBcrPMtQ9nqBsqpA1m5sE92cU+pd5Mcc= -github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs= +github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 h1:8UrgZ3GkP4i/CLijOJx79Yu+etlyjdBU4sfcs2WYQMs= +github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0= github.com/deepmap/oapi-codegen v1.6.0 h1:w/d1ntwh91XI0b/8ja7+u5SvA4IFfM0UNNLmiDR1gg0= github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M= github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= @@ -179,6 +175,7 @@ github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZi github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= github.com/ethereum/c-kzg-4844 v0.4.0 h1:3MS1s4JtA868KpJxroZoepdV0ZKBp3u/O5HcZ7R3nlY= @@ -193,7 +190,6 @@ github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e h1:bBLctRc7kr01YGvaDf github.com/fjl/gencodec v0.0.0-20230517082657-f9840df7b83e/go.mod h1:AzA8Lj6YtixmJWL+wkKoBGsLWy9gFrAzi4g+5bCKwpY= github.com/fjl/memsize v0.0.2 h1:27txuSD9or+NZlnOWdKUxeBzTAUkWCVh+4Gf2dWFOzA= github.com/fjl/memsize v0.0.2/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= -github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4/go.mod h1:T9YF2M40nIgbVgp3rreNmTged+9HrbNTIQf1PsaIiTA= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= github.com/fsnotify/fsnotify v1.6.0 h1:n+5WquG0fcWoWp6xPWfHdbskMCQaFnG6PfBrh1Ky4HY= @@ -208,6 +204,8 @@ github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46 h1:BAIP2GihuqhwdILrV+7GJel5lyPV3u1+PgzrWLc0TkE= github.com/gballet/go-verkle v0.1.1-0.20231031103413-a67434b50f46/go.mod h1:QNpY22eby74jVhqH4WhDLDwxc/vqsern6pW+u2kbkpc= github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4= +github.com/getsentry/sentry-go v0.12.0 h1:era7g0re5iY13bHSdN/xMkyV+5zZppjRVQhZrXCaEIk= +github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= @@ -221,9 +219,11 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-kit/log v0.2.0/go.mod h1:NwTd00d/i8cPZ3xOwwiv2PO5MOcx78fFErGNcVmBjv0= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= @@ -241,12 +241,13 @@ github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MG github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= -github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg= github.com/golang-jwt/jwt/v4 v4.5.0/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -296,8 +297,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8= github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU= @@ -313,19 +314,21 @@ github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hf github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= -github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U= github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg= +github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b h1:RMpPgZTSApbPf7xaVel+QkoGPRLFLrwFO89uDUHEGf0= +github.com/google/pprof v0.0.0-20231023181126-ff6d637d2a7b/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/subcommands v1.2.0/go.mod h1:ZjhPrFU+Olkh9WazFPsl27BQ4UPiG37m3yTrtFlrHVk= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= -github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= -github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= -github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0= github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc= github.com/hashicorp/go-bexpr v0.1.10 h1:9kuI5PFotCboP3dkDYFr/wi0gg0QVbSNz5oFRpxn4uE= @@ -349,7 +352,7 @@ github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXei github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc= github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8= -github.com/hydrogen18/memlistener v0.0.0-20141126152155-54553eb933fb/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= @@ -362,7 +365,8 @@ github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839 h1:W9WBk7 github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo= github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= -github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0/go.mod h1:pMCz62A0xJL6I+umB2YTlFRwWXaDFA0jy+5HzGiJjqI= +github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= +github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus= github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc= @@ -374,34 +378,32 @@ github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGw github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= -github.com/juju/errors v0.0.0-20181118221551-089d3ea4e4d5/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q= -github.com/juju/loggo v0.0.0-20180524022052-584905176618/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U= -github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/karalabe/usb v0.0.2 h1:M6QQBNxF+CQ8OFvxrT90BA0qBOXymndZnk5q235mFc4= github.com/karalabe/usb v0.0.2/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU= -github.com/kataras/golog v0.0.9/go.mod h1:12HJgwBIZFNGL0EJnMRhmvGA0PQGx8VFwrZtM4CqbAk= -github.com/kataras/iris/v12 v12.0.1/go.mod h1:udK4vLQKkdDqMGJJVd/msuMtN6hpYJhg/lSzuxjhO+U= -github.com/kataras/neffos v0.0.10/go.mod h1:ZYmJC07hQPW67eKuzlfY7SO3bC0mw83A3j6im82hfqw= -github.com/kataras/pio v0.0.0-20190103105442-ea782b38602d/go.mod h1:NV88laa9UiiDuX9AhMbDPkGYSPugBOV6yTZB1l2K9Z0= +github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= +github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= +github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= +github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= +github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= github.com/kilic/bls12-381 v0.1.0 h1:encrdjqKMEvabVQ7qYOKu1OvhqpK4s47wDYtNiPtlp4= github.com/kilic/bls12-381 v0.1.0/go.mod h1:vDTTHJONJ6G+P2R74EhnyotQDTliQDnFEwhdmfzw1ig= -github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.9.0/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= -github.com/klauspost/compress v1.15.15 h1:EF27CXIuDsYJ6mmvtBRlEuB2UVOqHG1tAXgZ7yIO+lw= -github.com/klauspost/compress v1.15.15/go.mod h1:ZcK2JAFqKOpnBlxcLsJzYfrS9X1akm9fHZNnD9+Vo/4= +github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.17.2 h1:RlWWUY/Dr4fL8qk9YG7DTZ7PDgME2V4csBXA8L/ixi4= +github.com/klauspost/compress v1.17.2/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= github.com/klauspost/cpuid/v2 v2.0.4/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= @@ -420,8 +422,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc= github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw= -github.com/labstack/echo/v4 v4.1.11/go.mod h1:i541M3Fj6f76NZtHSj7TXnyM8n2gaodfvfxNnFqi74g= github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg= +github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= github.com/leanovate/gopter v0.2.9 h1:fQjYxZaynp97ozCzfOyOuAGOU4aU/z37zf/tOujFk7c= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -432,6 +434,7 @@ github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= @@ -440,18 +443,17 @@ github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2y github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng= -github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.13 h1:lTGmDsbAYt5DmK6OnoV7EuIF1wEIFAcxld6ypU4OSgU= -github.com/mattn/go-runewidth v0.0.13/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= +github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 h1:I0XW9+e1XWDxdcEniV4rQAIOPUGDq67JSCiRCgGCZLI= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= -github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed/go.mod h1:dSsfyI2zABAdhcbvkXqgxOxrCsbYeHCPgrZkku60dSg= -github.com/mediocregopher/radix/v3 v3.3.0/go.mod h1:EmfVyvspXz1uZEyPBMyGK+kjWiKQGvsUt6O3Pj+LDCQ= +github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= github.com/minio/sha256-simd v1.0.0 h1:v1ta+49hkWZyvaKwrQB8elexRqm6Y0aMLjCNsrYxo6g= github.com/minio/sha256-simd v1.0.0/go.mod h1:OuYzVNI5vcoYIAmbIvHPl3N3jUzVedXbKy5RFepssQM= @@ -476,16 +478,17 @@ github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hz github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0= github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E= -github.com/nats-io/nats.go v1.8.1/go.mod h1:BrFz9vVn0fU3AcH9Vn4Kd7W0NpJ651tD5omQ3M8LwxM= -github.com/nats-io/nkeys v0.0.2/go.mod h1:dab7URMsZm6Z/jp9Z5UGa87Uutgc2mVpXLC4B7TDb/4= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.13.0/go.mod h1:+REjRxOmWfHCjfv9TTWB1jD1Frx4XydAD3zm1lskyM0= github.com/onsi/ginkgo v1.14.0 h1:2mOpI4JVVPBN+WQRa0WKH2eXR+Ey+uK4n7Zj0aYpIQA= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= @@ -511,32 +514,37 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.0 h1:C+UIj/QWtmqY13Arb8kwMt5j34/0Z2iKamrJ+ryC0Gg= -github.com/prometheus/client_golang v1.12.0/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a h1:CmF68hwI0XsOQ5UwlBopMi2Ow4Pbg32akc4KIVCOm+Y= -github.com/prometheus/client_model v0.2.1-0.20210607210712-147c58e9608a/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= +github.com/prometheus/client_model v0.4.0 h1:5lQXD3cAg1OXBf4Wq03gTrXHeaV0TQvGfUooCfx1yqY= +github.com/prometheus/client_model v0.4.0/go.mod h1:oMQmHW1/JoDwqLtg57MGgP/Fb1CJEYF2imWWhWtMkYU= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= +github.com/prometheus/common v0.37.0 h1:ccBbHCgIiT9uSoFY0vX8H3zsNR5eLt17/RQLUvn8pXE= +github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= +github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7 h1:cZC+usqsYgHtlBaGulVnZ1hfKAi8iWtujBnRLQE698c= github.com/protolambda/bls12-381-util v0.0.0-20220416220906-d8552aa452c7/go.mod h1:IToEjHuttnUzwZI5KBSM/LOOW3qLbbrHOEfp3SbECGY= github.com/prysmaticlabs/gohashtree v0.0.1-alpha.0.20220714111606-acbb2962fb48 h1:cSo6/vk8YpvkLbk9v3FO97cakNmUoxwi2KMP8hd5WIw= -github.com/rivo/uniseg v0.2.0 h1:S1pD9weZBuJdFmowNwbpi7BJ8TNftyUImj/0WQi72jY= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= +github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= +github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik= @@ -545,8 +553,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw= -github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible h1:Bn1aCHHRnjv4Bl16T8rcaFjYSrGrIZvpiGO6P3Q4GpU= github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= @@ -585,7 +593,9 @@ github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9f github.com/tyler-smith/go-bip39 v1.1.0 h1:5eUemwrMargf3BSLRRCalXT93Ns6pQJIjYQN2nyfOP8= github.com/tyler-smith/go-bip39 v1.1.0/go.mod h1:gUYDtqQw1JS3ZJ8UWVcGTGqqr6YIN3CWg+kkNaLt55U= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli/v2 v2.25.7 h1:VAzn5oq403l5pHjc4OhD54+XGO9cdKVL/7lDjF+iKUs= github.com/urfave/cli/v2 v2.25.7/go.mod h1:8qnjx1vcq5s2/wpsqoZFndg2CE5tNFyrTvS6SinrnYQ= github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= @@ -608,6 +618,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= @@ -623,12 +634,14 @@ golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8U golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.17.0 h1:r8bRNjWL3GshPW3gkd+RpvzWrZAwPS49OmTGZ/uhM4k= -golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -653,6 +666,7 @@ golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHl golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= @@ -661,6 +675,7 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0= golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= @@ -701,16 +716,21 @@ golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81R golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg= -golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ= +golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b/go.mod h1:DAh4E804XQdzx2j+YRIaUnCqCV2RuMz24cGBJ5QYIrc= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -774,11 +794,18 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -786,10 +813,11 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -812,7 +840,6 @@ golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4= golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= -golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= @@ -857,9 +884,10 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.15.0 h1:zdAyfUGbYmuVokhzVmghFl2ZJh5QhcfebBgmVPFYA+8= -golang.org/x/tools v0.15.0/go.mod h1:hpksKq4dtpQWS1uQ61JkdqWM3LscIS6Slf+VVkm+wQk= +golang.org/x/tools v0.16.0 h1:GO788SKMRunPIBCXiQyo2AaexLstOrVhuAL5YwsckQM= +golang.org/x/tools v0.16.0/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -917,6 +945,7 @@ google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7Fc google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -930,6 +959,7 @@ google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKa google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -942,8 +972,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= -google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -954,6 +984,7 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= @@ -967,7 +998,9 @@ gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/graphql/graphiql.go b/graphql/graphiql.go index 823df0c641..4aaf97ed77 100644 --- a/graphql/graphiql.go +++ b/graphql/graphiql.go @@ -27,8 +27,8 @@ import ( "net/http" "path/filepath" - "github.com/ethereum/go-ethereum/graphql/internal/graphiql" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/graphql/internal/graphiql" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // GraphiQL is an in-browser IDE for exploring GraphiQL APIs. diff --git a/graphql/graphql.go b/graphql/graphql.go index 4a362a5499..ca5f06b498 100644 --- a/graphql/graphql.go +++ b/graphql/graphql.go @@ -27,18 +27,18 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) var ( diff --git a/graphql/graphql_test.go b/graphql/graphql_test.go index f91229d015..b94b500da9 100644 --- a/graphql/graphql_test.go +++ b/graphql/graphql_test.go @@ -27,19 +27,19 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "github.com/stretchr/testify/assert" ) diff --git a/graphql/service.go b/graphql/service.go index 584165bdb8..cf2839bb0f 100644 --- a/graphql/service.go +++ b/graphql/service.go @@ -24,12 +24,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/eth/filters" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/rpc" "github.com/graph-gophers/graphql-go" gqlErrors "github.com/graph-gophers/graphql-go/errors" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/filters" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type handler struct { diff --git a/interfaces.go b/interfaces.go index 8378312470..e28bb8ecf1 100644 --- a/interfaces.go +++ b/interfaces.go @@ -22,9 +22,9 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // NotFound is returned by API methods if the requested item does not exist. diff --git a/internal/blocktest/test_hash.go b/internal/blocktest/test_hash.go index 4d2b077e89..2334171340 100644 --- a/internal/blocktest/test_hash.go +++ b/internal/blocktest/test_hash.go @@ -25,7 +25,7 @@ package blocktest import ( "hash" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" "golang.org/x/crypto/sha3" ) diff --git a/internal/cmdtest/test_cmd.go b/internal/cmdtest/test_cmd.go index 4890d0b7c6..846a9391e2 100644 --- a/internal/cmdtest/test_cmd.go +++ b/internal/cmdtest/test_cmd.go @@ -32,7 +32,7 @@ import ( "text/template" "time" - "github.com/ethereum/go-ethereum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" ) func NewTestCmd(t *testing.T, data interface{}) *TestCmd { diff --git a/internal/debug/api.go b/internal/debug/api.go index 482989e0d0..e1cc83e6e3 100644 --- a/internal/debug/api.go +++ b/internal/debug/api.go @@ -35,8 +35,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" "github.com/hashicorp/go-bexpr" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "golang.org/x/exp/slog" ) diff --git a/internal/debug/flags.go b/internal/debug/flags.go index d545e052ee..38234b4627 100644 --- a/internal/debug/flags.go +++ b/internal/debug/flags.go @@ -26,13 +26,13 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/internal/flags" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/exp" "github.com/fjl/memsize/memsizeui" "github.com/mattn/go-colorable" "github.com/mattn/go-isatty" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/flags" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics/exp" "github.com/urfave/cli/v2" "golang.org/x/exp/slog" "gopkg.in/natefinch/lumberjack.v2" diff --git a/internal/debug/trace.go b/internal/debug/trace.go index e291030b82..e0bc31b477 100644 --- a/internal/debug/trace.go +++ b/internal/debug/trace.go @@ -21,7 +21,7 @@ import ( "os" "runtime/trace" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // StartGoTrace turns on tracing, writing to the given file. diff --git a/internal/era/accumulator.go b/internal/era/accumulator.go index 19e03973f1..1c9cde6c80 100644 --- a/internal/era/accumulator.go +++ b/internal/era/accumulator.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" ssz "github.com/ferranbt/fastssz" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // ComputeAccumulator calculates the SSZ hash tree root of the Era1 diff --git a/internal/era/builder.go b/internal/era/builder.go index 9217c049f3..6c6445c0cf 100644 --- a/internal/era/builder.go +++ b/internal/era/builder.go @@ -22,11 +22,11 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/era/e2store" - "github.com/ethereum/go-ethereum/rlp" "github.com/golang/snappy" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/era/e2store" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Builder is used to create Era1 archives of block data. diff --git a/internal/era/e2store/e2store_test.go b/internal/era/e2store/e2store_test.go index febcffe4cf..5f52585268 100644 --- a/internal/era/e2store/e2store_test.go +++ b/internal/era/e2store/e2store_test.go @@ -22,7 +22,7 @@ import ( "io" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func TestEncode(t *testing.T) { diff --git a/internal/era/era.go b/internal/era/era.go index a0e701b7e0..34ae67c1ff 100644 --- a/internal/era/era.go +++ b/internal/era/era.go @@ -27,11 +27,11 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/era/e2store" - "github.com/ethereum/go-ethereum/rlp" "github.com/golang/snappy" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/era/e2store" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/internal/era/era_test.go b/internal/era/era_test.go index ee5d9e82a0..d7d042d5fe 100644 --- a/internal/era/era_test.go +++ b/internal/era/era_test.go @@ -23,7 +23,7 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) type testchain struct { diff --git a/internal/era/iterator.go b/internal/era/iterator.go index e74a8154b1..4e56ec0ddd 100644 --- a/internal/era/iterator.go +++ b/internal/era/iterator.go @@ -21,8 +21,8 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Iterator wraps RawIterator and returns decoded Era1 entries. diff --git a/internal/ethapi/addrlock.go b/internal/ethapi/addrlock.go index 61ddff688c..8a7f3931b1 100644 --- a/internal/ethapi/addrlock.go +++ b/internal/ethapi/addrlock.go @@ -19,7 +19,7 @@ package ethapi import ( "sync" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) type AddrLocker struct { diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index 2dfd3d28a6..e6b5a7a9a5 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -26,29 +26,29 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/gasestimator" - "github.com/ethereum/go-ethereum/eth/tracers/logger" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/trie" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/scwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasestimator" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "github.com/tyler-smith/go-bip39" ) @@ -518,7 +518,7 @@ func (s *PersonalAccountAPI) SignTransaction(ctx context.Context, args Transacti // // The key used to calculate the signature is decrypted with the given password. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_sign +// https://github.com/paxosglobal/go-ethereum-arbitrum/wiki/Management-APIs#personal_sign func (s *PersonalAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr common.Address, passwd string) (hexutil.Bytes, error) { // Look up the wallet containing the requested signer account := accounts.Account{Address: addr} @@ -546,7 +546,7 @@ func (s *PersonalAccountAPI) Sign(ctx context.Context, data hexutil.Bytes, addr // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be 27 or 28 for legacy reasons. // -// https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover +// https://github.com/paxosglobal/go-ethereum-arbitrum/wiki/Management-APIs#personal_ecRecover func (s *PersonalAccountAPI) EcRecover(ctx context.Context, data, sig hexutil.Bytes) (common.Address, error) { if len(sig) != crypto.SignatureLength { return common.Address{}, fmt.Errorf("signature must be %d bytes long", crypto.SignatureLength) diff --git a/internal/ethapi/api_test.go b/internal/ethapi/api_test.go index 23b40cd0cb..bdb6bb2cc6 100644 --- a/internal/ethapi/api_test.go +++ b/internal/ethapi/api_test.go @@ -31,29 +31,29 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/eth/gasestimator" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/internal/blocktest" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/gasestimator" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/blocktest" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" ) diff --git a/internal/ethapi/backend.go b/internal/ethapi/backend.go index f911a01cd5..b3e8679d14 100644 --- a/internal/ethapi/backend.go +++ b/internal/ethapi/backend.go @@ -22,19 +22,19 @@ import ( "math/big" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Backend interface provides the common API services (that are provided by diff --git a/internal/ethapi/dbapi.go b/internal/ethapi/dbapi.go index 33fda936dc..977d2a7807 100644 --- a/internal/ethapi/dbapi.go +++ b/internal/ethapi/dbapi.go @@ -17,8 +17,8 @@ package ethapi import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // DbGet returns the raw value of a key stored in the database. diff --git a/internal/ethapi/errors.go b/internal/ethapi/errors.go index ce2379e78a..d31ad2833b 100644 --- a/internal/ethapi/errors.go +++ b/internal/ethapi/errors.go @@ -19,10 +19,10 @@ package ethapi import ( "fmt" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) // revertError is an API error that encompasses an EVM revert with JSON error diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go index 8062e5cc99..29cf0e0947 100644 --- a/internal/ethapi/transaction_args.go +++ b/internal/ethapi/transaction_args.go @@ -24,18 +24,18 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/kzg4844" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) var ( @@ -57,7 +57,7 @@ type TransactionArgs struct { // We accept "data" and "input" for backwards-compatibility reasons. // "input" is the newer name and should be preferred by clients. - // Issue detail: https://github.com/ethereum/go-ethereum/issues/15628 + // Issue detail: https://github.com/paxosglobal/go-ethereum-arbitrum/issues/15628 Data *hexutil.Bytes `json:"data"` Input *hexutil.Bytes `json:"input"` @@ -183,7 +183,7 @@ func (args *TransactionArgs) setFeeDefaults(ctx context.Context, b Backend) erro } // If the tx has completely specified a fee mechanism, no default is needed. // This allows users who are not yet synced past London to get defaults for - // other tx values. See https://github.com/ethereum/go-ethereum/pull/23274 + // other tx values. See https://github.com/paxosglobal/go-ethereum-arbitrum/pull/23274 // for more information. eip1559ParamsSet := args.MaxFeePerGas != nil && args.MaxPriorityFeePerGas != nil diff --git a/internal/ethapi/transaction_args_test.go b/internal/ethapi/transaction_args_test.go index 81779f0762..48d9724827 100644 --- a/internal/ethapi/transaction_args_test.go +++ b/internal/ethapi/transaction_args_test.go @@ -24,20 +24,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/bloombits" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/bloombits" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // TestSetFeeDefaults tests the logic for filling in default fee values works as expected. diff --git a/internal/flags/flags.go b/internal/flags/flags.go index bf62c53adf..39c4ed501d 100644 --- a/internal/flags/flags.go +++ b/internal/flags/flags.go @@ -28,7 +28,7 @@ import ( "strings" "syscall" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" "github.com/urfave/cli/v2" ) diff --git a/internal/flags/helpers.go b/internal/flags/helpers.go index 0112724fa1..f6375391af 100644 --- a/internal/flags/helpers.go +++ b/internal/flags/helpers.go @@ -23,10 +23,10 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/internal/version" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" "github.com/mattn/go-isatty" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/version" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" "github.com/urfave/cli/v2" ) diff --git a/internal/guide/guide_test.go b/internal/guide/guide_test.go index f682daac91..ce90d8e25b 100644 --- a/internal/guide/guide_test.go +++ b/internal/guide/guide_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // Tests that the account management snippets work correctly. diff --git a/internal/jsre/deps/web3.js b/internal/jsre/deps/web3.js index 0b360e7415..fc8374bd50 100644 --- a/internal/jsre/deps/web3.js +++ b/internal/jsre/deps/web3.js @@ -5882,7 +5882,7 @@ module.exports = Shh; * @author Alex Beregszaszi * @date 2016 * - * Reference: https://github.com/ethereum/go-ethereum/blob/swarm/internal/web3ext/web3ext.go#L33 + * Reference: https://github.com/paxosglobal/go-ethereum-arbitrum/blob/swarm/internal/web3ext/web3ext.go#L33 */ "use strict"; diff --git a/internal/jsre/jsre.go b/internal/jsre/jsre.go index f6e21d2ef7..8e88634b2b 100644 --- a/internal/jsre/jsre.go +++ b/internal/jsre/jsre.go @@ -28,7 +28,7 @@ import ( "time" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // JSRE is a JS runtime environment embedding the goja interpreter. diff --git a/internal/shutdowncheck/shutdown_tracker.go b/internal/shutdowncheck/shutdown_tracker.go index c95b4f02f4..e58fd5a4c0 100644 --- a/internal/shutdowncheck/shutdown_tracker.go +++ b/internal/shutdowncheck/shutdown_tracker.go @@ -19,10 +19,10 @@ package shutdowncheck import ( "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // ShutdownTracker is a service that reports previous unclean shutdowns diff --git a/internal/testlog/testlog.go b/internal/testlog/testlog.go index 037b7ee9c1..39a5b8a561 100644 --- a/internal/testlog/testlog.go +++ b/internal/testlog/testlog.go @@ -24,7 +24,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "golang.org/x/exp/slog" ) diff --git a/internal/version/version.go b/internal/version/version.go index 0daea02b57..a666d8e49e 100644 --- a/internal/version/version.go +++ b/internal/version/version.go @@ -23,10 +23,10 @@ import ( "runtime/debug" "strings" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) -const ourPath = "github.com/ethereum/go-ethereum" // Path to our module +const ourPath = "github.com/paxosglobal/go-ethereum-arbitrum" // Path to our module // These variables are set at build-time by the linker when the build is // done by build/ci.go. diff --git a/metrics/cpu_enabled.go b/metrics/cpu_enabled.go index b722e0bcaf..567471ace7 100644 --- a/metrics/cpu_enabled.go +++ b/metrics/cpu_enabled.go @@ -20,7 +20,7 @@ package metrics import ( - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "github.com/shirou/gopsutil/cpu" ) diff --git a/metrics/cputime_unix.go b/metrics/cputime_unix.go index 8e86a84087..a26ce5e9fe 100644 --- a/metrics/cputime_unix.go +++ b/metrics/cputime_unix.go @@ -22,7 +22,7 @@ package metrics import ( syscall "golang.org/x/sys/unix" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // getProcessCPUTime retrieves the process' CPU time since program startup. diff --git a/metrics/exp/exp.go b/metrics/exp/exp.go index 7e3f82a075..47de9a5bf6 100644 --- a/metrics/exp/exp.go +++ b/metrics/exp/exp.go @@ -8,9 +8,9 @@ import ( "net/http" "sync" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/prometheus" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics/prometheus" ) type exp struct { diff --git a/metrics/influxdb/influxdb.go b/metrics/influxdb/influxdb.go index bbc4fc024b..a7d8363ab6 100644 --- a/metrics/influxdb/influxdb.go +++ b/metrics/influxdb/influxdb.go @@ -3,7 +3,7 @@ package influxdb import ( "fmt" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) func readMeter(namespace, name string, i interface{}) (string, map[string]interface{}) { diff --git a/metrics/influxdb/influxdb_test.go b/metrics/influxdb/influxdb_test.go index c6f2eeac62..fd2fe50a92 100644 --- a/metrics/influxdb/influxdb_test.go +++ b/metrics/influxdb/influxdb_test.go @@ -26,9 +26,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/internal" influxdb2 "github.com/influxdata/influxdb-client-go/v2" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics/internal" ) func TestMain(m *testing.M) { diff --git a/metrics/influxdb/influxdbv1.go b/metrics/influxdb/influxdbv1.go index ac58280803..d6dedd816d 100644 --- a/metrics/influxdb/influxdbv1.go +++ b/metrics/influxdb/influxdbv1.go @@ -5,9 +5,9 @@ import ( uurl "net/url" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" client "github.com/influxdata/influxdb1-client/v2" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) type reporter struct { diff --git a/metrics/influxdb/influxdbv2.go b/metrics/influxdb/influxdbv2.go index 114d57ae07..408368ee1c 100644 --- a/metrics/influxdb/influxdbv2.go +++ b/metrics/influxdb/influxdbv2.go @@ -4,10 +4,10 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" influxdb2 "github.com/influxdata/influxdb-client-go/v2" "github.com/influxdata/influxdb-client-go/v2/api" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) type v2Reporter struct { diff --git a/metrics/internal/sampledata.go b/metrics/internal/sampledata.go index de9b207b6d..8d1ea64823 100644 --- a/metrics/internal/sampledata.go +++ b/metrics/internal/sampledata.go @@ -22,7 +22,7 @@ import ( metrics2 "runtime/metrics" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) // ExampleMetrics returns an ordered registry populated with a sample of metrics. diff --git a/metrics/internal/sampledata_test.go b/metrics/internal/sampledata_test.go index 0013299406..ed0da9c2e6 100644 --- a/metrics/internal/sampledata_test.go +++ b/metrics/internal/sampledata_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) func TestCollectRuntimeMetrics(t *testing.T) { diff --git a/metrics/librato/librato.go b/metrics/librato/librato.go index a86f758637..9c1464a3a8 100644 --- a/metrics/librato/librato.go +++ b/metrics/librato/librato.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) // a regexp for extracting the unit from time.Duration.String diff --git a/metrics/metrics.go b/metrics/metrics.go index 9ca8f115c0..fab8c89eb1 100644 --- a/metrics/metrics.go +++ b/metrics/metrics.go @@ -14,7 +14,7 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Enabled is checked by the constructor functions for all of the diff --git a/metrics/prometheus/collector.go b/metrics/prometheus/collector.go index 25b258d56a..d6dd920f59 100644 --- a/metrics/prometheus/collector.go +++ b/metrics/prometheus/collector.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/metrics/prometheus/collector_test.go b/metrics/prometheus/collector_test.go index ea17aac458..ab397d8353 100644 --- a/metrics/prometheus/collector_test.go +++ b/metrics/prometheus/collector_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/metrics/internal" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics/internal" ) func TestMain(m *testing.M) { diff --git a/metrics/prometheus/prometheus.go b/metrics/prometheus/prometheus.go index dbdeae6c7f..c7769e22db 100644 --- a/metrics/prometheus/prometheus.go +++ b/metrics/prometheus/prometheus.go @@ -22,8 +22,8 @@ import ( "net/http" "sort" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) // Handler returns an HTTP handler which dump metrics in Prometheus format. diff --git a/miner/miner.go b/miner/miner.go index 58bb71b557..4b14505a8a 100644 --- a/miner/miner.go +++ b/miner/miner.go @@ -23,17 +23,17 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) // Backend wraps all methods required for mining. Only full node is capable diff --git a/miner/miner_test.go b/miner/miner_test.go index 4837764fcb..0e8f3039fe 100644 --- a/miner/miner_test.go +++ b/miner/miner_test.go @@ -23,20 +23,20 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) type mockBackend struct { diff --git a/miner/ordering.go b/miner/ordering.go index e686656bb2..64595b430d 100644 --- a/miner/ordering.go +++ b/miner/ordering.go @@ -20,10 +20,10 @@ import ( "container/heap" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // txWithMinerFee wraps a transaction with its gas price or effective miner gasTipCap diff --git a/miner/ordering_test.go b/miner/ordering_test.go index d2de9b9f34..a373521377 100644 --- a/miner/ordering_test.go +++ b/miner/ordering_test.go @@ -23,10 +23,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) func TestTransactionPriceNonceSortLegacy(t *testing.T) { diff --git a/miner/payload_building.go b/miner/payload_building.go index 719736c479..4bb2aa856d 100644 --- a/miner/payload_building.go +++ b/miner/payload_building.go @@ -23,12 +23,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/engine" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // BuildPayloadArgs contains the provided parameters for building payload. diff --git a/miner/payload_building_test.go b/miner/payload_building_test.go index 708072b5ec..555a8bed73 100644 --- a/miner/payload_building_test.go +++ b/miner/payload_building_test.go @@ -21,12 +21,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/beacon/engine" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/beacon/engine" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func TestBuildPayload(t *testing.T) { diff --git a/miner/stress/clique/main.go b/miner/stress/clique/main.go index 13336cd83c..9091b99f4a 100644 --- a/miner/stress/clique/main.go +++ b/miner/stress/clique/main.go @@ -26,22 +26,22 @@ import ( "os/signal" "time" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/fdlimit" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/eth" - "github.com/ethereum/go-ethereum/eth/downloader" - "github.com/ethereum/go-ethereum/eth/ethconfig" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/miner" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/fdlimit" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/eth" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/downloader" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/ethconfig" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/miner" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func main() { diff --git a/miner/worker.go b/miner/worker.go index b46ae70098..52f5ede6f2 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -24,19 +24,19 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/misc/eip1559" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip1559" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" ) const ( @@ -1137,7 +1137,7 @@ func (w *worker) commit(env *environment, interval func(), update bool, start ti interval() } // Create a local environment copy, avoid the data race with snapshot state. - // https://github.com/ethereum/go-ethereum/issues/24299 + // https://github.com/paxosglobal/go-ethereum-arbitrum/issues/24299 env := env.copy() // Withdrawals are set to nil here, because this is only called in PoW. block, err := w.engine.FinalizeAndAssemble(w.chain, env.header, env.state, env.txs, nil, env.receipts, nil) diff --git a/miner/worker_test.go b/miner/worker_test.go index b47400378c..4068885b2d 100644 --- a/miner/worker_test.go +++ b/miner/worker_test.go @@ -22,22 +22,22 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/consensus" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/txpool" - "github.com/ethereum/go-ethereum/core/txpool/legacypool" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/params" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/txpool/legacypool" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) const ( diff --git a/node/api.go b/node/api.go index f81f394beb..01c37cd6fd 100644 --- a/node/api.go +++ b/node/api.go @@ -21,13 +21,13 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/debug" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/debug" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // apis returns the collection of built-in RPC APIs. diff --git a/node/api_test.go b/node/api_test.go index 8761c4883e..605e6f6e52 100644 --- a/node/api_test.go +++ b/node/api_test.go @@ -25,7 +25,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/config.go b/node/config.go index 0aef1f18b2..abefebdedc 100644 --- a/node/config.go +++ b/node/config.go @@ -25,11 +25,11 @@ import ( "runtime" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const ( diff --git a/node/config_test.go b/node/config_test.go index a9bb44f221..b87e2ad669 100644 --- a/node/config_test.go +++ b/node/config_test.go @@ -23,8 +23,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" ) // Tests that datadirs can be successfully created, be them manually configured diff --git a/node/defaults.go b/node/defaults.go index b78e7c2377..c57d5a0765 100644 --- a/node/defaults.go +++ b/node/defaults.go @@ -22,9 +22,9 @@ import ( "path/filepath" "runtime" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/nat" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) const ( diff --git a/node/endpoints.go b/node/endpoints.go index 14c12fd1f1..abb4d397c7 100644 --- a/node/endpoints.go +++ b/node/endpoints.go @@ -21,8 +21,8 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // StartHTTPEndpoint starts the HTTP RPC endpoint. diff --git a/node/jwt_auth.go b/node/jwt_auth.go index d4f8193ca7..23e3414cd3 100644 --- a/node/jwt_auth.go +++ b/node/jwt_auth.go @@ -21,8 +21,8 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/rpc" "github.com/golang-jwt/jwt/v4" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // NewJWTAuth creates an rpc client authentication provider that uses JWT. The diff --git a/node/node.go b/node/node.go index d8a2905787..9c1dc5e451 100644 --- a/node/node.go +++ b/node/node.go @@ -29,17 +29,17 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/pebble" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" "github.com/gofrs/flock" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/pebble" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // Node is a container on which services can be registered. diff --git a/node/node_auth_test.go b/node/node_auth_test.go index 597cd8531f..f320331f38 100644 --- a/node/node_auth_test.go +++ b/node/node_auth_test.go @@ -26,9 +26,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" "github.com/golang-jwt/jwt/v4" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type helloRPC string diff --git a/node/node_example_test.go b/node/node_example_test.go index e45ee49a25..9dee9b8616 100644 --- a/node/node_example_test.go +++ b/node/node_example_test.go @@ -20,7 +20,7 @@ import ( "fmt" "log" - "github.com/ethereum/go-ethereum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/node" ) // 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 04810a815b..28fbe62435 100644 --- a/node/node_test.go +++ b/node/node_test.go @@ -26,10 +26,10 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/rpcstack.go b/node/rpcstack.go index d4e0831b46..4b25a43a91 100644 --- a/node/rpcstack.go +++ b/node/rpcstack.go @@ -30,8 +30,8 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/rs/cors" ) diff --git a/node/rpcstack_test.go b/node/rpcstack_test.go index e41cc51ad3..9e38f1f5d7 100644 --- a/node/rpcstack_test.go +++ b/node/rpcstack_test.go @@ -28,11 +28,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" "github.com/golang-jwt/jwt/v4" "github.com/gorilla/websocket" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "github.com/stretchr/testify/assert" ) diff --git a/node/utils_test.go b/node/utils_test.go index 681f3a8b28..44820183ec 100644 --- a/node/utils_test.go +++ b/node/utils_test.go @@ -20,8 +20,8 @@ package node import ( - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // NoopLifecycle is a trivial implementation of the Service interface. diff --git a/oss-fuzz.sh b/oss-fuzz.sh index 8978de70dd..a8db07d0f6 100644 --- a/oss-fuzz.sh +++ b/oss-fuzz.sh @@ -16,7 +16,7 @@ ################################################################################ # This sets the -coverpgk for the coverage report when the corpus is executed through go test -coverpkg="github.com/ethereum/go-ethereum/..." +coverpkg="github.com/paxosglobal/go-ethereum-arbitrum/..." function coverbuild { path=$1 @@ -81,134 +81,134 @@ function compile_fuzzer() { } go install github.com/holiman/gofuzz-shim@latest -repo=$GOPATH/src/github.com/ethereum/go-ethereum -compile_fuzzer github.com/ethereum/go-ethereum/accounts/abi \ +repo=$GOPATH/src/github.com/paxosglobal/go-ethereum-arbitrum +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi \ FuzzABI fuzzAbi \ $repo/accounts/abi/abifuzzer_test.go -compile_fuzzer github.com/ethereum/go-ethereum/common/bitutil \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil \ FuzzEncoder fuzzBitutilEncoder \ $repo/common/bitutil/compress_test.go -compile_fuzzer github.com/ethereum/go-ethereum/common/bitutil \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil \ FuzzDecoder fuzzBitutilDecoder \ $repo/common/bitutil/compress_test.go -compile_fuzzer github.com/ethereum/go-ethereum/core/vm/runtime \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/core/vm/runtime \ FuzzVmRuntime fuzzVmRuntime\ $repo/core/vm/runtime/runtime_fuzz_test.go -compile_fuzzer github.com/ethereum/go-ethereum/core/vm \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/core/vm \ FuzzPrecompiledContracts fuzzPrecompiledContracts\ $repo/core/vm/contracts_fuzz_test.go,$repo/core/vm/contracts_test.go -compile_fuzzer github.com/ethereum/go-ethereum/core/types \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/core/types \ FuzzRLP fuzzRlp \ $repo/core/types/rlp_fuzzer_test.go -compile_fuzzer github.com/ethereum/go-ethereum/crypto/blake2b \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/crypto/blake2b \ Fuzz fuzzBlake2b \ $repo/crypto/blake2b/blake2b_f_fuzz_test.go -compile_fuzzer github.com/ethereum/go-ethereum/accounts/keystore \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore \ FuzzPassword fuzzKeystore \ $repo/accounts/keystore/keystore_fuzzing_test.go pkg=$repo/trie/ -compile_fuzzer github.com/ethereum/go-ethereum/trie \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/trie \ FuzzTrie fuzzTrie \ $pkg/trie_test.go,$pkg/database_test.go,$pkg/tracer_test.go,$pkg/proof_test.go,$pkg/iterator_test.go,$pkg/sync_test.go -compile_fuzzer github.com/ethereum/go-ethereum/trie \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/trie \ FuzzStackTrie fuzzStackTrie \ $pkg/stacktrie_fuzzer_test.go,$pkg/iterator_test.go,$pkg/trie_test.go,$pkg/database_test.go,$pkg/tracer_test.go,$pkg/proof_test.go,$pkg/sync_test.go #compile_fuzzer tests/fuzzers/snap FuzzARange fuzz_account_range -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap \ FuzzARange fuzz_account_range \ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap \ FuzzSRange fuzz_storage_range \ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap \ FuzzByteCodes fuzz_byte_codes \ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/eth/protocols/snap \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/eth/protocols/snap \ FuzzTrieNodes fuzz_trie_nodes\ $repo/eth/protocols/snap/handler_fuzzing_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bn256 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bn256 \ FuzzAdd fuzzBn256Add\ $repo/tests/fuzzers/bn256/bn256_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bn256 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bn256 \ FuzzMul fuzzBn256Mul \ $repo/tests/fuzzers/bn256/bn256_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bn256 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bn256 \ FuzzPair fuzzBn256Pair \ $repo/tests/fuzzers/bn256/bn256_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/txfetcher \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/txfetcher \ Fuzz fuzzTxfetcher \ $repo/tests/fuzzers/txfetcher/txfetcher_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzG1Add fuzz_g1_add\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzG1Mul fuzz_g1_mul\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzG1MultiExp fuzz_g1_multiexp \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzG2Add fuzz_g2_add \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzG2Mul fuzz_g2_mul\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzG2MultiExp fuzz_g2_multiexp \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzPairing fuzz_pairing \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzMapG1 fuzz_map_g1\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzMapG2 fuzz_map_g2 \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzCrossG1Add fuzz_cross_g1_add \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzCrossG1MultiExp fuzz_cross_g1_multiexp \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzCrossG2Add fuzz_cross_g2_add \ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/bls12381 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/bls12381 \ FuzzCrossPairing fuzz_cross_pairing\ $repo/tests/fuzzers/bls12381/bls12381_test.go -compile_fuzzer github.com/ethereum/go-ethereum/tests/fuzzers/secp256k1 \ +compile_fuzzer github.com/paxosglobal/go-ethereum-arbitrum/tests/fuzzers/secp256k1 \ Fuzz fuzzSecp256k1\ $repo/tests/fuzzers/secp256k1/secp_test.go diff --git a/p2p/dial.go b/p2p/dial.go index 5e4ab1d50d..15e859ad6c 100644 --- a/p2p/dial.go +++ b/p2p/dial.go @@ -27,10 +27,10 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) const ( diff --git a/p2p/dial_test.go b/p2p/dial_test.go index 13908f11ea..9cc5f856df 100644 --- a/p2p/dial_test.go +++ b/p2p/dial_test.go @@ -27,11 +27,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) // This test checks that dynamic dials are launched from discovery results. diff --git a/p2p/discover/common.go b/p2p/discover/common.go index c9f0477def..efbf4c69a4 100644 --- a/p2p/discover/common.go +++ b/p2p/discover/common.go @@ -21,11 +21,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/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 b8d97b44e1..201c9f5cbf 100644 --- a/p2p/discover/lookup.go +++ b/p2p/discover/lookup.go @@ -21,7 +21,7 @@ import ( "errors" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // lookup performs a network search for nodes close to the given target. It approaches the diff --git a/p2p/discover/metrics.go b/p2p/discover/metrics.go index 56aae24285..f7f855fede 100644 --- a/p2p/discover/metrics.go +++ b/p2p/discover/metrics.go @@ -20,7 +20,7 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) const ( diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 9ffe101ccf..d9f174d0d9 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -24,9 +24,9 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // node represents a host on the network. diff --git a/p2p/discover/ntp.go b/p2p/discover/ntp.go index 3f9157808f..c88c1f1b4b 100644 --- a/p2p/discover/ntp.go +++ b/p2p/discover/ntp.go @@ -24,7 +24,7 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/table.go b/p2p/discover/table.go index 2b7a28708b..672a1c66e7 100644 --- a/p2p/discover/table.go +++ b/p2p/discover/table.go @@ -33,11 +33,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) const ( diff --git a/p2p/discover/table_test.go b/p2p/discover/table_test.go index 3ba3422251..be4d0692d6 100644 --- a/p2p/discover/table_test.go +++ b/p2p/discover/table_test.go @@ -27,10 +27,10 @@ import ( "testing/quick" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/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 d6309dfd6c..5e4c18abe0 100644 --- a/p2p/discover/table_util_test.go +++ b/p2p/discover/table_util_test.go @@ -26,9 +26,9 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/v4_lookup_test.go b/p2p/discover/v4_lookup_test.go index 8867a5a8ac..3dd15e773c 100644 --- a/p2p/discover/v4_lookup_test.go +++ b/p2p/discover/v4_lookup_test.go @@ -22,10 +22,10 @@ import ( "net" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v4wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/v4_udp.go b/p2p/discover/v4_udp.go index 988f16b01d..b6f9888e90 100644 --- a/p2p/discover/v4_udp.go +++ b/p2p/discover/v4_udp.go @@ -29,11 +29,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v4wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) // Errors diff --git a/p2p/discover/v4_udp_test.go b/p2p/discover/v4_udp_test.go index 361e379626..913af7e062 100644 --- a/p2p/discover/v4_udp_test.go +++ b/p2p/discover/v4_udp_test.go @@ -31,11 +31,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v4wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v4wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) // shared test variables diff --git a/p2p/discover/v4wire/v4wire.go b/p2p/discover/v4wire/v4wire.go index 9c59359fb2..1c808654ec 100644 --- a/p2p/discover/v4wire/v4wire.go +++ b/p2p/discover/v4wire/v4wire.go @@ -27,11 +27,11 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // RPC packet types diff --git a/p2p/discover/v4wire/v4wire_test.go b/p2p/discover/v4wire/v4wire_test.go index 38820f3b48..8a2cb05435 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/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // EIP-8 test vectors. diff --git a/p2p/discover/v5_talk.go b/p2p/discover/v5_talk.go index c1f6787940..863abf18b1 100644 --- a/p2p/discover/v5_talk.go +++ b/p2p/discover/v5_talk.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v5wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // This is a limit for the number of concurrent talk requests. diff --git a/p2p/discover/v5_udp.go b/p2p/discover/v5_udp.go index 8b3e33d37c..6064f82138 100644 --- a/p2p/discover/v5_udp.go +++ b/p2p/discover/v5_udp.go @@ -28,12 +28,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v5wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) const ( diff --git a/p2p/discover/v5_udp_test.go b/p2p/discover/v5_udp_test.go index eaa969ea8b..486901aabc 100644 --- a/p2p/discover/v5_udp_test.go +++ b/p2p/discover/v5_udp_test.go @@ -27,12 +27,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover/v5wire" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover/v5wire" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/require" "golang.org/x/exp/slices" ) diff --git a/p2p/discover/v5wire/crypto.go b/p2p/discover/v5wire/crypto.go index fc0a0edef5..9a286d1d71 100644 --- a/p2p/discover/v5wire/crypto.go +++ b/p2p/discover/v5wire/crypto.go @@ -25,9 +25,9 @@ import ( "fmt" "hash" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" "golang.org/x/crypto/hkdf" ) diff --git a/p2p/discover/v5wire/crypto_test.go b/p2p/discover/v5wire/crypto_test.go index 72169b4314..434e840be3 100644 --- a/p2p/discover/v5wire/crypto_test.go +++ b/p2p/discover/v5wire/crypto_test.go @@ -25,9 +25,9 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) func TestVector_ECDH(t *testing.T) { diff --git a/p2p/discover/v5wire/encoding.go b/p2p/discover/v5wire/encoding.go index 5108910620..5730b783d7 100644 --- a/p2p/discover/v5wire/encoding.go +++ b/p2p/discover/v5wire/encoding.go @@ -28,10 +28,10 @@ import ( "fmt" "hash" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // TODO concurrent WHOAREYOU tie-breaker diff --git a/p2p/discover/v5wire/encoding_test.go b/p2p/discover/v5wire/encoding_test.go index a5387311a5..c8d0aad169 100644 --- a/p2p/discover/v5wire/encoding_test.go +++ b/p2p/discover/v5wire/encoding_test.go @@ -30,10 +30,10 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) // To regenerate discv5 test vectors, run diff --git a/p2p/discover/v5wire/msg.go b/p2p/discover/v5wire/msg.go index 401db2f6c5..c67cc2e9e3 100644 --- a/p2p/discover/v5wire/msg.go +++ b/p2p/discover/v5wire/msg.go @@ -20,11 +20,11 @@ import ( "fmt" "net" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Packet is implemented by all message types. diff --git a/p2p/discover/v5wire/session.go b/p2p/discover/v5wire/session.go index 862c21fcee..a49d845a90 100644 --- a/p2p/discover/v5wire/session.go +++ b/p2p/discover/v5wire/session.go @@ -22,10 +22,10 @@ import ( "encoding/binary" "time" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) const handshakeTimeout = time.Second diff --git a/p2p/dnsdisc/client.go b/p2p/dnsdisc/client.go index 8f1c221b80..e8cfb04d51 100644 --- a/p2p/dnsdisc/client.go +++ b/p2p/dnsdisc/client.go @@ -27,12 +27,12 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/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 abc35ddbd3..402860ad17 100644 --- a/p2p/dnsdisc/client_test.go +++ b/p2p/dnsdisc/client_test.go @@ -25,13 +25,13 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) var signingKeyForTesting, _ = crypto.ToECDSA(hexutil.MustDecode("0xdc599867fc513f8f5e2c2c9c489cde5e71362d1d9ec6e693e0de063236ed1240")) diff --git a/p2p/dnsdisc/sync.go b/p2p/dnsdisc/sync.go index 073547c90d..cd9624ee1a 100644 --- a/p2p/dnsdisc/sync.go +++ b/p2p/dnsdisc/sync.go @@ -21,8 +21,8 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/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 7d9703a345..729528efe0 100644 --- a/p2p/dnsdisc/tree.go +++ b/p2p/dnsdisc/tree.go @@ -25,10 +25,10 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" ) diff --git a/p2p/dnsdisc/tree_test.go b/p2p/dnsdisc/tree_test.go index 9ed17aa4b3..442fbcf5d0 100644 --- a/p2p/dnsdisc/tree_test.go +++ b/p2p/dnsdisc/tree_test.go @@ -21,8 +21,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) func TestParseRoot(t *testing.T) { diff --git a/p2p/enode/idscheme.go b/p2p/enode/idscheme.go index fd5d868b76..4f35b87386 100644 --- a/p2p/enode/idscheme.go +++ b/p2p/enode/idscheme.go @@ -21,10 +21,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/enode/idscheme_test.go b/p2p/enode/idscheme_test.go index 0910e6e83f..6db866c007 100644 --- a/p2p/enode/idscheme_test.go +++ b/p2p/enode/idscheme_test.go @@ -23,9 +23,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enode/iter_test.go b/p2p/enode/iter_test.go index b736ed450a..873b6abd12 100644 --- a/p2p/enode/iter_test.go +++ b/p2p/enode/iter_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) func TestReadNodes(t *testing.T) { diff --git a/p2p/enode/localnode.go b/p2p/enode/localnode.go index a18204e752..c3f3be1778 100644 --- a/p2p/enode/localnode.go +++ b/p2p/enode/localnode.go @@ -26,9 +26,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) const ( diff --git a/p2p/enode/localnode_test.go b/p2p/enode/localnode_test.go index 7f97ad392f..0d28350259 100644 --- a/p2p/enode/localnode_test.go +++ b/p2p/enode/localnode_test.go @@ -21,8 +21,8 @@ import ( "net" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/node.go b/p2p/enode/node.go index d7a1a9a156..f716a29cfb 100644 --- a/p2p/enode/node.go +++ b/p2p/enode/node.go @@ -26,8 +26,8 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/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 d15859c477..e4dc406589 100644 --- a/p2p/enode/node_test.go +++ b/p2p/enode/node_test.go @@ -24,8 +24,8 @@ import ( "testing" "testing/quick" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/enode/nodedb.go b/p2p/enode/nodedb.go index 7e7fb69b29..f95c9cc6fb 100644 --- a/p2p/enode/nodedb.go +++ b/p2p/enode/nodedb.go @@ -26,7 +26,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/errors" "github.com/syndtr/goleveldb/leveldb/iterator" diff --git a/p2p/enode/urlv4.go b/p2p/enode/urlv4.go index 0272eee987..fbe67de39f 100644 --- a/p2p/enode/urlv4.go +++ b/p2p/enode/urlv4.go @@ -26,9 +26,9 @@ import ( "regexp" "strconv" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) var ( diff --git a/p2p/enode/urlv4_test.go b/p2p/enode/urlv4_test.go index 33de96cc57..0c6ed3e940 100644 --- a/p2p/enode/urlv4_test.go +++ b/p2p/enode/urlv4_test.go @@ -24,8 +24,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) func init() { diff --git a/p2p/enr/enr.go b/p2p/enr/enr.go index 2b093b2f1a..35182d07f7 100644 --- a/p2p/enr/enr.go +++ b/p2p/enr/enr.go @@ -40,7 +40,7 @@ import ( "io" "sort" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/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 b85ee209d5..9693555a92 100644 --- a/p2p/enr/enr_test.go +++ b/p2p/enr/enr_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/p2p/enr/entries.go b/p2p/enr/entries.go index 9945a436c9..29f2596f8c 100644 --- a/p2p/enr/entries.go +++ b/p2p/enr/entries.go @@ -22,7 +22,7 @@ import ( "io" "net" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Entry is implemented by known node record entry types. diff --git a/p2p/message.go b/p2p/message.go index 3ab56ee350..1251b32552 100644 --- a/p2p/message.go +++ b/p2p/message.go @@ -24,9 +24,9 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // Msg defines the structure of a p2p message. diff --git a/p2p/metrics.go b/p2p/metrics.go index a6e36b91a8..09fe9ba741 100644 --- a/p2p/metrics.go +++ b/p2p/metrics.go @@ -22,7 +22,7 @@ import ( "errors" "net" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) const ( diff --git a/p2p/msgrate/msgrate.go b/p2p/msgrate/msgrate.go index de1a3177db..de4c906b5c 100644 --- a/p2p/msgrate/msgrate.go +++ b/p2p/msgrate/msgrate.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // measurementImpact is the impact a single measurement has on a peer's final diff --git a/p2p/nat/nat.go b/p2p/nat/nat.go index 2aa1f85585..e462ab9dca 100644 --- a/p2p/nat/nat.go +++ b/p2p/nat/nat.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" natpmp "github.com/jackpal/go-nat-pmp" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Interface An implementation of nat.Interface can map local ports to ports diff --git a/p2p/nat/natupnp_test.go b/p2p/nat/natupnp_test.go index 9072451d50..e234605952 100644 --- a/p2p/nat/natupnp_test.go +++ b/p2p/nat/natupnp_test.go @@ -166,7 +166,7 @@ func TestUPNP_DDWRT(t *testing.T) { if os.Getenv("CI") != "" { t.Fatalf("not discovered") } else { - t.Skipf("UPnP not discovered (known issue, see https://github.com/ethereum/go-ethereum/issues/21476)") + t.Skipf("UPnP not discovered (known issue, see https://github.com/paxosglobal/go-ethereum-arbitrum/issues/21476)") } } upnp, _ := discovered.(*upnp) diff --git a/p2p/netutil/iptrack.go b/p2p/netutil/iptrack.go index a070499e19..5d21f49f4f 100644 --- a/p2p/netutil/iptrack.go +++ b/p2p/netutil/iptrack.go @@ -19,7 +19,7 @@ package netutil import ( "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/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 ee3bba861e..183e2bef62 100644 --- a/p2p/netutil/iptrack_test.go +++ b/p2p/netutil/iptrack_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" ) const ( diff --git a/p2p/nodestate/nodestate.go b/p2p/nodestate/nodestate.go index 1e1757559c..7d410c1f82 100644 --- a/p2p/nodestate/nodestate.go +++ b/p2p/nodestate/nodestate.go @@ -23,13 +23,13 @@ import ( "time" "unsafe" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var ( diff --git a/p2p/nodestate/nodestate_test.go b/p2p/nodestate/nodestate_test.go index d06ad755e2..768807fe66 100644 --- a/p2p/nodestate/nodestate_test.go +++ b/p2p/nodestate/nodestate_test.go @@ -23,11 +23,11 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func testSetup(flagPersist []bool, fieldType []reflect.Type) (*Setup, []Flags, []Field) { diff --git a/p2p/peer.go b/p2p/peer.go index 65a7903f58..373fc32549 100644 --- a/p2p/peer.go +++ b/p2p/peer.go @@ -24,13 +24,13 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/exp/slices" ) diff --git a/p2p/peer_test.go b/p2p/peer_test.go index 4308bbd2eb..80a3adbbe4 100644 --- a/p2p/peer_test.go +++ b/p2p/peer_test.go @@ -28,9 +28,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) var discard = Protocol{ diff --git a/p2p/protocol.go b/p2p/protocol.go index 9bb6785a22..e51a06e5e4 100644 --- a/p2p/protocol.go +++ b/p2p/protocol.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" ) // Protocol represents a P2P subprotocol implementation. diff --git a/p2p/rlpx/buffer_test.go b/p2p/rlpx/buffer_test.go index 9fee4172bd..ea584907af 100644 --- a/p2p/rlpx/buffer_test.go +++ b/p2p/rlpx/buffer_test.go @@ -20,7 +20,7 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" "github.com/stretchr/testify/assert" ) diff --git a/p2p/rlpx/rlpx.go b/p2p/rlpx/rlpx.go index 8bd6f64b9b..4dc196c203 100644 --- a/p2p/rlpx/rlpx.go +++ b/p2p/rlpx/rlpx.go @@ -34,10 +34,10 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/rlp" "github.com/golang/snappy" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/ecies" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/p2p/rlpx/rlpx_test.go b/p2p/rlpx/rlpx_test.go index 136cb1b5bf..c86daf1a9e 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/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/ecies" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/ecies" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/pipes" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "github.com/stretchr/testify/assert" ) diff --git a/p2p/server.go b/p2p/server.go index 8f42765a8c..5572b4d9fe 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -28,16 +28,16 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/discover" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/discover" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/nat" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" "golang.org/x/exp/slices" ) diff --git a/p2p/server_nat.go b/p2p/server_nat.go index 299d275490..f5ad679a5e 100644 --- a/p2p/server_nat.go +++ b/p2p/server_nat.go @@ -20,10 +20,10 @@ import ( "net" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/nat" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/nat" ) const ( diff --git a/p2p/server_nat_test.go b/p2p/server_nat_test.go index de935fcfc5..35072eeba5 100644 --- a/p2p/server_nat_test.go +++ b/p2p/server_nat_test.go @@ -22,9 +22,9 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) func TestServerPortMapping(t *testing.T) { diff --git a/p2p/server_test.go b/p2p/server_test.go index a0491e984a..f91da86741 100644 --- a/p2p/server_test.go +++ b/p2p/server_test.go @@ -29,12 +29,12 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/testlog" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/p2p/rlpx" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/testlog" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/rlpx" ) type testTransport struct { diff --git a/p2p/simulations/adapters/exec.go b/p2p/simulations/adapters/exec.go index 63cc4936c1..6cf732b89a 100644 --- a/p2p/simulations/adapters/exec.go +++ b/p2p/simulations/adapters/exec.go @@ -34,13 +34,13 @@ import ( "syscall" "time" - "github.com/ethereum/go-ethereum/internal/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/rpc" "github.com/gorilla/websocket" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "golang.org/x/exp/slog" ) diff --git a/p2p/simulations/adapters/inproc.go b/p2p/simulations/adapters/inproc.go index 349e496b2f..6d12bef534 100644 --- a/p2p/simulations/adapters/inproc.go +++ b/p2p/simulations/adapters/inproc.go @@ -24,14 +24,14 @@ import ( "net" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" - "github.com/ethereum/go-ethereum/rpc" "github.com/gorilla/websocket" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/pipes" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // SimAdapter is a NodeAdapter which creates in-memory simulation nodes and diff --git a/p2p/simulations/adapters/inproc_test.go b/p2p/simulations/adapters/inproc_test.go index 2a61508fe1..d41894f7b4 100644 --- a/p2p/simulations/adapters/inproc_test.go +++ b/p2p/simulations/adapters/inproc_test.go @@ -23,7 +23,7 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/pipes" ) func TestTCPPipe(t *testing.T) { diff --git a/p2p/simulations/adapters/types.go b/p2p/simulations/adapters/types.go index fb8463d221..f02dadeca9 100644 --- a/p2p/simulations/adapters/types.go +++ b/p2p/simulations/adapters/types.go @@ -25,15 +25,15 @@ import ( "os" "strconv" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/internal/reexec" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" "github.com/gorilla/websocket" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/reexec" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "golang.org/x/exp/slog" ) diff --git a/p2p/simulations/connect.go b/p2p/simulations/connect.go index ede96b34c1..1d4281ee59 100644 --- a/p2p/simulations/connect.go +++ b/p2p/simulations/connect.go @@ -20,7 +20,7 @@ import ( "errors" "strings" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) var ( diff --git a/p2p/simulations/connect_test.go b/p2p/simulations/connect_test.go index 0154a18b03..220ac45803 100644 --- a/p2p/simulations/connect_test.go +++ b/p2p/simulations/connect_test.go @@ -19,9 +19,9 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" ) func newTestNetwork(t *testing.T, nodeCount int) (*Network, []enode.ID) { diff --git a/p2p/simulations/examples/ping-pong.go b/p2p/simulations/examples/ping-pong.go index 70b35ad777..8eda0b39af 100644 --- a/p2p/simulations/examples/ping-pong.go +++ b/p2p/simulations/examples/ping-pong.go @@ -25,12 +25,12 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" ) var adapterType = flag.String("adapter", "sim", `node adapter to use (one of "sim", "exec" or "docker")`) diff --git a/p2p/simulations/http.go b/p2p/simulations/http.go index 34521b4778..73eda9c8e9 100644 --- a/p2p/simulations/http.go +++ b/p2p/simulations/http.go @@ -30,13 +30,13 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" "github.com/gorilla/websocket" "github.com/julienschmidt/httprouter" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // DefaultClient is the default simulation API client which expects the API diff --git a/p2p/simulations/http_test.go b/p2p/simulations/http_test.go index c53a49797b..6dbfcf1196 100644 --- a/p2p/simulations/http_test.go +++ b/p2p/simulations/http_test.go @@ -29,14 +29,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" - "github.com/ethereum/go-ethereum/rpc" "github.com/mattn/go-colorable" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" "golang.org/x/exp/slog" ) diff --git a/p2p/simulations/mocker.go b/p2p/simulations/mocker.go index 0dc04e65f9..784fb7c7e9 100644 --- a/p2p/simulations/mocker.go +++ b/p2p/simulations/mocker.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" ) // a map of mocker names to its function diff --git a/p2p/simulations/mocker_test.go b/p2p/simulations/mocker_test.go index 0112ee5cfd..029a6946da 100644 --- a/p2p/simulations/mocker_test.go +++ b/p2p/simulations/mocker_test.go @@ -27,7 +27,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" ) func TestMocker(t *testing.T) { diff --git a/p2p/simulations/network.go b/p2p/simulations/network.go index 4735e5cfa6..9d95b2ca21 100644 --- a/p2p/simulations/network.go +++ b/p2p/simulations/network.go @@ -26,11 +26,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/event" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/event" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" ) var DialBanTimeout = 200 * time.Millisecond diff --git a/p2p/simulations/network_test.go b/p2p/simulations/network_test.go index 4ed1e4e6c3..a7cf18ba2f 100644 --- a/p2p/simulations/network_test.go +++ b/p2p/simulations/network_test.go @@ -27,10 +27,10 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/node" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/simulations/adapters" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/node" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/adapters" ) // Tests that a created snapshot with a minimal service only contains the expected connections diff --git a/p2p/simulations/simulation.go b/p2p/simulations/simulation.go index ae62c42b9c..3ca5a52794 100644 --- a/p2p/simulations/simulation.go +++ b/p2p/simulations/simulation.go @@ -20,7 +20,7 @@ import ( "context" "time" - "github.com/ethereum/go-ethereum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/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 0edb07b127..045f3752d9 100644 --- a/p2p/simulations/test.go +++ b/p2p/simulations/test.go @@ -19,10 +19,10 @@ package simulations import ( "testing" - "github.com/ethereum/go-ethereum/p2p" - "github.com/ethereum/go-ethereum/p2p/enode" - "github.com/ethereum/go-ethereum/p2p/enr" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enode" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/enr" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // NoopService is the service that does not do anything diff --git a/p2p/tracker/tracker.go b/p2p/tracker/tracker.go index 0e473420f1..c3cfc1b740 100644 --- a/p2p/tracker/tracker.go +++ b/p2p/tracker/tracker.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) const ( diff --git a/p2p/transport.go b/p2p/transport.go index 4f6bb569bf..8d55a6ec5c 100644 --- a/p2p/transport.go +++ b/p2p/transport.go @@ -25,11 +25,11 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/bitutil" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/p2p/rlpx" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/bitutil" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/rlpx" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) const ( diff --git a/p2p/transport_test.go b/p2p/transport_test.go index 24e06c5a06..0040936b77 100644 --- a/p2p/transport_test.go +++ b/p2p/transport_test.go @@ -23,8 +23,8 @@ import ( "testing" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/p2p/simulations/pipes" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/simulations/pipes" ) func TestProtocolHandshake(t *testing.T) { diff --git a/p2p/util.go b/p2p/util.go index 2c8f322a66..43cc6eedfb 100644 --- a/p2p/util.go +++ b/p2p/util.go @@ -19,7 +19,7 @@ package p2p import ( "container/heap" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" ) // expHeap tracks strings and their expiry time. diff --git a/p2p/util_test.go b/p2p/util_test.go index cc0d2b215f..73fe3a1f1c 100644 --- a/p2p/util_test.go +++ b/p2p/util_test.go @@ -20,7 +20,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" ) func TestExpHeap(t *testing.T) { diff --git a/params/bootnodes.go b/params/bootnodes.go index 5e2c7c2181..5b350c096e 100644 --- a/params/bootnodes.go +++ b/params/bootnodes.go @@ -16,7 +16,7 @@ package params -import "github.com/ethereum/go-ethereum/common" +import "github.com/paxosglobal/go-ethereum-arbitrum/common" // MainnetBootnodes are the enode URLs of the P2P bootstrap nodes running on // the main Ethereum network. diff --git a/params/config.go b/params/config.go index dcc29a2608..b441e3a137 100644 --- a/params/config.go +++ b/params/config.go @@ -20,8 +20,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/params/forks" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/params/forks" ) // Genesis hashes to enforce below configs on. diff --git a/params/config_arbitrum.go b/params/config_arbitrum.go index 8acda118b1..e5a33cdf53 100644 --- a/params/config_arbitrum.go +++ b/params/config_arbitrum.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) const ArbosVersion_FixRedeemGas = uint64(11) diff --git a/params/config_test.go b/params/config_test.go index 1d03d96739..2d574766f6 100644 --- a/params/config_test.go +++ b/params/config_test.go @@ -22,7 +22,7 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) func TestCheckCompatible(t *testing.T) { diff --git a/params/dao.go b/params/dao.go index da3c8dfc99..82ee0cbdbd 100644 --- a/params/dao.go +++ b/params/dao.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // DAOForkBlockExtra is the block header extra-data field to set for the DAO fork diff --git a/params/protocol_params.go b/params/protocol_params.go index 077af27d08..b32b3e53b2 100644 --- a/params/protocol_params.go +++ b/params/protocol_params.go @@ -19,7 +19,7 @@ package params import ( "math/big" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) const ( diff --git a/rlp/decode.go b/rlp/decode.go index 9b17d2d810..f7c5f1b127 100644 --- a/rlp/decode.go +++ b/rlp/decode.go @@ -28,8 +28,8 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp/internal/rlpstruct" ) //lint:ignore ST1012 EOL is not an error. diff --git a/rlp/decode_test.go b/rlp/decode_test.go index 07d9c579a6..0e277f4746 100644 --- a/rlp/decode_test.go +++ b/rlp/decode_test.go @@ -27,8 +27,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/common/math" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) func TestStreamKind(t *testing.T) { diff --git a/rlp/encbuffer_example_test.go b/rlp/encbuffer_example_test.go index ee15d82a77..5d4664b8bd 100644 --- a/rlp/encbuffer_example_test.go +++ b/rlp/encbuffer_example_test.go @@ -20,7 +20,7 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func ExampleEncoderBuffer() { diff --git a/rlp/encode.go b/rlp/encode.go index ffb42b2997..8efd0e6ec5 100644 --- a/rlp/encode.go +++ b/rlp/encode.go @@ -23,8 +23,8 @@ import ( "math/big" "reflect" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp/internal/rlpstruct" ) var ( diff --git a/rlp/encode_test.go b/rlp/encode_test.go index 314958eb56..c600b1252d 100644 --- a/rlp/encode_test.go +++ b/rlp/encode_test.go @@ -26,8 +26,8 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common/math" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) type testEncoder struct { diff --git a/rlp/encoder_example_test.go b/rlp/encoder_example_test.go index 4cd3cb8673..499fd33f26 100644 --- a/rlp/encoder_example_test.go +++ b/rlp/encoder_example_test.go @@ -20,7 +20,7 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) type MyCoolType struct { diff --git a/rlp/iterator_test.go b/rlp/iterator_test.go index a22aaec862..1d683d5ccc 100644 --- a/rlp/iterator_test.go +++ b/rlp/iterator_test.go @@ -19,7 +19,7 @@ package rlp import ( "testing" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // TestIterator tests some basic things about the ListIterator. A more diff --git a/rlp/rlpgen/gen.go b/rlp/rlpgen/gen.go index 0c65864826..4bed647809 100644 --- a/rlp/rlpgen/gen.go +++ b/rlp/rlpgen/gen.go @@ -23,7 +23,7 @@ import ( "go/types" "sort" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp/internal/rlpstruct" ) // buildContext keeps the data needed for make*Op. diff --git a/rlp/rlpgen/main.go b/rlp/rlpgen/main.go index b3a74b9df1..536a45c302 100644 --- a/rlp/rlpgen/main.go +++ b/rlp/rlpgen/main.go @@ -27,7 +27,7 @@ import ( "golang.org/x/tools/go/packages" ) -const pathOfPackageRLP = "github.com/ethereum/go-ethereum/rlp" +const pathOfPackageRLP = "github.com/paxosglobal/go-ethereum-arbitrum/rlp" func main() { var ( diff --git a/rlp/rlpgen/testdata/bigint.out.txt b/rlp/rlpgen/testdata/bigint.out.txt index f54d1faa15..95e3db00f6 100644 --- a/rlp/rlpgen/testdata/bigint.out.txt +++ b/rlp/rlpgen/testdata/bigint.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/nil.out.txt b/rlp/rlpgen/testdata/nil.out.txt index e0d5dcebad..96d05a6b0c 100644 --- a/rlp/rlpgen/testdata/nil.out.txt +++ b/rlp/rlpgen/testdata/nil.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/optional.out.txt b/rlp/rlpgen/testdata/optional.out.txt index 02df8e457f..7ca08733ab 100644 --- a/rlp/rlpgen/testdata/optional.out.txt +++ b/rlp/rlpgen/testdata/optional.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/rawvalue.in.txt b/rlp/rlpgen/testdata/rawvalue.in.txt index 3a657bc907..bd9b924ee2 100644 --- a/rlp/rlpgen/testdata/rawvalue.in.txt +++ b/rlp/rlpgen/testdata/rawvalue.in.txt @@ -2,7 +2,7 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" type Test struct { RawValue rlp.RawValue diff --git a/rlp/rlpgen/testdata/rawvalue.out.txt b/rlp/rlpgen/testdata/rawvalue.out.txt index 3607c98636..9d928549af 100644 --- a/rlp/rlpgen/testdata/rawvalue.out.txt +++ b/rlp/rlpgen/testdata/rawvalue.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/uint256.out.txt b/rlp/rlpgen/testdata/uint256.out.txt index 5e6d3ed992..dc9d942ae3 100644 --- a/rlp/rlpgen/testdata/uint256.out.txt +++ b/rlp/rlpgen/testdata/uint256.out.txt @@ -1,7 +1,7 @@ package test -import "github.com/ethereum/go-ethereum/rlp" import "github.com/holiman/uint256" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/rlpgen/testdata/uints.out.txt b/rlp/rlpgen/testdata/uints.out.txt index 1a354956a4..2addb17839 100644 --- a/rlp/rlpgen/testdata/uints.out.txt +++ b/rlp/rlpgen/testdata/uints.out.txt @@ -1,6 +1,6 @@ package test -import "github.com/ethereum/go-ethereum/rlp" +import "github.com/paxosglobal/go-ethereum-arbitrum/rlp" import "io" func (obj *Test) EncodeRLP(_w io.Writer) error { diff --git a/rlp/typecache.go b/rlp/typecache.go index 3e37c9d2fc..e235d20013 100644 --- a/rlp/typecache.go +++ b/rlp/typecache.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/rlp/internal/rlpstruct" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp/internal/rlpstruct" ) // typeinfo is an entry in the type cache. diff --git a/rpc/client.go b/rpc/client.go index f6a1d90822..514612428e 100644 --- a/rpc/client.go +++ b/rpc/client.go @@ -28,7 +28,7 @@ import ( "sync/atomic" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) var ( diff --git a/rpc/client_example_test.go b/rpc/client_example_test.go index 044b57a9c4..0f8e468f36 100644 --- a/rpc/client_example_test.go +++ b/rpc/client_example_test.go @@ -21,8 +21,8 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // In this example, our client wishes to track the latest 'block number' diff --git a/rpc/client_opt_test.go b/rpc/client_opt_test.go index d7cc2572a7..3c5417b49d 100644 --- a/rpc/client_opt_test.go +++ b/rpc/client_opt_test.go @@ -5,7 +5,7 @@ import ( "net/http" "time" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) // This example configures a HTTP-based RPC client with two options - one setting the diff --git a/rpc/client_test.go b/rpc/client_test.go index ac02ad33cf..bd82012651 100644 --- a/rpc/client_test.go +++ b/rpc/client_test.go @@ -34,7 +34,7 @@ import ( "time" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) func TestClientRequest(t *testing.T) { @@ -493,7 +493,7 @@ func TestClientSubscribeClose(t *testing.T) { } } -// This test reproduces https://github.com/ethereum/go-ethereum/issues/17837 where the +// This test reproduces https://github.com/paxosglobal/go-ethereum-arbitrum/issues/17837 where the // client hangs during shutdown when Unsubscribe races with Client.Close. func TestClientCloseUnsubscribeRace(t *testing.T) { server := newTestServer() @@ -578,7 +578,7 @@ func TestClientSubscriptionUnsubscribeServer(t *testing.T) { } // This checks that the subscribed channel can be closed after Unsubscribe. -// It is the reproducer for https://github.com/ethereum/go-ethereum/issues/22322 +// It is the reproducer for https://github.com/paxosglobal/go-ethereum-arbitrum/issues/22322 func TestClientSubscriptionChannelClose(t *testing.T) { t.Parallel() diff --git a/rpc/doc.go b/rpc/doc.go index 7c87793dca..db6d272aa8 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/ethereum/go-ethereum/wiki/RPC-PUB-SUB. +For more information about subscriptions, see https://github.com/paxosglobal/go-ethereum-arbitrum/wiki/RPC-PUB-SUB. # Reverse Calls diff --git a/rpc/endpoints.go b/rpc/endpoints.go index d78ebe2858..a254accdd4 100644 --- a/rpc/endpoints.go +++ b/rpc/endpoints.go @@ -20,7 +20,7 @@ import ( "net" "strings" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // StartIPCEndpoint starts an IPC endpoint. diff --git a/rpc/handler.go b/rpc/handler.go index f44e4d7b01..212cec6957 100644 --- a/rpc/handler.go +++ b/rpc/handler.go @@ -25,7 +25,7 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // handler handles JSON-RPC messages. There is one handler per connection. Note that diff --git a/rpc/ipc.go b/rpc/ipc.go index a08245b270..23e3896e2a 100644 --- a/rpc/ipc.go +++ b/rpc/ipc.go @@ -20,8 +20,8 @@ import ( "context" "net" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/p2p/netutil" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/p2p/netutil" ) // ServeListener accepts connections on l, serving JSON-RPC on them. diff --git a/rpc/ipc_unix.go b/rpc/ipc_unix.go index 33c1cad549..ac8ed1f0ff 100644 --- a/rpc/ipc_unix.go +++ b/rpc/ipc_unix.go @@ -26,7 +26,7 @@ import ( "os" "path/filepath" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) const ( diff --git a/rpc/metrics.go b/rpc/metrics.go index 4573fee110..2df2d3a3c0 100644 --- a/rpc/metrics.go +++ b/rpc/metrics.go @@ -20,7 +20,7 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/rpc/server.go b/rpc/server.go index b1af6650ac..dd47e9e60f 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -22,7 +22,7 @@ import ( "sync" "sync/atomic" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) const MetadataApi = "rpc" diff --git a/rpc/service.go b/rpc/service.go index 9f0eebdf9c..21634bf4b1 100644 --- a/rpc/service.go +++ b/rpc/service.go @@ -25,7 +25,7 @@ import ( "sync" "unicode" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) var ( diff --git a/rpc/subscription_test.go b/rpc/subscription_test.go index 3a131c8e6b..9f45d87c89 100644 --- a/rpc/subscription_test.go +++ b/rpc/subscription_test.go @@ -28,8 +28,8 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) func TestNewID(t *testing.T) { diff --git a/rpc/types.go b/rpc/types.go index f88c37c59d..1497464f91 100644 --- a/rpc/types.go +++ b/rpc/types.go @@ -23,8 +23,8 @@ import ( "math" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) // API describes the set of methods offered over the RPC interface diff --git a/rpc/types_test.go b/rpc/types_test.go index 617f441d91..43107aa2f3 100644 --- a/rpc/types_test.go +++ b/rpc/types_test.go @@ -21,8 +21,8 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) func TestBlockNumberJSONUnmarshal(t *testing.T) { diff --git a/rpc/websocket.go b/rpc/websocket.go index 538e53a31b..e00fd5878f 100644 --- a/rpc/websocket.go +++ b/rpc/websocket.go @@ -28,8 +28,8 @@ import ( "time" mapset "github.com/deckarep/golang-set/v2" - "github.com/ethereum/go-ethereum/log" "github.com/gorilla/websocket" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) const ( diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go index 8d2bd9d802..93340b3480 100644 --- a/rpc/websocket_test.go +++ b/rpc/websocket_test.go @@ -235,7 +235,7 @@ func TestClientWebsocketPing(t *testing.T) { // server can't handle the request. // Wait for the context's deadline to be reached before proceeding. - // This is important for reproducing https://github.com/ethereum/go-ethereum/issues/19798 + // This is important for reproducing https://github.com/paxosglobal/go-ethereum-arbitrum/issues/19798 <-ctx.Done() close(sendPing) diff --git a/signer/core/api.go b/signer/core/api.go index 23ddcd0a20..1568cb5d1c 100644 --- a/signer/core/api.go +++ b/signer/core/api.go @@ -26,18 +26,18 @@ import ( "os" "reflect" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/accounts/scwallet" - "github.com/ethereum/go-ethereum/accounts/usbwallet" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/scwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/usbwallet" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/storage" ) const ( diff --git a/signer/core/api_test.go b/signer/core/api_test.go index 69229dadaf..e6b95f4941 100644 --- a/signer/core/api_test.go +++ b/signer/core/api_test.go @@ -26,17 +26,17 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/fourbyte" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/fourbyte" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/storage" ) // Used for testing diff --git a/signer/core/apitypes/signed_data_internal_test.go b/signer/core/apitypes/signed_data_internal_test.go index 8067893c21..9fdac3c7a3 100644 --- a/signer/core/apitypes/signed_data_internal_test.go +++ b/signer/core/apitypes/signed_data_internal_test.go @@ -21,9 +21,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) func TestBytesPadding(t *testing.T) { diff --git a/signer/core/apitypes/types.go b/signer/core/apitypes/types.go index 3467fd1fea..5645546cbf 100644 --- a/signer/core/apitypes/types.go +++ b/signer/core/apitypes/types.go @@ -29,14 +29,14 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" ) var typedDataReferenceTypeRegexp = regexp.MustCompile(`^[A-Za-z](\w*)(\[\])?$`) @@ -94,7 +94,7 @@ type SendTxArgs struct { // We accept "data" and "input" for backwards-compatibility reasons. // "input" is the newer name and should be preferred by clients. - // Issue detail: https://github.com/ethereum/go-ethereum/issues/15628 + // Issue detail: https://github.com/paxosglobal/go-ethereum-arbitrum/issues/15628 Data *hexutil.Bytes `json:"data,omitempty"` Input *hexutil.Bytes `json:"input,omitempty"` diff --git a/signer/core/apitypes/types_test.go b/signer/core/apitypes/types_test.go index 324ff8a840..899e54df8a 100644 --- a/signer/core/apitypes/types_test.go +++ b/signer/core/apitypes/types_test.go @@ -21,10 +21,10 @@ import ( "encoding/json" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto/kzg4844" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/kzg4844" ) func TestIsPrimitive(t *testing.T) { diff --git a/signer/core/auditlog.go b/signer/core/auditlog.go index d2207c9eb8..f9572c9ee2 100644 --- a/signer/core/auditlog.go +++ b/signer/core/auditlog.go @@ -21,11 +21,11 @@ import ( "encoding/json" "os" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" "golang.org/x/exp/slog" ) diff --git a/signer/core/cliui.go b/signer/core/cliui.go index e04077865d..793bed4868 100644 --- a/signer/core/cliui.go +++ b/signer/core/cliui.go @@ -25,10 +25,10 @@ import ( "strings" "sync" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/console/prompt" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/console/prompt" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) type CommandlineUI struct { diff --git a/signer/core/gnosis_safe.go b/signer/core/gnosis_safe.go index 01724e5383..7803698ed8 100644 --- a/signer/core/gnosis_safe.go +++ b/signer/core/gnosis_safe.go @@ -20,10 +20,10 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" ) // GnosisSafeTx is a type to parse the safe-tx returned by the relayer, diff --git a/signer/core/signed_data.go b/signer/core/signed_data.go index 3c2b6f5d45..7971ea168c 100644 --- a/signer/core/signed_data.go +++ b/signer/core/signed_data.go @@ -23,14 +23,14 @@ import ( "fmt" "mime" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/consensus/clique" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/clique" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" ) // sign receives a request and produces a signature @@ -302,7 +302,7 @@ func (api *SignerAPI) EcRecover(ctx context.Context, data hexutil.Bytes, sig hex // Note, the signature must conform to the secp256k1 curve R, S and V values, where // the V value must be 27 or 28 for legacy reasons. // - // https://github.com/ethereum/go-ethereum/wiki/Management-APIs#personal_ecRecover + // https://github.com/paxosglobal/go-ethereum-arbitrum/wiki/Management-APIs#personal_ecRecover if len(sig) != 65 { return common.Address{}, errors.New("signature must be 65 bytes long") } diff --git a/signer/core/signed_data_test.go b/signer/core/signed_data_test.go index 1cf8b4bf38..2b3dee859c 100644 --- a/signer/core/signed_data_test.go +++ b/signer/core/signed_data_test.go @@ -27,13 +27,13 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" ) var typesStandard = apitypes.Types{ diff --git a/signer/core/stdioui.go b/signer/core/stdioui.go index a0ce684417..dee77f19f2 100644 --- a/signer/core/stdioui.go +++ b/signer/core/stdioui.go @@ -19,9 +19,9 @@ package core import ( "context" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rpc" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rpc" ) type StdIOUI struct { diff --git a/signer/core/uiapi.go b/signer/core/uiapi.go index b8c3acfb4d..32c3418a88 100644 --- a/signer/core/uiapi.go +++ b/signer/core/uiapi.go @@ -24,11 +24,11 @@ import ( "math/big" "os" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/accounts/keystore" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/keystore" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" ) // UIServerAPI implements methods Clef provides for a UI to query, in the bidirectional communication diff --git a/signer/fourbyte/abi.go b/signer/fourbyte/abi.go index 352abc59e1..e6edd12cea 100644 --- a/signer/fourbyte/abi.go +++ b/signer/fourbyte/abi.go @@ -22,8 +22,8 @@ import ( "fmt" "strings" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // decodedCallData is an internal type to represent a method call parsed according diff --git a/signer/fourbyte/abi_test.go b/signer/fourbyte/abi_test.go index 9656732dff..d6a5f9bb09 100644 --- a/signer/fourbyte/abi_test.go +++ b/signer/fourbyte/abi_test.go @@ -22,8 +22,8 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) func verify(t *testing.T, jsondata, calldata string, exp []interface{}) { diff --git a/signer/fourbyte/fourbyte_test.go b/signer/fourbyte/fourbyte_test.go index a3dc3b5117..99876eb74b 100644 --- a/signer/fourbyte/fourbyte_test.go +++ b/signer/fourbyte/fourbyte_test.go @@ -21,8 +21,8 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/accounts/abi" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts/abi" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // Tests that all the selectors contained in the 4byte database are valid. diff --git a/signer/fourbyte/validation.go b/signer/fourbyte/validation.go index 0451bda91d..04e7c7783d 100644 --- a/signer/fourbyte/validation.go +++ b/signer/fourbyte/validation.go @@ -22,8 +22,8 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" ) // ValidateTransaction does a number of checks on the supplied transaction, and @@ -54,7 +54,7 @@ func (db *Database) ValidateTransaction(selector *string, tx *apitypes.SendTxArg if tx.To == nil { // Contract creation should contain sufficient data to deploy a contract. A // typical error is omitting sender due to some quirk in the javascript call - // e.g. https://github.com/ethereum/go-ethereum/issues/16106. + // e.g. https://github.com/paxosglobal/go-ethereum-arbitrum/issues/16106. if len(data) == 0 { // Prevent sending ether into black hole (show stopper) if tx.Value.ToInt().Cmp(big.NewInt(0)) > 0 { diff --git a/signer/fourbyte/validation_test.go b/signer/fourbyte/validation_test.go index 74fed9fe01..c0492a0c20 100644 --- a/signer/fourbyte/validation_test.go +++ b/signer/fourbyte/validation_test.go @@ -20,9 +20,9 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" ) func mixAddr(a string) (*common.MixedcaseAddress, error) { diff --git a/signer/rules/rules.go b/signer/rules/rules.go index c9921e57a9..fc59087b18 100644 --- a/signer/rules/rules.go +++ b/signer/rules/rules.go @@ -24,11 +24,11 @@ import ( "strings" "github.com/dop251/goja" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/internal/jsre/deps" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/jsre/deps" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/storage" ) // consoleOutput is an override for the console.log and console.error methods to diff --git a/signer/rules/rules_test.go b/signer/rules/rules_test.go index d27de22b29..f44f10460e 100644 --- a/signer/rules/rules_test.go +++ b/signer/rules/rules_test.go @@ -22,14 +22,14 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/accounts" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/internal/ethapi" - "github.com/ethereum/go-ethereum/signer/core" - "github.com/ethereum/go-ethereum/signer/core/apitypes" - "github.com/ethereum/go-ethereum/signer/storage" + "github.com/paxosglobal/go-ethereum-arbitrum/accounts" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/internal/ethapi" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/core/apitypes" + "github.com/paxosglobal/go-ethereum-arbitrum/signer/storage" ) const JS = ` diff --git a/signer/storage/aes_gcm_storage.go b/signer/storage/aes_gcm_storage.go index 928d643dd6..f3056fbae1 100644 --- a/signer/storage/aes_gcm_storage.go +++ b/signer/storage/aes_gcm_storage.go @@ -24,7 +24,7 @@ import ( "io" "os" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) type storedCredential struct { diff --git a/signer/storage/aes_gcm_storage_test.go b/signer/storage/aes_gcm_storage_test.go index a223b1a6b4..c754327a5c 100644 --- a/signer/storage/aes_gcm_storage_test.go +++ b/signer/storage/aes_gcm_storage_test.go @@ -23,9 +23,9 @@ import ( "os" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" "github.com/mattn/go-colorable" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" "golang.org/x/exp/slog" ) diff --git a/tests/block_test.go b/tests/block_test.go index aa6f27b8f3..dd400be9d6 100644 --- a/tests/block_test.go +++ b/tests/block_test.go @@ -21,8 +21,8 @@ import ( "runtime" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" ) func TestBlockchain(t *testing.T) { diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 93fcace812..ce7d892934 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -26,22 +26,22 @@ import ( "os" "reflect" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/beacon" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/beacon" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) // A BlockTest checks handling of entire blocks. diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go index 03e14df7c4..875d7c7005 100644 --- a/tests/difficulty_test.go +++ b/tests/difficulty_test.go @@ -20,7 +20,7 @@ import ( "math/big" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 62b978f9ef..6ffb6df716 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -20,11 +20,11 @@ import ( "fmt" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) //go:generate go run github.com/fjl/gencodec -type DifficultyTest -field-override difficultyTestMarshaling -out gen_difficultytest.go diff --git a/tests/fuzzers/bls12381/bls12381_fuzz.go b/tests/fuzzers/bls12381/bls12381_fuzz.go index 9a5c566540..a5ea7a3258 100644 --- a/tests/fuzzers/bls12381/bls12381_fuzz.go +++ b/tests/fuzzers/bls12381/bls12381_fuzz.go @@ -30,8 +30,8 @@ import ( gnark "github.com/consensys/gnark-crypto/ecc/bls12-381" "github.com/consensys/gnark-crypto/ecc/bls12-381/fp" "github.com/consensys/gnark-crypto/ecc/bls12-381/fr" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto/bls12381" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/bls12381" blst "github.com/supranational/blst/bindings/go" ) diff --git a/tests/fuzzers/bls12381/precompile_fuzzer.go b/tests/fuzzers/bls12381/precompile_fuzzer.go index 763ed56e9f..816841de0f 100644 --- a/tests/fuzzers/bls12381/precompile_fuzzer.go +++ b/tests/fuzzers/bls12381/precompile_fuzzer.go @@ -20,8 +20,8 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" ) const ( diff --git a/tests/fuzzers/bn256/bn256_fuzz.go b/tests/fuzzers/bn256/bn256_fuzz.go index 75f7d59dee..1a7cbda819 100644 --- a/tests/fuzzers/bn256/bn256_fuzz.go +++ b/tests/fuzzers/bn256/bn256_fuzz.go @@ -23,8 +23,8 @@ import ( "math/big" "github.com/consensys/gnark-crypto/ecc/bn254" - cloudflare "github.com/ethereum/go-ethereum/crypto/bn256/cloudflare" - google "github.com/ethereum/go-ethereum/crypto/bn256/google" + cloudflare "github.com/paxosglobal/go-ethereum-arbitrum/crypto/bn256/cloudflare" + google "github.com/paxosglobal/go-ethereum-arbitrum/crypto/bn256/google" ) func getG1Points(input io.Reader) (*cloudflare.G1, *google.G1, *bn254.G1Affine) { diff --git a/tests/fuzzers/difficulty/difficulty-fuzz.go b/tests/fuzzers/difficulty/difficulty-fuzz.go index fbbd7f6876..7f76e65287 100644 --- a/tests/fuzzers/difficulty/difficulty-fuzz.go +++ b/tests/fuzzers/difficulty/difficulty-fuzz.go @@ -23,8 +23,8 @@ import ( "io" "math/big" - "github.com/ethereum/go-ethereum/consensus/ethash" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/ethash" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) type fuzzer struct { diff --git a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go index 6b5ca90880..246fb42e97 100644 --- a/tests/fuzzers/rangeproof/rangeproof-fuzzer.go +++ b/tests/fuzzers/rangeproof/rangeproof-fuzzer.go @@ -22,10 +22,10 @@ import ( "fmt" "io" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" "golang.org/x/exp/slices" ) diff --git a/tests/fuzzers/secp256k1/secp_test.go b/tests/fuzzers/secp256k1/secp_test.go index ca3039764b..48601725fa 100644 --- a/tests/fuzzers/secp256k1/secp_test.go +++ b/tests/fuzzers/secp256k1/secp_test.go @@ -21,7 +21,7 @@ import ( "testing" "github.com/btcsuite/btcd/btcec/v2" - "github.com/ethereum/go-ethereum/crypto/secp256k1" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto/secp256k1" ) func TestFuzzer(t *testing.T) { diff --git a/tests/fuzzers/txfetcher/txfetcher_fuzzer.go b/tests/fuzzers/txfetcher/txfetcher_fuzzer.go index 51f2fc3b4d..4ae09e0251 100644 --- a/tests/fuzzers/txfetcher/txfetcher_fuzzer.go +++ b/tests/fuzzers/txfetcher/txfetcher_fuzzer.go @@ -23,10 +23,10 @@ import ( "math/rand" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/mclock" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/eth/fetcher" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/mclock" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/fetcher" ) var ( diff --git a/tests/gen_btheader.go b/tests/gen_btheader.go index 80ad89e03b..6ebb851d1c 100644 --- a/tests/gen_btheader.go +++ b/tests/gen_btheader.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var _ = (*btHeaderMarshaling)(nil) diff --git a/tests/gen_difficultytest.go b/tests/gen_difficultytest.go index cd15ae31b5..755c2e0eae 100644 --- a/tests/gen_difficultytest.go +++ b/tests/gen_difficultytest.go @@ -6,8 +6,8 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) var _ = (*difficultyTestMarshaling)(nil) diff --git a/tests/gen_stenv.go b/tests/gen_stenv.go index a5bd0d5fcb..f7f2c545bf 100644 --- a/tests/gen_stenv.go +++ b/tests/gen_stenv.go @@ -7,8 +7,8 @@ import ( "errors" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" ) var _ = (*stEnvMarshaling)(nil) diff --git a/tests/gen_sttransaction.go b/tests/gen_sttransaction.go index 9b5aecbfe6..8319d02544 100644 --- a/tests/gen_sttransaction.go +++ b/tests/gen_sttransaction.go @@ -6,10 +6,10 @@ import ( "encoding/json" "math/big" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) var _ = (*stTransactionMarshaling)(nil) diff --git a/tests/init.go b/tests/init.go index 99b7e4d333..c1f255b9c0 100644 --- a/tests/init.go +++ b/tests/init.go @@ -21,7 +21,7 @@ import ( "math/big" "sort" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func u64(val uint64) *uint64 { return &val } diff --git a/tests/init_test.go b/tests/init_test.go index 3ab15e7658..f09079c2f0 100644 --- a/tests/init_test.go +++ b/tests/init_test.go @@ -30,7 +30,7 @@ import ( "strings" "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) var ( diff --git a/tests/rlp_test_util.go b/tests/rlp_test_util.go index e4bd5450a8..75003cd7e8 100644 --- a/tests/rlp_test_util.go +++ b/tests/rlp_test_util.go @@ -24,7 +24,7 @@ import ( "math/big" "strings" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // RLPTest is the JSON structure of a single RLP test. diff --git a/tests/state_test.go b/tests/state_test.go index e4335b3ec8..c0e6af7617 100644 --- a/tests/state_test.go +++ b/tests/state_test.go @@ -30,14 +30,14 @@ import ( "testing" "time" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/eth/tracers/logger" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/eth/tracers/logger" ) func TestState(t *testing.T) { diff --git a/tests/state_test_util.go b/tests/state_test_util.go index 707a802c07..0e1a979607 100644 --- a/tests/state_test_util.go +++ b/tests/state_test_util.go @@ -25,24 +25,24 @@ import ( "strconv" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/common/math" - "github.com/ethereum/go-ethereum/consensus/misc/eip4844" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/state" - "github.com/ethereum/go-ethereum/core/state/snapshot" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/core/vm" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common/math" + "github.com/paxosglobal/go-ethereum-arbitrum/consensus/misc/eip4844" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state" + "github.com/paxosglobal/go-ethereum-arbitrum/core/state/snapshot" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/core/vm" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" "golang.org/x/crypto/sha3" ) diff --git a/tests/transaction_test.go b/tests/transaction_test.go index cb0f262318..ea7f664f64 100644 --- a/tests/transaction_test.go +++ b/tests/transaction_test.go @@ -19,7 +19,7 @@ package tests import ( "testing" - "github.com/ethereum/go-ethereum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/params" ) func TestTransaction(t *testing.T) { diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 391aa57584..1df891146b 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -19,12 +19,12 @@ package tests import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" - "github.com/ethereum/go-ethereum/core" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/core" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // TransactionTest checks RLP decoding and sender derivation of transactions. diff --git a/trie/committer.go b/trie/committer.go index 92163cdb3b..baa4a2e43e 100644 --- a/trie/committer.go +++ b/trie/committer.go @@ -19,8 +19,8 @@ package trie import ( "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // committer is the tool used for the trie Commit operation. The committer will diff --git a/trie/database.go b/trie/database.go index 321b4f8955..cbf75012c0 100644 --- a/trie/database.go +++ b/trie/database.go @@ -19,13 +19,13 @@ package trie import ( "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) // Config defines all necessary options for database. diff --git a/trie/database_test.go b/trie/database_test.go index d508c65533..3a79d3c069 100644 --- a/trie/database_test.go +++ b/trie/database_test.go @@ -17,10 +17,10 @@ package trie import ( - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie/triedb/hashdb" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/hashdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" ) // newTestDatabase initializes the trie database with specified scheme. diff --git a/trie/errors.go b/trie/errors.go index 7be7041c7f..306f80807d 100644 --- a/trie/errors.go +++ b/trie/errors.go @@ -20,7 +20,7 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // ErrCommitted is returned when a already committed trie is requested for usage. diff --git a/trie/hasher.go b/trie/hasher.go index 1e063d8020..c49141c0d7 100644 --- a/trie/hasher.go +++ b/trie/hasher.go @@ -19,8 +19,8 @@ package trie import ( "sync" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" "golang.org/x/crypto/sha3" ) diff --git a/trie/iterator.go b/trie/iterator.go index 83ccc0740f..625716ced0 100644 --- a/trie/iterator.go +++ b/trie/iterator.go @@ -21,8 +21,8 @@ import ( "container/heap" "errors" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" ) // NodeResolver is used for looking up trie nodes before reaching into the real diff --git a/trie/iterator_test.go b/trie/iterator_test.go index 9679b49ca7..3042813f05 100644 --- a/trie/iterator_test.go +++ b/trie/iterator_test.go @@ -22,11 +22,11 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) func TestEmptyIterator(t *testing.T) { diff --git a/trie/node.go b/trie/node.go index 15bbf62f1c..f68e5053a0 100644 --- a/trie/node.go +++ b/trie/node.go @@ -21,8 +21,8 @@ import ( "io" "strings" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) var indices = []string{"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "a", "b", "c", "d", "e", "f", "[17]"} diff --git a/trie/node_enc.go b/trie/node_enc.go index 1b2eca682f..79d88dd776 100644 --- a/trie/node_enc.go +++ b/trie/node_enc.go @@ -17,7 +17,7 @@ package trie import ( - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func nodeToBytes(n node) []byte { diff --git a/trie/node_test.go b/trie/node_test.go index 9b8b33748f..9d84a14605 100644 --- a/trie/node_test.go +++ b/trie/node_test.go @@ -20,8 +20,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) func newTestFullNode(v []byte) []interface{} { @@ -96,7 +96,7 @@ func TestDecodeFullNode(t *testing.T) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkEncodeShortNode // BenchmarkEncodeShortNode-8 16878850 70.81 ns/op 48 B/op 1 allocs/op func BenchmarkEncodeShortNode(b *testing.B) { @@ -114,7 +114,7 @@ func BenchmarkEncodeShortNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkEncodeFullNode // BenchmarkEncodeFullNode-8 4323273 284.4 ns/op 576 B/op 1 allocs/op func BenchmarkEncodeFullNode(b *testing.B) { @@ -132,7 +132,7 @@ func BenchmarkEncodeFullNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkDecodeShortNode // BenchmarkDecodeShortNode-8 7925638 151.0 ns/op 157 B/op 4 allocs/op func BenchmarkDecodeShortNode(b *testing.B) { @@ -153,7 +153,7 @@ func BenchmarkDecodeShortNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkDecodeShortNodeUnsafe // BenchmarkDecodeShortNodeUnsafe-8 9027476 128.6 ns/op 109 B/op 3 allocs/op func BenchmarkDecodeShortNodeUnsafe(b *testing.B) { @@ -174,7 +174,7 @@ func BenchmarkDecodeShortNodeUnsafe(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkDecodeFullNode // BenchmarkDecodeFullNode-8 1597462 761.9 ns/op 1280 B/op 18 allocs/op func BenchmarkDecodeFullNode(b *testing.B) { @@ -195,7 +195,7 @@ func BenchmarkDecodeFullNode(b *testing.B) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkDecodeFullNodeUnsafe // BenchmarkDecodeFullNodeUnsafe-8 1789070 687.1 ns/op 704 B/op 17 allocs/op func BenchmarkDecodeFullNodeUnsafe(b *testing.B) { diff --git a/trie/preimages.go b/trie/preimages.go index 66f34117c1..c5756bb52b 100644 --- a/trie/preimages.go +++ b/trie/preimages.go @@ -19,9 +19,9 @@ package trie import ( "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" ) // preimageStore is the store for caching preimages of node key. diff --git a/trie/proof.go b/trie/proof.go index fd892fb4be..cc86784a8d 100644 --- a/trie/proof.go +++ b/trie/proof.go @@ -21,9 +21,9 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" ) // Prove constructs a merkle proof for key. The result contains all encoded nodes diff --git a/trie/proof_test.go b/trie/proof_test.go index 59ae201cea..ffa2559bfb 100644 --- a/trie/proof_test.go +++ b/trie/proof_test.go @@ -24,10 +24,10 @@ import ( mrand "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" "golang.org/x/exp/slices" ) diff --git a/trie/secure_trie.go b/trie/secure_trie.go index 7f0685e306..9170b9b484 100644 --- a/trie/secure_trie.go +++ b/trie/secure_trie.go @@ -17,10 +17,10 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // SecureTrie is the old name of StateTrie. diff --git a/trie/secure_trie_test.go b/trie/secure_trie_test.go index 2087866d38..e7bea8d380 100644 --- a/trie/secure_trie_test.go +++ b/trie/secure_trie_test.go @@ -23,11 +23,11 @@ import ( "sync" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) func newEmptySecure() *StateTrie { diff --git a/trie/stacktrie.go b/trie/stacktrie.go index f2f5355c49..dac968fa17 100644 --- a/trie/stacktrie.go +++ b/trie/stacktrie.go @@ -21,10 +21,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) var ( diff --git a/trie/stacktrie_fuzzer_test.go b/trie/stacktrie_fuzzer_test.go index 1b3f9dbe9c..5768fa0645 100644 --- a/trie/stacktrie_fuzzer_test.go +++ b/trie/stacktrie_fuzzer_test.go @@ -22,11 +22,11 @@ import ( "fmt" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" "golang.org/x/exp/slices" ) diff --git a/trie/stacktrie_test.go b/trie/stacktrie_test.go index 909a77062a..f763793407 100644 --- a/trie/stacktrie_test.go +++ b/trie/stacktrie_test.go @@ -22,10 +22,10 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/testutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/testutil" "github.com/stretchr/testify/assert" "golang.org/x/exp/slices" ) diff --git a/trie/sync.go b/trie/sync.go index 589d28364b..42bb57441d 100644 --- a/trie/sync.go +++ b/trie/sync.go @@ -21,13 +21,13 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/prque" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/prque" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) // ErrNotRequested is returned by the trie sync when it's requested to process a diff --git a/trie/sync_test.go b/trie/sync_test.go index 585181b48c..8926403593 100644 --- a/trie/sync_test.go +++ b/trie/sync_test.go @@ -22,13 +22,13 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/ethdb/memorydb" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb/memorydb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // makeTestTrie create a sample test trie to test node-wise reconstruction. diff --git a/trie/testutil/utils.go b/trie/testutil/utils.go index a75d0431b0..aa64187136 100644 --- a/trie/testutil/utils.go +++ b/trie/testutil/utils.go @@ -21,9 +21,9 @@ import ( "encoding/binary" mrand "math/rand" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // Prng is a pseudo random number generator seeded by strong randomness. diff --git a/trie/tracer.go b/trie/tracer.go index 5786af4d3e..f17f0b3d48 100644 --- a/trie/tracer.go +++ b/trie/tracer.go @@ -17,7 +17,7 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // tracer tracks the changes of trie nodes. During the trie operations, diff --git a/trie/tracer_test.go b/trie/tracer_test.go index acb8c2f6bf..a5dc229844 100644 --- a/trie/tracer_test.go +++ b/trie/tracer_test.go @@ -20,10 +20,10 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) var ( diff --git a/trie/trie.go b/trie/trie.go index 07467ac69c..f81924b284 100644 --- a/trie/trie.go +++ b/trie/trie.go @@ -22,10 +22,10 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // Trie is a Merkle Patricia Trie. Use New to create a trie that sits on diff --git a/trie/trie_id.go b/trie/trie_id.go index 8ab490ca3b..552c4f1b7b 100644 --- a/trie/trie_id.go +++ b/trie/trie_id.go @@ -16,7 +16,7 @@ package trie -import "github.com/ethereum/go-ethereum/common" +import "github.com/paxosglobal/go-ethereum-arbitrum/common" // ID is the identifier for uniquely identifying a trie. type ID struct { diff --git a/trie/trie_reader.go b/trie/trie_reader.go index 4215964559..88d7c73703 100644 --- a/trie/trie_reader.go +++ b/trie/trie_reader.go @@ -17,10 +17,10 @@ package trie import ( - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) // Reader wraps the Node method of a backing trie store. diff --git a/trie/trie_test.go b/trie/trie_test.go index b799a0c3ed..5492919510 100644 --- a/trie/trie_test.go +++ b/trie/trie_test.go @@ -29,14 +29,14 @@ import ( "testing/quick" "github.com/davecgh/go-spew/spew" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/trie/triedb/hashdb/database.go b/trie/triedb/hashdb/database.go index 78df83de2d..d578769558 100644 --- a/trie/triedb/hashdb/database.go +++ b/trie/triedb/hashdb/database.go @@ -24,15 +24,15 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/metrics" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) var ( diff --git a/trie/triedb/pathdb/database.go b/trie/triedb/pathdb/database.go index f2d6cea635..2c29dfe372 100644 --- a/trie/triedb/pathdb/database.go +++ b/trie/triedb/pathdb/database.go @@ -23,14 +23,14 @@ import ( "sync" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/params" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/params" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) const ( diff --git a/trie/triedb/pathdb/database_test.go b/trie/triedb/pathdb/database_test.go index e7bd469993..14922e496f 100644 --- a/trie/triedb/pathdb/database_test.go +++ b/trie/triedb/pathdb/database_test.go @@ -23,15 +23,15 @@ import ( "math/rand" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/testutil" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) func updateTrie(addrHash common.Hash, root common.Hash, dirties, cleans map[common.Hash][]byte) (common.Hash, *trienode.NodeSet) { diff --git a/trie/triedb/pathdb/difflayer.go b/trie/triedb/pathdb/difflayer.go index 10567715d2..c1cdb14e24 100644 --- a/trie/triedb/pathdb/difflayer.go +++ b/trie/triedb/pathdb/difflayer.go @@ -20,10 +20,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) // diffLayer represents a collection of modifications made to the in-memory tries diff --git a/trie/triedb/pathdb/difflayer_test.go b/trie/triedb/pathdb/difflayer_test.go index 9b5907c3c5..ff305d4574 100644 --- a/trie/triedb/pathdb/difflayer_test.go +++ b/trie/triedb/pathdb/difflayer_test.go @@ -20,10 +20,10 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/testutil" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) func emptyLayer() *diskLayer { @@ -35,21 +35,21 @@ func emptyLayer() *diskLayer { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkSearch128Layers // BenchmarkSearch128Layers-8 243826 4755 ns/op func BenchmarkSearch128Layers(b *testing.B) { benchmarkSearch(b, 0, 128) } // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkSearch512Layers // BenchmarkSearch512Layers-8 49686 24256 ns/op func BenchmarkSearch512Layers(b *testing.B) { benchmarkSearch(b, 0, 512) } // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkSearch1Layer // BenchmarkSearch1Layer-8 14062725 88.40 ns/op func BenchmarkSearch1Layer(b *testing.B) { benchmarkSearch(b, 127, 128) } @@ -102,7 +102,7 @@ func benchmarkSearch(b *testing.B, depth int, total int) { // goos: darwin // goarch: arm64 -// pkg: github.com/ethereum/go-ethereum/trie +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie // BenchmarkPersist // BenchmarkPersist-8 10 111252975 ns/op func BenchmarkPersist(b *testing.B) { diff --git a/trie/triedb/pathdb/disklayer.go b/trie/triedb/pathdb/disklayer.go index ef697cbce8..ebb25365ec 100644 --- a/trie/triedb/pathdb/disklayer.go +++ b/trie/triedb/pathdb/disklayer.go @@ -22,12 +22,12 @@ import ( "sync" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" "golang.org/x/crypto/sha3" ) diff --git a/trie/triedb/pathdb/errors.go b/trie/triedb/pathdb/errors.go index 78ee4459fe..857f3e27ed 100644 --- a/trie/triedb/pathdb/errors.go +++ b/trie/triedb/pathdb/errors.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/common/hexutil" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common/hexutil" ) var ( diff --git a/trie/triedb/pathdb/history.go b/trie/triedb/pathdb/history.go index 6e3f3faaed..9c80a8b74e 100644 --- a/trie/triedb/pathdb/history.go +++ b/trie/triedb/pathdb/history.go @@ -23,11 +23,11 @@ import ( "fmt" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" "golang.org/x/exp/slices" ) diff --git a/trie/triedb/pathdb/history_test.go b/trie/triedb/pathdb/history_test.go index a3257441de..5f61bfb84c 100644 --- a/trie/triedb/pathdb/history_test.go +++ b/trie/triedb/pathdb/history_test.go @@ -22,13 +22,13 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/testutil" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/testutil" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) // randomStateSet generates a random state change set. diff --git a/trie/triedb/pathdb/journal.go b/trie/triedb/pathdb/journal.go index ac770763e3..7fd69799fe 100644 --- a/trie/triedb/pathdb/journal.go +++ b/trie/triedb/pathdb/journal.go @@ -23,14 +23,14 @@ import ( "io" "time" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) var ( diff --git a/trie/triedb/pathdb/layertree.go b/trie/triedb/pathdb/layertree.go index d314779910..8a77dda9ec 100644 --- a/trie/triedb/pathdb/layertree.go +++ b/trie/triedb/pathdb/layertree.go @@ -21,10 +21,10 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" ) // layerTree is a group of state layers identified by the state root. diff --git a/trie/triedb/pathdb/metrics.go b/trie/triedb/pathdb/metrics.go index 9e2b1dcbf5..ee8469d6c7 100644 --- a/trie/triedb/pathdb/metrics.go +++ b/trie/triedb/pathdb/metrics.go @@ -16,7 +16,7 @@ package pathdb -import "github.com/ethereum/go-ethereum/metrics" +import "github.com/paxosglobal/go-ethereum-arbitrum/metrics" var ( cleanHitMeter = metrics.NewRegisteredMeter("pathdb/clean/hit", nil) diff --git a/trie/triedb/pathdb/nodebuffer.go b/trie/triedb/pathdb/nodebuffer.go index 4a7d328b9a..b947acdd41 100644 --- a/trie/triedb/pathdb/nodebuffer.go +++ b/trie/triedb/pathdb/nodebuffer.go @@ -21,12 +21,12 @@ import ( "time" "github.com/VictoriaMetrics/fastcache" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/log" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/log" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" ) // nodebuffer is a collection of modified trie nodes to aggregate the disk diff --git a/trie/triedb/pathdb/testutils.go b/trie/triedb/pathdb/testutils.go index d6fdacb421..a36bcbe7bf 100644 --- a/trie/triedb/pathdb/testutils.go +++ b/trie/triedb/pathdb/testutils.go @@ -20,11 +20,11 @@ import ( "bytes" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/triestate" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triestate" "golang.org/x/exp/slices" ) diff --git a/trie/trienode/node.go b/trie/trienode/node.go index 95315c2e9a..90b3d09818 100644 --- a/trie/trienode/node.go +++ b/trie/trienode/node.go @@ -21,7 +21,7 @@ import ( "sort" "strings" - "github.com/ethereum/go-ethereum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/common" ) // Node is a wrapper which contains the encoded blob of the trie node and its diff --git a/trie/trienode/proof.go b/trie/trienode/proof.go index 012f0087dd..b7a12c8f9d 100644 --- a/trie/trienode/proof.go +++ b/trie/trienode/proof.go @@ -20,10 +20,10 @@ import ( "errors" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" ) // ProofSet stores a set of trie nodes. It implements trie.Database and can also diff --git a/trie/triestate/state.go b/trie/triestate/state.go index 4c47e9c397..81ed67e205 100644 --- a/trie/triestate/state.go +++ b/trie/triestate/state.go @@ -21,11 +21,11 @@ import ( "fmt" "sync" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/crypto" - "github.com/ethereum/go-ethereum/rlp" - "github.com/ethereum/go-ethereum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/crypto" + "github.com/paxosglobal/go-ethereum-arbitrum/rlp" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" "golang.org/x/crypto/sha3" ) diff --git a/trie/utils/verkle.go b/trie/utils/verkle.go index ce059edc64..8eb868b38b 100644 --- a/trie/utils/verkle.go +++ b/trie/utils/verkle.go @@ -21,10 +21,10 @@ import ( "sync" "github.com/crate-crypto/go-ipa/bandersnatch/fr" - "github.com/ethereum/go-ethereum/common/lru" - "github.com/ethereum/go-ethereum/metrics" "github.com/gballet/go-verkle" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common/lru" + "github.com/paxosglobal/go-ethereum-arbitrum/metrics" ) const ( diff --git a/trie/utils/verkle_test.go b/trie/utils/verkle_test.go index 28b059c379..8ee40c532f 100644 --- a/trie/utils/verkle_test.go +++ b/trie/utils/verkle_test.go @@ -64,7 +64,7 @@ func TestTreeKey(t *testing.T) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkTreeKey // BenchmarkTreeKey-8 398731 2961 ns/op 32 B/op 1 allocs/op @@ -82,7 +82,7 @@ func BenchmarkTreeKey(b *testing.B) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkTreeKeyWithEvaluation // BenchmarkTreeKeyWithEvaluation-8 513855 2324 ns/op 32 B/op 1 allocs/op @@ -102,7 +102,7 @@ func BenchmarkTreeKeyWithEvaluation(b *testing.B) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkStorageKey // BenchmarkStorageKey-8 230516 4584 ns/op 96 B/op 3 allocs/op @@ -120,7 +120,7 @@ func BenchmarkStorageKey(b *testing.B) { // goos: darwin // goarch: amd64 -// pkg: github.com/ethereum/go-ethereum/trie/utils +// pkg: github.com/paxosglobal/go-ethereum-arbitrum/trie/utils // cpu: VirtualApple @ 2.50GHz // BenchmarkStorageKeyWithEvaluation // BenchmarkStorageKeyWithEvaluation-8 320125 3753 ns/op 96 B/op 3 allocs/op diff --git a/trie/verkle.go b/trie/verkle.go index c21a796a0f..4590b79fef 100644 --- a/trie/verkle.go +++ b/trie/verkle.go @@ -21,13 +21,13 @@ import ( "errors" "fmt" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/ethdb" - "github.com/ethereum/go-ethereum/trie/trienode" - "github.com/ethereum/go-ethereum/trie/utils" "github.com/gballet/go-verkle" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/ethdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/trienode" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/utils" ) var ( diff --git a/trie/verkle_test.go b/trie/verkle_test.go index 1c65b673aa..363f569bad 100644 --- a/trie/verkle_test.go +++ b/trie/verkle_test.go @@ -21,12 +21,12 @@ import ( "reflect" "testing" - "github.com/ethereum/go-ethereum/common" - "github.com/ethereum/go-ethereum/core/rawdb" - "github.com/ethereum/go-ethereum/core/types" - "github.com/ethereum/go-ethereum/trie/triedb/pathdb" - "github.com/ethereum/go-ethereum/trie/utils" "github.com/holiman/uint256" + "github.com/paxosglobal/go-ethereum-arbitrum/common" + "github.com/paxosglobal/go-ethereum-arbitrum/core/rawdb" + "github.com/paxosglobal/go-ethereum-arbitrum/core/types" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/triedb/pathdb" + "github.com/paxosglobal/go-ethereum-arbitrum/trie/utils" ) var (