forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 10:22:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace package name (#924)

Browse source 
* replace package name

* clean up
This commit is contained in:
HAOYUatHZ 2024-07-25 08:26:20 +08:00 committed by GitHub
parent 7b10424e16
commit c293daa83c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
904 changed files with 4190 additions and 4235 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
.github/workflows/release-sdk.yaml vendored
View file

@ -1,45 +0,0 @@
name: Release SDK
on:
workflow_dispatch:
inputs:
REV:
description: "revision. can be commit hash or tag"
required: true
type: string
jobs:
release-sdk:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Checkout revision
run: |
git checkout ${{ github.event.inputs.REV }}
- name: Replace import path
run: |
set -euo pipefail
# Define the old and new import paths
OLD_IMPORT_PATH="github.com/ethereum/go-ethereum"
NEW_IMPORT_PATH="github.com/scroll-tech/go-ethereum"
# List of file types to search through
FILE_TYPES=("*.go" "go.mod" "*.txt")
# Loop through each file type and replace the import path
for FILE_TYPE in "${FILE_TYPES[@]}"; do
find . -type f -name "$FILE_TYPE" -exec sed -i "s|$OLD_IMPORT_PATH|$NEW_IMPORT_PATH|g" {} +
done
- name: Commit the changes and push
uses: stefanzweifel/git-auto-commit-action@3ea6ae190baf489ba007f7c92608f33ce20ef04a
with:
skip_fetch: true
file_pattern: "*"
commit_message: "chore: replace import path [bot]"
create_branch: true
branch: ${{ github.event.inputs.REV }}-replace-import-path
tagging_message: sdk-${{ github.event.inputs.REV }}

4
accounts/abi/abi.go
View file

@ -24,8 +24,8 @@ import (
"io" "io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
// The ABI holds information about a contract's context and available // The ABI holds information about a contract's context and available

6
accounts/abi/abi_test.go
View file

@ -26,9 +26,9 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/scroll-tech/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
const jsondata = ` const jsondata = `

14
accounts/abi/bind/auth.go
View file

@ -23,13 +23,13 @@ import (
"io" "io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/external" "github.com/scroll-tech/go-ethereum/accounts/external"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
) )
// ErrNoChainID is returned whenever the user failed to specify a chain id. // ErrNoChainID is returned whenever the user failed to specify a chain id.

6
accounts/abi/bind/backend.go
View file

@ -21,9 +21,9 @@ import (
"errors" "errors"
"math/big" "math/big"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
) )
var ( var (

40
accounts/abi/bind/backends/simulated.go
View file

@ -24,26 +24,26 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/common/math" "github.com/scroll-tech/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/consensus/ethash" "github.com/scroll-tech/go-ethereum/consensus/ethash"
"github.com/ethereum/go-ethereum/core" "github.com/scroll-tech/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/bloombits" "github.com/scroll-tech/go-ethereum/core/bloombits"
"github.com/ethereum/go-ethereum/core/rawdb" "github.com/scroll-tech/go-ethereum/core/rawdb"
"github.com/ethereum/go-ethereum/core/state" "github.com/scroll-tech/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/core/vm" "github.com/scroll-tech/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/eth/filters" "github.com/scroll-tech/go-ethereum/eth/filters"
"github.com/ethereum/go-ethereum/ethdb" "github.com/scroll-tech/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
"github.com/ethereum/go-ethereum/rollup/fees" "github.com/scroll-tech/go-ethereum/rollup/fees"
"github.com/ethereum/go-ethereum/rpc" "github.com/scroll-tech/go-ethereum/rpc"
) )
// This nil assignment ensures at compile time that SimulatedBackend implements bind.ContractBackend. // This nil assignment ensures at compile time that SimulatedBackend implements bind.ContractBackend.

16
accounts/abi/bind/backends/simulated_test.go
View file

