Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Geth v1.14.12 upgrade #1

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions accounts/abi/abi.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"fmt"
"io"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/crypto"
)

// The ABI holds information about a contract's context and available
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/abi_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"strings"
"testing"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/common/math"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common/math"
"github.com/tenderly/morph-go-ethereum/crypto"
)

const jsondata = `
Expand Down
14 changes: 7 additions & 7 deletions accounts/abi/bind/auth.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import (
"io/ioutil"
"math/big"

"github.com/scroll-tech/go-ethereum/accounts"
"github.com/scroll-tech/go-ethereum/accounts/external"
"github.com/scroll-tech/go-ethereum/accounts/keystore"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/scroll-tech/go-ethereum/log"
"github.com/tenderly/morph-go-ethereum/accounts"
"github.com/tenderly/morph-go-ethereum/accounts/external"
"github.com/tenderly/morph-go-ethereum/accounts/keystore"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/log"
)

// ErrNoChainID is returned whenever the user failed to specify a chain id.
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/backend.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"errors"
"math/big"

"github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core/types"
)

var (
Expand Down
42 changes: 21 additions & 21 deletions accounts/abi/bind/backends/simulated.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,27 @@ import (
"sync"
"time"

"github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/scroll-tech/go-ethereum/common/math"
"github.com/scroll-tech/go-ethereum/consensus"
"github.com/scroll-tech/go-ethereum/consensus/ethash"
"github.com/scroll-tech/go-ethereum/core"
"github.com/scroll-tech/go-ethereum/core/bloombits"
"github.com/scroll-tech/go-ethereum/core/rawdb"
"github.com/scroll-tech/go-ethereum/core/state"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/core/vm"
"github.com/scroll-tech/go-ethereum/eth/filters"
"github.com/scroll-tech/go-ethereum/ethdb"
"github.com/scroll-tech/go-ethereum/event"
"github.com/scroll-tech/go-ethereum/log"
"github.com/scroll-tech/go-ethereum/params"
"github.com/scroll-tech/go-ethereum/rollup/fees"
"github.com/scroll-tech/go-ethereum/rpc"
"github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/accounts/abi"
"github.com/tenderly/morph-go-ethereum/accounts/abi/bind"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common/hexutil"
"github.com/tenderly/morph-go-ethereum/common/math"
"github.com/tenderly/morph-go-ethereum/consensus"
"github.com/tenderly/morph-go-ethereum/consensus/ethash"
"github.com/tenderly/morph-go-ethereum/core"
"github.com/tenderly/morph-go-ethereum/core/bloombits"
"github.com/tenderly/morph-go-ethereum/core/rawdb"
"github.com/tenderly/morph-go-ethereum/core/state"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/core/vm"
"github.com/tenderly/morph-go-ethereum/eth/filters"
"github.com/tenderly/morph-go-ethereum/ethdb"
"github.com/tenderly/morph-go-ethereum/event"
"github.com/tenderly/morph-go-ethereum/log"
"github.com/tenderly/morph-go-ethereum/params"
"github.com/tenderly/morph-go-ethereum/rollup/fees"
"github.com/tenderly/morph-go-ethereum/rpc"
)

// This nil assignment ensures at compile time that SimulatedBackend implements bind.ContractBackend.
Expand Down
16 changes: 8 additions & 8 deletions accounts/abi/bind/backends/simulated_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import (
"testing"
"time"

"github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/scroll-tech/go-ethereum/params"
"github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/accounts/abi"
"github.com/tenderly/morph-go-ethereum/accounts/abi/bind"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/params"
)

func TestSimulatedBackend(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/base.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@ import (
"strings"
"sync"

"github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/scroll-tech/go-ethereum/event"
"github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/accounts/abi"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/event"
)

// SignerFn is a signer function callback when a contract requires a method to
Expand Down
16 changes: 8 additions & 8 deletions accounts/abi/bind/base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ import (

"github.com/stretchr/testify/assert"

"github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/common/hexutil"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/scroll-tech/go-ethereum/rlp"
"github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/accounts/abi"
"github.com/tenderly/morph-go-ethereum/accounts/abi/bind"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common/hexutil"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/rlp"
)

func mockSign(addr common.Address, tx *types.Transaction) (*types.Transaction, error) { return tx, nil }
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/bind.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
// Package bind generates Ethereum contract Go bindings.
//
// Detailed usage document and tutorial available on the go-ethereum Wiki page:
// https://github.com/scroll-tech/go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
// https://github.com/tenderly/morph-go-ethereum/wiki/Native-DApps:-Go-bindings-to-Ethereum-contracts
package bind

import (
Expand All @@ -30,8 +30,8 @@ import (
"text/template"
"unicode"

"github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/log"
"github.com/tenderly/morph-go-ethereum/accounts/abi"
"github.com/tenderly/morph-go-ethereum/log"
)

// Lang is a target programming language selector to generate bindings for.
Expand Down
204 changes: 102 additions & 102 deletions accounts/abi/bind/bind_test.go

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions accounts/abi/bind/template.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package bind

import "github.com/scroll-tech/go-ethereum/accounts/abi"
import "github.com/tenderly/morph-go-ethereum/accounts/abi"

// tmplData is the data structure required to fill the binding template.
type tmplData struct {
Expand Down Expand Up @@ -99,12 +99,12 @@ import (
"strings"
"errors"

ethereum "github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/accounts/abi"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/event"
ethereum "github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/accounts/abi"
"github.com/tenderly/morph-go-ethereum/accounts/abi/bind"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/event"
)

// Reference imports to suppress errors if they are not otherwise used.
Expand Down
6 changes: 3 additions & 3 deletions accounts/abi/bind/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"errors"
"time"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/log"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/log"
)

// WaitMined waits for tx to be mined on the blockchain.
Expand Down
12 changes: 6 additions & 6 deletions accounts/abi/bind/util_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"testing"
"time"

"github.com/scroll-tech/go-ethereum/accounts/abi/bind"
"github.com/scroll-tech/go-ethereum/accounts/abi/bind/backends"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/accounts/abi/bind"
"github.com/tenderly/morph-go-ethereum/accounts/abi/bind/backends"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/crypto"
)

var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/error.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"fmt"
"strings"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/crypto"
)

type Error struct {
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/event.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"strings"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/crypto"
)

// Event is an event potentially triggered by the EVM's LOG mechanism. The Event
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/event_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/crypto"
)

var jsonEventTransfer = []byte(`{
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/method.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"fmt"
"strings"

"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/crypto"
)

