forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-24 05:36:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update mod file and all imports to use scroll-tech URL (#15)

Browse source 
* Update mod file and all imports to use scroll-tech URL

Fixes #14

* Update Discord link
This commit is contained in:
Jules 2021-12-24 10:59:22 +01:00 committed by GitHub
parent 80940fa40d
commit de7ed6af40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
805 changed files with 3533 additions and 3533 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -4,10 +4,10 @@ Official Golang implementation of the Ethereum protocol.
[![API Reference]( [![API Reference](
https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667 https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667
)](https://pkg.go.dev/github.com/ethereum/go-ethereum?tab=doc) )](https://pkg.go.dev/github.com/scroll-tech/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) [![Go Report Card](https://goreportcard.com/badge/github.com/scroll-tech/go-ethereum)](https://goreportcard.com/report/github.com/scroll-tech/go-ethereum)
[![Travis](https://travis-ci.com/ethereum/go-ethereum.svg?branch=master)](https://travis-ci.com/ethereum/go-ethereum) [![Travis](https://travis-ci.com/scroll-tech/go-ethereum.svg?branch=master)](https://travis-ci.com/scroll-tech/go-ethereum)
[![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/nthXNEv) [![Discord](https://img.shields.io/badge/discord-join%20chat-blue.svg)](https://discord.gg/2stGbxwb)
## ZK-Rollup ## ZK-Rollup

14
SECURITY.md
View file

@ -2,24 +2,24 @@
## Supported Versions ## 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/scroll-tech/go-ethereum/releases). We recommend using the [most recently released version](https://github.com/scroll-tech/go-ethereum/releases/latest).
## Audit reports ## 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/scroll-tech/go-ethereum/tree/master/docs/audits
| Scope | Date | Report Link | | Scope | Date | Report Link |
| ------- | ------- | ----------- | | ------- | ------- | ----------- |
| `geth` | 20170425 | [pdf](https://github.com/ethereum/go-ethereum/blob/master/docs/audits/2017-04-25_Geth-audit_Truesec.pdf) | | `geth` | 20170425 | [pdf](https://github.com/scroll-tech/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) | | `clef` | 20180914 | [pdf](https://github.com/scroll-tech/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` | 20191015 | [pdf](https://github.com/scroll-tech/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) | | `Discv5` | 20200124 | [pdf](https://github.com/scroll-tech/go-ethereum/blob/master/docs/audits/2020-01-24_DiscV5_audit_Cure53.pdf) |
## Reporting a Vulnerability ## Reporting a Vulnerability
**Please do not file a public ticket** mentioning the 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 publically 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/scroll-tech/go-ethereum/security/advisories?state=published) for more information about publically 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. 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.

4
accounts/abi/abi.go
View file

@ -23,8 +23,8 @@ import (
"fmt" "fmt"
"io" "io"
"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

@ -24,13 +24,13 @@ import (
"io/ioutil" "io/ioutil"
"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 (

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

@ -24,25 +24,25 @@ 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/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"
) )
// SignerFn is a signer function callback when a contract requires a method to // SignerFn is a signer function callback when a contract requires a method to

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

@ -23,14 +23,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"
) )

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

@ -17,7 +17,7 @@
// Package bind generates Ethereum contract Go bindings. // Package bind generates Ethereum contract Go bindings.
// //
// Detailed usage document and tutorial available on the go-ethereum Wiki page: // 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/scroll-tech/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
package bind package bind
import ( import (
@ -30,8 +30,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.

204
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 {
@ -92,12 +92,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.

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

@ -21,9 +21,9 @@ import (
"errors" "errors"
"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/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

@ -24,7 +24,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"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

@ -22,7 +22,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

@ -26,7 +26,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

@ -21,15 +21,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" mapset "github.com/deckarep/golang-set"
"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"
) )
// Minimum amount of time between cache reloads. This limit applies if the platform does // Minimum amount of time between cache reloads. This limit applies if the platform does

4
accounts/keystore/account_cache_test.go
View file

@ -29,8 +29,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"
) )
var ( var (

2
accounts/keystore/file_cache.go
View file

@ -25,7 +25,7 @@ import (
"time" "time"
mapset "github.com/deckarep/golang-set" mapset "github.com/deckarep/golang-set"
"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

@ -29,9 +29,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

@ -28,10 +28,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"
) )
var testSigData = make([]byte, 32) var testSigData = make([]byte, 32)

10
accounts/keystore/passphrase.go
View file

@ -38,10 +38,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"
@ -121,7 +121,7 @@ func (ks keyStorePassphrase) StoreKey(filename string, key *Key, auth string) er
"This indicates that the keystore is corrupted. \n" + "This indicates that the keystore is corrupted. \n" +
"The corrupted file is stored at \n%v\n" + "The corrupted file is stored at \n%v\n" +
"Please file a ticket at:\n\n" + "Please file a ticket at:\n\n" +
"https://github.com/ethereum/go-ethereum/issues." + "https://github.com/scroll-tech/go-ethereum/issues." +
"The error was : %s" "The error was : %s"
//lint:ignore ST1005 This is a message for the user //lint:ignore ST1005 This is a message for the user
return fmt.Errorf(msg, tmpName, err) return fmt.Errorf(msg, tmpName, err)

2
accounts/keystore/passphrase_test.go
View file

@ -20,7 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"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

@ -27,8 +27,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

@ -22,7 +22,7 @@ package keystore
import ( import (
"time" "time"
"github.com/ethereum/go-ethereum/log" "github.com/scroll-tech/go-ethereum/log"
"github.com/rjeczalik/notify" "github.com/rjeczalik/notify"
) )

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

@ -26,7 +26,7 @@ import (
"crypto/sha512" "crypto/sha512"
"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"
) )

10
build/ci.go
View file

@ -59,9 +59,9 @@ import (
"time" "time"
"github.com/cespare/cp" "github.com/cespare/cp"
"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 (
@ -1001,7 +1001,7 @@ func doAndroidArchive(cmdline []string) {
build.MustRun(tc.Go("mod", "download")) build.MustRun(tc.Go("mod", "download"))
// Build the Android archive and Maven resources // Build the Android archive and Maven resources
build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/ethereum/go-ethereum/mobile")) build.MustRun(gomobileTool("bind", "-ldflags", "-s -w", "--target", "android", "--javapkg", "org.ethereum", "-v", "github.com/scroll-tech/go-ethereum/mobile"))
if *local { if *local {
// If we're building locally, copy bundle to build dir and skip Maven // If we're building locally, copy bundle to build dir and skip Maven
@ -1130,7 +1130,7 @@ func doXCodeFramework(cmdline []string) {
build.MustRun(tc.Go("mod", "download")) build.MustRun(tc.Go("mod", "download"))
// Build the iOS XCode framework // Build the iOS XCode framework
bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "-v", "github.com/ethereum/go-ethereum/mobile") bind := gomobileTool("bind", "-ldflags", "-s -w", "--target", "ios", "-v", "github.com/scroll-tech/go-ethereum/mobile")
if *local { if *local {
// If we're building locally, use the build folder and stop afterwards // If we're building locally, use the build folder and stop afterwards

4
build/deb/ethereum/deb.control
View file

@ -5,8 +5,8 @@ Maintainer: {{.Author}}
Build-Depends: debhelper (>= 8.0.0), {{.GoBootPackage}} Build-Depends: debhelper (>= 8.0.0), {{.GoBootPackage}}
Standards-Version: 3.9.5 Standards-Version: 3.9.5
Homepage: https://ethereum.org Homepage: https://ethereum.org
Vcs-Git: git://github.com/ethereum/go-ethereum.git Vcs-Git: git://github.com/scroll-tech/go-ethereum.git
Vcs-Browser: https://github.com/ethereum/go-ethereum Vcs-Browser: https://github.com/scroll-tech/go-ethereum
Package: {{.Name}} Package: {{.Name}}
Architecture: any Architecture: any

6
build/mvn.pom
View file

@ -11,7 +11,7 @@
<name>Android Ethereum Client</name> <name>Android Ethereum Client</name>
<description>Android port of the go-ethereum libraries and node</description> <description>Android port of the go-ethereum libraries and node</description>
<url>https://github.com/ethereum/go-ethereum</url> <url>https://github.com/scroll-tech/go-ethereum</url>
<inceptionYear>2015</inceptionYear> <inceptionYear>2015</inceptionYear>
<licenses> <licenses>
@ -48,10 +48,10 @@
<issueManagement> <issueManagement>
<system>GitHub Issues</system> <system>GitHub Issues</system>
<url>https://github.com/ethereum/go-ethereum/issues/</url> <url>https://github.com/scroll-tech/go-ethereum/issues/</url>
</issueManagement> </issueManagement>
<scm> <scm>
<url>https://github.com/ethereum/go-ethereum</url> <url>https://github.com/scroll-tech/go-ethereum</url>
</scm> </scm>
</project> </project>

6
build/nsis.install.nsh
View file

@ -3,9 +3,9 @@ InstallDir "$InstDir"
OutFile "${OUTPUTFILE}" # set through command line arguments OutFile "${OUTPUTFILE}" # set through command line arguments
# Links for "Add/Remove Programs" # Links for "Add/Remove Programs"
!define HELPURL "https://github.com/ethereum/go-ethereum/issues" !define HELPURL "https://github.com/scroll-tech/go-ethereum/issues"
!define UPDATEURL "https://github.com/ethereum/go-ethereum/releases" !define UPDATEURL "https://github.com/scroll-tech/go-ethereum/releases"
!define ABOUTURL "https://github.com/ethereum/go-ethereum#ethereum-go" !define ABOUTURL "https://github.com/scroll-tech/go-ethereum#ethereum-go"
!define /date NOW "%Y%m%d" !define /date NOW "%Y%m%d"
PageEx license PageEx license

4
build/pod.podspec
View file

@ -2,12 +2,12 @@ Pod::Spec.new do |spec|
spec.name = 'Geth' spec.name = 'Geth'
spec.version = '{{.Version}}' spec.version = '{{.Version}}'
spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' } spec.license = { :type => 'GNU Lesser General Public License, Version 3.0' }
spec.homepage = 'https://github.com/ethereum/go-ethereum' spec.homepage = 'https://github.com/scroll-tech/go-ethereum'
spec.authors = { {{range .Contributors}} spec.authors = { {{range .Contributors}}
'{{.Name}}' => '{{.Email}}',{{end}} '{{.Name}}' => '{{.Email}}',{{end}}
} }
spec.summary = 'iOS Ethereum Client' spec.summary = 'iOS Ethereum Client'
spec.source = { :git => 'https://github.com/ethereum/go-ethereum.git', :commit => '{{.Commit}}' } spec.source = { :git => 'https://github.com/scroll-tech/go-ethereum.git', :commit => '{{.Commit}}' }
spec.platform = :ios spec.platform = :ios
spec.ios.deployment_target = '9.0' spec.ios.deployment_target = '9.0'

2
build/update-license.go
View file

@ -77,7 +77,7 @@ var (
"signer/rules/deps", "signer/rules/deps",
// skip special licenses // 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/scroll-tech/go-ethereum/pull/17225
} }
// paths with this prefix are licensed as GPL. all other files are LGPL. // paths with this prefix are licensed as GPL. all other files are LGPL.

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() {

14
cmd/abigen/main.go
View file

@ -25,13 +25,13 @@ import (
"regexp" "regexp"
"strings" "strings"
"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/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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

14
cmd/bootnode/main.go
View file

@ -24,13 +24,13 @@ import (
"net" "net"
"os" "os"
"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() {

6
cmd/checkpoint-admin/README.md
View file

@ -18,7 +18,7 @@ However, from a security perspective, the most critical step in a synchronizatio
#### Hardcoded checkpoint #### Hardcoded checkpoint
There are several hardcoded checkpoints in the [source code](https://github.com/ethereum/go-ethereum/blob/master/params/config.go#L38) of the go-ethereum project. These checkpoints are updated by go-ethereum developers when new versions of software are released. Because light client users trust Geth developers to some extent, hardcoded checkpoints in the code can also be considered correct. There are several hardcoded checkpoints in the [source code](https://github.com/scroll-tech/go-ethereum/blob/master/params/config.go#L38) of the go-ethereum project. These checkpoints are updated by go-ethereum developers when new versions of software are released. Because light client users trust Geth developers to some extent, hardcoded checkpoints in the code can also be considered correct.
#### Checkpoint oracle #### Checkpoint oracle
@ -35,7 +35,7 @@ Checkpoint-admin is a command line tool designed for checkpoint oracle. Users ca
#### Install #### Install
```shell ```shell
go get github.com/ethereum/go-ethereum/cmd/checkpoint-admin go get github.com/scroll-tech/go-ethereum/cmd/checkpoint-admin
``` ```
#### Deploy #### Deploy
@ -66,7 +66,7 @@ checkpoint-admin sign --clef <CLEF_ENDPOINT> --signer <SIGNER_TO_SIGN_CHECKPOINT
checkpoint-admin sign --clef <CLEF_ENDPOINT> --signer <SIGNER_TO_SIGN_CHECKPOINT> --index <CHECKPOINT_INDEX> --hash <CHECKPOINT_HASH> --oracle <CHECKPOINT_ORACLE_ADDRESS> checkpoint-admin sign --clef <CLEF_ENDPOINT> --signer <SIGNER_TO_SIGN_CHECKPOINT> --index <CHECKPOINT_INDEX> --hash <CHECKPOINT_HASH> --oracle <CHECKPOINT_ORACLE_ADDRESS>
``` ```
*CHECKPOINT_HASH is obtained based on this [calculation method](https://github.com/ethereum/go-ethereum/blob/master/params/config.go#L251).* *CHECKPOINT_HASH is obtained based on this [calculation method](https://github.com/scroll-tech/go-ethereum/blob/master/params/config.go#L251).*
#### Publish #### Publish

18
cmd/checkpoint-admin/common.go
View file

@ -19,15 +19,15 @@ package main
import ( import (
"strconv" "strconv"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"github.com/ethereum/go-ethereum/accounts/abi/bind" "github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/ethereum/go-ethereum/accounts/external" "github.com/scroll-tech/go-ethereum/accounts/external"
"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/contracts/checkpointoracle" "github.com/scroll-tech/go-ethereum/contracts/checkpointoracle"
"github.com/ethereum/go-ethereum/ethclient" "github.com/scroll-tech/go-ethereum/ethclient"
"github.com/ethereum/go-ethereum/params" "github.com/scroll-tech/go-ethereum/params"
"github.com/ethereum/go-ethereum/rpc" "github.com/scroll-tech/go-ethereum/rpc"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

22
cmd/checkpoint-admin/exec.go
View file

@ -25,17 +25,17 @@ import (
"strings" "strings"
"time" "time"
"github.com/ethereum/go-ethereum/accounts" "github.com/scroll-tech/go-ethereum/accounts"
"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/contracts/checkpointoracle" "github.com/scroll-tech/go-ethereum/contracts/checkpointoracle"
"github.com/ethereum/go-ethereum/contracts/checkpointoracle/contract" "github.com/scroll-tech/go-ethereum/contracts/checkpointoracle/contract"
"github.com/ethereum/go-ethereum/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethclient" "github.com/scroll-tech/go-ethereum/ethclient"
"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/rpc" "github.com/scroll-tech/go-ethereum/rpc"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/checkpoint-admin/main.go
View file

@ -22,9 +22,9 @@ import (
"fmt" "fmt"
"os" "os"
"github.com/ethereum/go-ethereum/common/fdlimit" "github.com/scroll-tech/go-ethereum/common/fdlimit"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/checkpoint-admin/status.go
View file

@ -19,8 +19,8 @@ package main
import ( import (
"fmt" "fmt"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

40
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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
@ -795,7 +795,7 @@ func checkFile(filename string) error {
} }
// Check the unix permission bits // Check the unix permission bits
// However, on windows, we cannot use the unix perm-bits, see // However, on windows, we cannot use the unix perm-bits, see
// https://github.com/ethereum/go-ethereum/issues/20123 // https://github.com/scroll-tech/go-ethereum/issues/20123
if runtime.GOOS != "windows" && info.Mode().Perm()&0377 != 0 { if runtime.GOOS != "windows" && info.Mode().Perm()&0377 != 0 {
return fmt.Errorf("file (%v) has insecure file permissions (%v)", filename, info.Mode().String()) return fmt.Errorf("file (%v) has insecure file permissions (%v)", filename, info.Mode().String())
} }

6
cmd/clef/tutorial.md
View file

@ -100,9 +100,9 @@ or
{"jsonrpc":"2.0","id":1,"error":{"code":-32000,"message":"Request denied"}} {"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/scroll-tech/go-ethereum/tree/master/cmd/clef#external-api-1) and the [External API Changelog](https://github.com/scroll-tech/go-ethereum/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/scroll-tech/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.*
## Automatic rules ## 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" 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/scroll-tech/go-ethereum/blob/master/cmd/clef/rules.md).
## Geth integration ## Geth integration

4
cmd/devp2p/crawl.go
View file

@ -19,8 +19,8 @@ package main
import ( import (
"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 {

12
cmd/devp2p/discv4cmd.go
View file

@ -22,12 +22,12 @@ 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/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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/devp2p/discv5cmd.go
View file

@ -20,9 +20,9 @@ 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/p2p/discover" "github.com/scroll-tech/go-ethereum/p2p/discover"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/devp2p/dns_cloudflare.go
View file

@ -22,8 +22,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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/devp2p/dns_route53.go
View file

@ -30,8 +30,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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

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

@ -26,11 +26,11 @@ import (
"os" "os"
"strings" "strings"
"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 {

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

@ -21,8 +21,8 @@ import (
"strconv" "strconv"
"testing" "testing"
"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

@ -24,13 +24,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.

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

@ -22,11 +22,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

@ -20,10 +20,10 @@ import (
"crypto/ecdsa" "crypto/ecdsa"
"fmt" "fmt"
"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

@ -23,9 +23,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.

4
cmd/devp2p/keycmd.go
View file

@ -20,8 +20,8 @@ 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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/devp2p/main.go
View file

@ -22,9 +22,9 @@ import (
"path/filepath" "path/filepath"
"sort" "sort"
"github.com/ethereum/go-ethereum/internal/debug" "github.com/scroll-tech/go-ethereum/internal/debug"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/devp2p/nodeset.go
View file

@ -25,8 +25,8 @@ import (
"sort" "sort"
"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"
) )
const jsonIndent = " " const jsonIndent = " "

8
cmd/devp2p/nodesetcmd.go
View file

@ -25,10 +25,10 @@ import (
"strings" "strings"
"time" "time"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

12
cmd/devp2p/rlpxcmd.go
View file

@ -20,12 +20,12 @@ 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/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"
"github.com/ethereum/go-ethereum/rlp" "github.com/scroll-tech/go-ethereum/rlp"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

4
cmd/ethkey/changepassword.go
View file

@ -21,8 +21,8 @@ import (
"io/ioutil" "io/ioutil"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/ethkey/generate.go
View file

@ -23,9 +23,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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

6
cmd/ethkey/inspect.go
View file

@ -21,9 +21,9 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

8
cmd/ethkey/message.go
View file

@ -21,10 +21,10 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"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/crypto" "github.com/scroll-tech/go-ethereum/crypto"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

2
cmd/ethkey/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"
) )
type testEthkey struct { type testEthkey struct {

4
cmd/ethkey/utils.go
View file

@ -22,8 +22,8 @@ import (
"io/ioutil" "io/ioutil"
"strings" "strings"
"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"
"gopkg.in/urfave/cli.v1" "gopkg.in/urfave/cli.v1"
) )

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