@ -27,14 +27,14 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/scroll-tech/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
) )
func TestSimulatedBackend(t *testing.T) { func TestSimulatedBackend(t *testing.T) {

12
accounts/abi/bind/base.go
View file

@ -24,12 +24,12 @@ import (
"strings" "strings"
"sync" "sync"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
) )
const basefeeWiggleMultiplier = 2 const basefeeWiggleMultiplier = 2

16
accounts/abi/bind/base_test.go
View file

@ -24,14 +24,14 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

4
accounts/abi/bind/bind.go
View file

@ -29,8 +29,8 @@ import (
"text/template" "text/template"
"unicode" "unicode"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
) )
// Lang is a target programming language selector to generate bindings for. // Lang is a target programming language selector to generate bindings for.

236
accounts/abi/bind/bind_test.go
View file

File diff suppressed because one or more lines are too long

14
accounts/abi/bind/template.go
View file

@ -16,7 +16,7 @@
package bind package bind
import "github.com/ethereum/go-ethereum/accounts/abi" import "github.com/scroll-tech/go-ethereum/accounts/abi"
// tmplData is the data structure required to fill the binding template. // tmplData is the data structure required to fill the binding template.
type tmplData struct { type tmplData struct {
@ -91,12 +91,12 @@ import (
"strings" "strings"
"errors" "errors"
ethereum "github.com/ethereum/go-ethereum" ethereum "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
) )
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.

8
accounts/abi/bind/util.go
View file

@ -21,10 +21,10 @@ import (
"errors" "errors"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
) )
// WaitMined waits for tx to be mined on the blockchain. // WaitMined waits for tx to be mined on the blockchain.

12
accounts/abi/bind/util_test.go
View file

@ -23,12 +23,12 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/abi/bind/backends" "github.com/scroll-tech/go-ethereum/accounts/abi/bind/backends"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/scroll-tech/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291") var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")

4
accounts/abi/error.go
View file

@ -22,8 +22,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
type Error struct { type Error struct {

4
accounts/abi/event.go
View file

@ -20,8 +20,8 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
// Event is an event potentially triggered by the EVM's LOG mechanism. The Event // Event is an event potentially triggered by the EVM's LOG mechanism. The Event

4
accounts/abi/event_test.go
View file

@ -25,8 +25,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

2
accounts/abi/method.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"strings" "strings"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
// FunctionType represents different types of functions a contract might have. // FunctionType represents different types of functions a contract might have.

4
accounts/abi/pack.go
View file

@ -22,8 +22,8 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/scroll-tech/go-ethereum/common/math"
) )
// packBytesSlice packs the given bytes as [L, V] as the canonical representation // packBytesSlice packs the given bytes as [L, V] as the canonical representation

2
accounts/abi/pack_test.go
View file

@ -27,7 +27,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
// TestPack tests the general pack/unpack tests in packing_test.go // TestPack tests the general pack/unpack tests in packing_test.go

2
accounts/abi/packing_test.go
View file