// FunctionType represents different types of functions a contract might have.
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/pack.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"math/big"
"reflect"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/common/math"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common/math"
)

// packBytesSlice packs the given bytes as [L, V] as the canonical representation
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/pack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"strings"
"testing"

"github.com/scroll-tech/go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common"
)

// TestPack tests the general pack/unpack tests in packing_test.go
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/packing_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package abi
import (
"math/big"

"github.com/scroll-tech/go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common"
)

type packUnpackTest struct {
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/topics.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import (
"math/big"
"reflect"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/crypto"
)

// MakeTopics converts a filter query argument list into a filter topic set.
Expand Down
4 changes: 2 additions & 2 deletions accounts/abi/topics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"reflect"
"testing"

"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/crypto"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/crypto"
)

func TestMakeTopics(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/type.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"strconv"
"strings"

"github.com/scroll-tech/go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common"
)

// Type enumerator
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/type_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

"github.com/davecgh/go-spew/spew"

"github.com/scroll-tech/go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common"
)

// typeWithoutStringer is a alias for the Type type which simply doesn't implement
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"math/big"
"reflect"

"github.com/scroll-tech/go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion accounts/abi/unpack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

"github.com/stretchr/testify/require"

"github.com/scroll-tech/go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/common"
)

// TestUnpack tests the general pack/unpack tests in packing_test.go
Expand Down
8 changes: 4 additions & 4 deletions accounts/accounts.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (

"golang.org/x/crypto/sha3"

"github.com/scroll-tech/go-ethereum"
"github.com/scroll-tech/go-ethereum/common"
"github.com/scroll-tech/go-ethereum/core/types"
"github.com/scroll-tech/go-ethereum/event"
"github.com/tenderly/morph-go-ethereum"
"github.com/tenderly/morph-go-ethereum/common"
"github.com/tenderly/morph-go-ethereum/core/types"
"github.com/tenderly/morph-go-ethereum/event"
)

// Account represents an Ethereum account located at a specific location defined
Expand Down
Loading