@ -19,7 +19,7 @@ package abi
import ( import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
type packUnpackTest struct { type packUnpackTest struct {

4
accounts/abi/topics.go
View file

@ -23,8 +23,8 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
// MakeTopics converts a filter query argument list into a filter topic set. // MakeTopics converts a filter query argument list into a filter topic set.

4
accounts/abi/topics_test.go
View file

@ -21,8 +21,8 @@ import (
"reflect" "reflect"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
func TestMakeTopics(t *testing.T) { func TestMakeTopics(t *testing.T) {

2
accounts/abi/type.go
View file

@ -26,7 +26,7 @@ import (
"unicode" "unicode"
"unicode/utf8" "unicode/utf8"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
// Type enumerator // Type enumerator

2
accounts/abi/type_test.go
View file

@ -22,7 +22,7 @@ import (
"testing" "testing"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
// typeWithoutStringer is a alias for the Type type which simply doesn't implement // typeWithoutStringer is a alias for the Type type which simply doesn't implement

2
accounts/abi/unpack.go
View file

@ -24,7 +24,7 @@ import (
"math/big" "math/big"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
var ( var (

2
accounts/abi/unpack_test.go
View file

@ -27,7 +27,7 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )

8
accounts/accounts.go
View file

@ -21,10 +21,10 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
) )

2
accounts/accounts_test.go
View file

@ -20,7 +20,7 @@ import (
"bytes" "bytes"
"testing" "testing"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
) )
func TestTextHash(t *testing.T) { func TestTextHash(t *testing.T) {

18
accounts/external/backend.go vendored
View file

@ -22,15 +22,15 @@ import (
"math/big" "math/big"
"sync" "sync"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/rpc" "github.com/scroll-tech/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/signer/core/apitypes" "github.com/scroll-tech/go-ethereum/signer/core/apitypes"
) )
type ExternalBackend struct { type ExternalBackend struct {

6
accounts/keystore/account_cache.go
View file

@ -28,9 +28,9 @@ import (
"time" "time"
mapset "github.com/deckarep/golang-set/v2" mapset "github.com/deckarep/golang-set/v2"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
) )

4
accounts/keystore/account_cache_test.go
View file

@ -28,8 +28,8 @@ import (
"github.com/cespare/cp" "github.com/cespare/cp"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
) )

2
accounts/keystore/file_cache.go
View file

@ -24,7 +24,7 @@ import (
"time" "time"
mapset "github.com/deckarep/golang-set/v2" mapset "github.com/deckarep/golang-set/v2"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
) )
// fileCache is a cache of files seen during scan of keystore. // fileCache is a cache of files seen during scan of keystore.

6
accounts/keystore/key.go
View file

@ -28,9 +28,9 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/google/uuid" "github.com/google/uuid"
) )

10
accounts/keystore/keystore.go
View file

@ -32,11 +32,11 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
) )
var ( var (

8
accounts/keystore/keystore_test.go
View file

@ -26,10 +26,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
) )

8
accounts/keystore/passphrase.go
View file

@ -37,10 +37,10 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/math" "github.com/scroll-tech/go-ethereum/common/math"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/google/uuid" "github.com/google/uuid"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/crypto/scrypt" "golang.org/x/crypto/scrypt"

2
accounts/keystore/passphrase_test.go
View file

@ -20,7 +20,7 @@ import (
"os" "os"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
const ( const (

2
accounts/keystore/plain.go
View file

@ -22,7 +22,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
type keyStorePlain struct { type keyStorePlain struct {

4
accounts/keystore/plain_test.go
View file

@ -25,8 +25,8 @@ import (
"strings" "strings"
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) { func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {

4
accounts/keystore/presale.go
View file

@ -25,8 +25,8 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/google/uuid" "github.com/google/uuid"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
) )

8
accounts/keystore/wallet.go
View file

@ -19,10 +19,10 @@ package keystore
import ( import (
"math/big" "math/big"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
) )
// keystoreWallet implements the accounts.Wallet interface for the original // keystoreWallet implements the accounts.Wallet interface for the original

2
accounts/keystore/watch.go
View file

@ -23,7 +23,7 @@ import (
"os" "os"
"time" "time"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/fsnotify/fsnotify" "github.com/fsnotify/fsnotify"
) )

4
accounts/manager.go
View file

@ -21,8 +21,8 @@ import (
"sort" "sort"
"sync" "sync"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
) )
// managerSubBufferSize determines how many incoming wallet events // managerSubBufferSize determines how many incoming wallet events

8
accounts/scwallet/hub.go
View file

@ -41,10 +41,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
pcsc "github.com/gballet/go-libpcsclite" pcsc "github.com/gballet/go-libpcsclite"
) )

2
accounts/scwallet/securechannel.go
View file

@ -27,7 +27,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
pcsc "github.com/gballet/go-libpcsclite" pcsc "github.com/gballet/go-libpcsclite"
"golang.org/x/crypto/pbkdf2" "golang.org/x/crypto/pbkdf2"
"golang.org/x/text/unicode/norm" "golang.org/x/text/unicode/norm"

12
accounts/scwallet/wallet.go
View file

@ -33,12 +33,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
pcsc "github.com/gballet/go-libpcsclite" pcsc "github.com/gballet/go-libpcsclite"
"github.com/status-im/keycard-go/derivationpath" "github.com/status-im/keycard-go/derivationpath"
) )

6
accounts/usbwallet/hub.go
View file

@ -23,9 +23,9 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/event" "github.com/scroll-tech/go-ethereum/event"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/karalabe/usb" "github.com/karalabe/usb"
) )

14
accounts/usbwallet/ledger.go
View file

@ -28,13 +28,13 @@ import (
"io" "io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
) )
// ledgerOpcode is an enumeration encoding the supported Ledger opcodes. // ledgerOpcode is an enumeration encoding the supported Ledger opcodes.

12
accounts/usbwallet/trezor.go
View file

@ -27,12 +27,12 @@ import (
"io" "io"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/usbwallet/trezor" "github.com/scroll-tech/go-ethereum/accounts/usbwallet/trezor"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

12
accounts/usbwallet/wallet.go
View file

@ -25,12 +25,12 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum" "github.com/scroll-tech/go-ethereum"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/karalabe/usb" "github.com/karalabe/usb"
) )

4
beacon/engine/errors.go
View file

@ -17,8 +17,8 @@
package engine package engine
import ( import (
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/rpc" "github.com/scroll-tech/go-ethereum/rpc"
) )
// EngineAPIError is a standardized error message between consensus and execution // EngineAPIError is a standardized error message between consensus and execution

6
beacon/engine/gen_blockparams.go
View file

@ -6,9 +6,9 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
) )
var _ = (*payloadAttributesMarshaling)(nil) var _ = (*payloadAttributesMarshaling)(nil)

6
beacon/engine/gen_ed.go
View file

@ -7,9 +7,9 @@ import (
"errors" "errors"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
) )
var _ = (*executableDataMarshaling)(nil) var _ = (*executableDataMarshaling)(nil)

2
beacon/engine/gen_epe.go
View file

@ -7,7 +7,7 @@ import (
"errors" "errors"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
) )
var _ = (*executionPayloadEnvelopeMarshaling)(nil) var _ = (*executionPayloadEnvelopeMarshaling)(nil)

8
beacon/engine/types.go
View file

@ -20,10 +20,10 @@ import (
"fmt" "fmt"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/trie" "github.com/scroll-tech/go-ethereum/trie"
) )
//go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go //go:generate go run github.com/fjl/gencodec -type PayloadAttributes -field-override payloadAttributesMarshaling -out gen_blockparams.go

4
beacon/merkle/merkle.go
View file

@ -22,8 +22,8 @@ import (
"errors" "errors"
"reflect" "reflect"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
) )
// Value represents either a 32 byte leaf value or hash node in a binary merkle tree/partial proof. // Value represents either a 32 byte leaf value or hash node in a binary merkle tree/partial proof.

6
beacon/types/committee.go
View file

@ -22,9 +22,9 @@ import (
"fmt" "fmt"
"math/bits" "math/bits"
"github.com/ethereum/go-ethereum/beacon/params" "github.com/scroll-tech/go-ethereum/beacon/params"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
bls "github.com/protolambda/bls12-381-util" bls "github.com/protolambda/bls12-381-util"
) )

6
beacon/types/config.go
View file

@ -24,9 +24,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/ethereum/go-ethereum/beacon/merkle" "github.com/scroll-tech/go-ethereum/beacon/merkle"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
) )

2
beacon/types/gen_header_json.go
View file

@ -6,7 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
var _ = (*headerMarshaling)(nil) var _ = (*headerMarshaling)(nil)

2
beacon/types/gen_syncaggregate_json.go
View file

@ -6,7 +6,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
) )
var _ = (*syncAggregateMarshaling)(nil) var _ = (*syncAggregateMarshaling)(nil)

6
beacon/types/header.go
View file

@ -21,9 +21,9 @@ import (
"crypto/sha256" "crypto/sha256"
"encoding/binary" "encoding/binary"
"github.com/ethereum/go-ethereum/beacon/merkle" "github.com/scroll-tech/go-ethereum/beacon/merkle"
"github.com/ethereum/go-ethereum/beacon/params" "github.com/scroll-tech/go-ethereum/beacon/params"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
//go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go //go:generate go run github.com/fjl/gencodec -type Header -field-override headerMarshaling -out gen_header_json.go

6
beacon/types/update.go
View file

@ -20,9 +20,9 @@ import (
"errors" "errors"
"fmt" "fmt"
"github.com/ethereum/go-ethereum/beacon/merkle" "github.com/scroll-tech/go-ethereum/beacon/merkle"
"github.com/ethereum/go-ethereum/beacon/params" "github.com/scroll-tech/go-ethereum/beacon/params"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
) )
// LightClientUpdate is a proof of the next sync committee root based on a header // LightClientUpdate is a proof of the next sync committee root based on a header

12
build/ci.go
View file

@ -53,10 +53,10 @@ import (
"time" "time"
"github.com/cespare/cp" "github.com/cespare/cp"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto/signify" "github.com/scroll-tech/go-ethereum/crypto/signify"
"github.com/ethereum/go-ethereum/internal/build" "github.com/scroll-tech/go-ethereum/internal/build"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
) )
var ( var (
@ -249,8 +249,8 @@ func doInstall(cmdline []string) {
func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (flags []string) { func buildFlags(env build.Environment, staticLinking bool, buildTags []string) (flags []string) {
var ld []string var ld []string
if env.Commit != "" { if env.Commit != "" {
ld = append(ld, "-X", "github.com/ethereum/go-ethereum/internal/version.gitCommit="+env.Commit) ld = append(ld, "-X", "github.com/scroll-tech/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/scroll-tech/go-ethereum/internal/version.gitDate="+env.Date)
} }
// Strip DWARF on darwin. This used to be required for certain things, // 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. // and there is no downside to this, so we just keep doing it.

4
cmd/abidump/main.go
View file

@ -23,8 +23,8 @@ import (
"os" "os"
"strings" "strings"
"github.com/ethereum/go-ethereum/signer/core/apitypes" "github.com/scroll-tech/go-ethereum/signer/core/apitypes"
"github.com/ethereum/go-ethereum/signer/fourbyte" "github.com/scroll-tech/go-ethereum/signer/fourbyte"
) )
func init() { func init() {

12
cmd/abigen/main.go
View file

@ -24,12 +24,12 @@ import (
"regexp" "regexp"
"strings" "strings"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/scroll-tech/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common/compiler" "github.com/scroll-tech/go-ethereum/common/compiler"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/flags" "github.com/scroll-tech/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

14
cmd/bootnode/main.go
View file

@ -25,13 +25,13 @@ import (
"os" "os"
"time" "time"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/scroll-tech/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/scroll-tech/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/nat" "github.com/scroll-tech/go-ethereum/p2p/nat"
"github.com/ethereum/go-ethereum/p2p/netutil" "github.com/scroll-tech/go-ethereum/p2p/netutil"
) )
func main() { func main() {

38
cmd/clef/main.go
View file

@ -35,25 +35,25 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/scroll-tech/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/ethapi" "github.com/scroll-tech/go-ethereum/internal/ethapi"
"github.com/ethereum/go-ethereum/internal/flags" "github.com/scroll-tech/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/node" "github.com/scroll-tech/go-ethereum/node"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
"github.com/ethereum/go-ethereum/rpc" "github.com/scroll-tech/go-ethereum/rpc"
"github.com/ethereum/go-ethereum/signer/core" "github.com/scroll-tech/go-ethereum/signer/core"
"github.com/ethereum/go-ethereum/signer/core/apitypes" "github.com/scroll-tech/go-ethereum/signer/core/apitypes"
"github.com/ethereum/go-ethereum/signer/fourbyte" "github.com/scroll-tech/go-ethereum/signer/fourbyte"
"github.com/ethereum/go-ethereum/signer/rules" "github.com/scroll-tech/go-ethereum/signer/rules"
"github.com/ethereum/go-ethereum/signer/storage" "github.com/scroll-tech/go-ethereum/signer/storage"
"github.com/mattn/go-colorable" "github.com/mattn/go-colorable"
"github.com/mattn/go-isatty" "github.com/mattn/go-isatty"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"

2
cmd/clef/run_test.go
View file

@ -22,7 +22,7 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/reexec" "github.com/docker/docker/pkg/reexec"
"github.com/ethereum/go-ethereum/internal/cmdtest" "github.com/scroll-tech/go-ethereum/internal/cmdtest"
) )
const registeredName = "clef-test" const registeredName = "clef-test"

4
cmd/devp2p/crawl.go
View file

@ -22,8 +22,8 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
) )
type crawler struct { type crawler struct {

14
cmd/devp2p/discv4cmd.go
View file

@ -24,13 +24,13 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" "github.com/scroll-tech/go-ethereum/cmd/devp2p/internal/v4test"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/flags" "github.com/scroll-tech/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/scroll-tech/go-ethereum/p2p/discover"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

8
cmd/devp2p/discv5cmd.go
View file

@ -21,10 +21,10 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v5test" "github.com/scroll-tech/go-ethereum/cmd/devp2p/internal/v5test"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/internal/flags" "github.com/scroll-tech/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/p2p/discover" "github.com/scroll-tech/go-ethereum/p2p/discover"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

4
cmd/devp2p/dns_cloudflare.go
View file

@ -23,8 +23,8 @@ import (
"strings" "strings"
"github.com/cloudflare/cloudflare-go" "github.com/cloudflare/cloudflare-go"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/dnsdisc" "github.com/scroll-tech/go-ethereum/p2p/dnsdisc"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

4
cmd/devp2p/dns_route53.go
View file

@ -29,8 +29,8 @@ import (
"github.com/aws/aws-sdk-go-v2/credentials" "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"
"github.com/aws/aws-sdk-go-v2/service/route53/types" "github.com/aws/aws-sdk-go-v2/service/route53/types"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/ethereum/go-ethereum/p2p/dnsdisc" "github.com/scroll-tech/go-ethereum/p2p/dnsdisc"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
) )

10
cmd/devp2p/dnscmd.go
View file

@ -25,11 +25,11 @@ import (
"path/filepath" "path/filepath"
"time" "time"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/console/prompt" "github.com/scroll-tech/go-ethereum/console/prompt"
"github.com/ethereum/go-ethereum/p2p/dnsdisc" "github.com/scroll-tech/go-ethereum/p2p/dnsdisc"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

6
cmd/devp2p/enrcmd.go
View file

@ -28,9 +28,9 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr" "github.com/scroll-tech/go-ethereum/p2p/enr"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

12
cmd/devp2p/internal/ethtest/chain.go
View file

@ -26,12 +26,12 @@ import (
"os" "os"
"strings" "strings"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core" "github.com/scroll-tech/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/forkid" "github.com/scroll-tech/go-ethereum/core/forkid"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
) )
type Chain struct { type Chain struct {

6
cmd/devp2p/internal/ethtest/chain_test.go
View file

@ -21,9 +21,9 @@ import (
"strconv" "strconv"
"testing" "testing"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/scroll-tech/go-ethereum/eth/protocols/eth"
"github.com/ethereum/go-ethereum/p2p" "github.com/scroll-tech/go-ethereum/p2p"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

14
cmd/devp2p/internal/ethtest/helpers.go
View file

@ -25,13 +25,13 @@ import (
"time" "time"
"github.com/davecgh/go-spew/spew" "github.com/davecgh/go-spew/spew"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/scroll-tech/go-ethereum/eth/protocols/eth"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/p2p" "github.com/scroll-tech/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/rlpx" "github.com/scroll-tech/go-ethereum/p2p/rlpx"
) )
var ( var (

6
cmd/devp2p/internal/ethtest/large.go
View file

@ -20,9 +20,9 @@ import (
"crypto/rand" "crypto/rand"
"math/big" "math/big"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil" "github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
) )
// largeNumber returns a very large big.Int. // largeNumber returns a very large big.Int.

14
cmd/devp2p/internal/ethtest/snap.go
View file

@ -22,13 +22,13 @@ import (
"fmt" "fmt"
"math/rand" "math/rand"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/eth/protocols/snap" "github.com/scroll-tech/go-ethereum/eth/protocols/snap"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/trie" "github.com/scroll-tech/go-ethereum/trie"
"github.com/ethereum/go-ethereum/trie/trienode" "github.com/scroll-tech/go-ethereum/trie/trienode"
"golang.org/x/crypto/sha3" "golang.org/x/crypto/sha3"
) )

2
cmd/devp2p/internal/ethtest/snapTypes.go
View file

@ -16,7 +16,7 @@
package ethtest package ethtest
import "github.com/ethereum/go-ethereum/eth/protocols/snap" import "github.com/scroll-tech/go-ethereum/eth/protocols/snap"
// GetAccountRange represents an account range query. // GetAccountRange represents an account range query.
type GetAccountRange snap.GetAccountRangePacket type GetAccountRange snap.GetAccountRangePacket

8
cmd/devp2p/internal/ethtest/suite.go
View file

@ -19,10 +19,10 @@ package ethtest
import ( import (
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/scroll-tech/go-ethereum/eth/protocols/eth"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
) )
// Suite represents a structure used to test a node's conformance // Suite represents a structure used to test a node's conformance

10
cmd/devp2p/internal/ethtest/suite_test.go
View file

@ -21,11 +21,11 @@ import (
"testing" "testing"
"time" "time"
"github.com/ethereum/go-ethereum/eth" "github.com/scroll-tech/go-ethereum/eth"
"github.com/ethereum/go-ethereum/eth/ethconfig" "github.com/scroll-tech/go-ethereum/eth/ethconfig"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/node" "github.com/scroll-tech/go-ethereum/node"
"github.com/ethereum/go-ethereum/p2p" "github.com/scroll-tech/go-ethereum/p2p"
) )
var ( var (

10
cmd/devp2p/internal/ethtest/transaction.go
View file

@ -23,11 +23,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/scroll-tech/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
) )
// var faucetAddr = common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7") // var faucetAddr = common.HexToAddress("0x71562b71999873DB5b286dF957af199Ec94617F7")

8
cmd/devp2p/internal/ethtest/types.go
View file

@ -22,10 +22,10 @@ import (
"fmt" "fmt"
"time" "time"
"github.com/ethereum/go-ethereum/eth/protocols/eth" "github.com/scroll-tech/go-ethereum/eth/protocols/eth"
"github.com/ethereum/go-ethereum/p2p" "github.com/scroll-tech/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/rlpx" "github.com/scroll-tech/go-ethereum/p2p/rlpx"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
) )
type Message interface { type Message interface {

6
cmd/devp2p/internal/v4test/discv4tests.go
View file

@ -24,9 +24,9 @@ import (
"net" "net"
"time" "time"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/p2p/discover/v4wire" "github.com/scroll-tech/go-ethereum/p2p/discover/v4wire"
) )
const ( const (

6
cmd/devp2p/internal/v4test/framework.go
View file

@ -22,9 +22,9 @@ import (
"net" "net"
"time" "time"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p/discover/v4wire" "github.com/scroll-tech/go-ethereum/p2p/discover/v4wire"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
) )
const waitTime = 300 * time.Millisecond const waitTime = 300 * time.Millisecond

8
cmd/devp2p/internal/v5test/discv5tests.go
View file

@ -22,10 +22,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/p2p/discover/v5wire" "github.com/scroll-tech/go-ethereum/p2p/discover/v5wire"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/netutil" "github.com/scroll-tech/go-ethereum/p2p/netutil"
) )
// Suite is the discv5 test suite. // Suite is the discv5 test suite.

10
cmd/devp2p/internal/v5test/framework.go
View file

@ -24,11 +24,11 @@ import (
"net" "net"
"time" "time"
"github.com/ethereum/go-ethereum/common/mclock" "github.com/scroll-tech/go-ethereum/common/mclock"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p/discover/v5wire" "github.com/scroll-tech/go-ethereum/p2p/discover/v5wire"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr" "github.com/scroll-tech/go-ethereum/p2p/enr"
) )
// readError represents an error during packet reading. // readError represents an error during packet reading.

6
cmd/devp2p/keycmd.go
View file

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"net" "net"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/ethereum/go-ethereum/p2p/enr" "github.com/scroll-tech/go-ethereum/p2p/enr"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

6
cmd/devp2p/main.go
View file

@ -20,9 +20,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ethereum/go-ethereum/internal/debug" "github.com/scroll-tech/go-ethereum/internal/debug"
"github.com/ethereum/go-ethereum/internal/flags" "github.com/scroll-tech/go-ethereum/internal/flags"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

4
cmd/devp2p/nodeset.go
View file

@ -23,8 +23,8 @@ import (
"os" "os"
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/scroll-tech/go-ethereum/common"
"github.com/ethereum/go-ethereum/p2p/enode" "github.com/scroll-tech/go-ethereum/p2p/enode"
"golang.org/x/exp/slices" "golang.org/x/exp/slices"
) )

10
cmd/devp2p/nodesetcmd.go
View file

@ -25,11 +25,11 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/core" "github.com/scroll-tech/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/forkid" "github.com/scroll-tech/go-ethereum/core/forkid"
"github.com/ethereum/go-ethereum/p2p/enr" "github.com/scroll-tech/go-ethereum/p2p/enr"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

10
cmd/devp2p/rlpxcmd.go
View file

@ -21,11 +21,11 @@ import (
"fmt" "fmt"
"net" "net"
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/ethtest" "github.com/scroll-tech/go-ethereum/cmd/devp2p/internal/ethtest"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/p2p" "github.com/scroll-tech/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/p2p/rlpx" "github.com/scroll-tech/go-ethereum/p2p/rlpx"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

6
cmd/devp2p/runtest.go
View file

@ -19,9 +19,9 @@ package main
import ( import (
"os" "os"
"github.com/ethereum/go-ethereum/cmd/devp2p/internal/v4test" "github.com/scroll-tech/go-ethereum/cmd/devp2p/internal/v4test"
"github.com/ethereum/go-ethereum/internal/utesting" "github.com/scroll-tech/go-ethereum/internal/utesting"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

4
cmd/ethkey/changepassword.go
View file

@ -21,8 +21,8 @@ import (
"os" "os"
"strings" "strings"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/scroll-tech/go-ethereum/cmd/utils"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

6
cmd/ethkey/generate.go
View file

@ -22,9 +22,9 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/scroll-tech/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

6
cmd/ethkey/inspect.go
View file

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ethereum/go-ethereum/accounts/keystore" "github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/ethereum/go-ethereum/cmd/utils" "github.com/scroll-tech/go-ethereum/cmd/utils"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

2
cmd/ethkey/main.go
View file

@ -20,7 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ethereum/go-ethereum/internal/flags" "github.com/scroll-tech/go-ethereum/internal/flags"
"github.com/urfave/cli/v2" "github.com/urfave/cli/v2"
) )

Some files were not shown because too many files have changed in this diff Show more