core/vm, params, eth: merge geth v1.17.5 (v1.17.5 sync)

.github/CODEOWNERS

@@ -16,15 +16,12 @@ crypto/                         @gballet @jwasinger @fjl
 core/                           @rjl493456442
 eth/                            @rjl493456442
 eth/catalyst/                   @MariusVanDerWijden @lightclient @fjl @jwasinger
-eth/tracers/                    @s1na
 ethclient/                      @fjl
 ethdb/                          @rjl493456442
 event/                          @fjl
 trie/                           @rjl493456442 @gballet
 triedb/                         @rjl493456442
-core/tracing/                   @s1na
-graphql/                        @s1na
-internal/ethapi/                @fjl @s1na @lightclient
+internal/ethapi/                @fjl @lightclient
 internal/era/                   @lightclient
 miner/                          @MariusVanDerWijden @fjl @rjl493456442
 node/                           @fjl

.mailmap

@@ -48,6 +48,9 @@ Bas van Kervel <bas@ethdev.com> <bas-vk@users.noreply.github.com>
 Boqin Qin <bobbqqin@bupt.edu.cn>
 Boqin Qin <bobbqqin@bupt.edu.cn> <Bobbqqin@gmail.com>
 
+Bosul Mun <bsbs8645@snu.ac.kr>
+Bosul Mun <bsbs8645@snu.ac.kr> <bosul.mun@ethereum.org>
+
 Casey Detrio <cdetrio@gmail.com>
 
 Charlotte <tqpcharlie@proton.me>

accounts/abi/abigen/source.go.tpl

@@ -4,8 +4,10 @@
 package {{.Package}}
 
 import (
+	"context"
 	"math/big"
 	"strings"
+	"time"
 	"errors"
 
 	ethereum "github.com/ethereum/go-ethereum"
@@ -27,6 +29,8 @@ var (
 	_ = types.BloomLookup
 	_ = event.NewSubscription
 	_ = abi.ConvertType
+	_ = time.Tick
+	_ = context.Background
 )
 
 {{$structs := .Structs}}
@@ -77,7 +81,11 @@ var (
 			return common.Address{}, nil, nil, errors.New("GetABI returned nil")
 		  }
 		  {{range $pattern, $name := .Libraries}}
-			{{decapitalise $name}}Addr, _, _, _ := Deploy{{capitalise $name}}(auth, backend)
+			{{decapitalise $name}}Addr, tx, _, _ := Deploy{{capitalise $name}}(auth, backend)
+			ctx, _ := context.WithTimeout(context.Background(), 5 * time.Second)
+			if err := bind.WaitAccepted(ctx, backend, tx); err != nil {
+			    return common.Address{}, nil, nil, err
+			}
 			{{$contract.Type}}Bin = strings.ReplaceAll({{$contract.Type}}Bin, "__${{$pattern}}$__", {{decapitalise $name}}Addr.String()[2:])
 		  {{end}}
 		  address, tx, contract, err := bind.DeployContract(auth, *parsed, common.FromHex({{.Type}}Bin), backend {{range .Constructor.Inputs}}, {{.Name}}{{end}})

accounts/abi/abigen/source2.go.tpl

@@ -59,6 +59,11 @@ var (
 		abi abi.ABI
 	}
 
+	// GetABI returns the ABI associated with this contract binding.
+	func (c *{{.Type}}) GetABI() abi.ABI {
+		return c.abi
+	}
+
 	// New{{.Type}} creates a new instance of {{.Type}}.
 	func New{{.Type}}() *{{.Type}} {
 		parsed, err := {{.Type}}MetaData.ParseABI()

accounts/abi/abigen/testdata/v2/callbackparam.go.txt

@@ -36,6 +36,11 @@ type CallbackParam struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *CallbackParam) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewCallbackParam creates a new instance of CallbackParam.
 func NewCallbackParam() *CallbackParam {
 	parsed, err := CallbackParamMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/crowdsale.go.txt

@@ -36,6 +36,11 @@ type Crowdsale struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Crowdsale) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewCrowdsale creates a new instance of Crowdsale.
 func NewCrowdsale() *Crowdsale {
 	parsed, err := CrowdsaleMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/dao.go.txt

@@ -36,6 +36,11 @@ type DAO struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *DAO) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewDAO creates a new instance of DAO.
 func NewDAO() *DAO {
 	parsed, err := DAOMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt

@@ -36,6 +36,11 @@ type DeeplyNestedArray struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *DeeplyNestedArray) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewDeeplyNestedArray creates a new instance of DeeplyNestedArray.
 func NewDeeplyNestedArray() *DeeplyNestedArray {
 	parsed, err := DeeplyNestedArrayMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/empty.go.txt

@@ -36,6 +36,11 @@ type Empty struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Empty) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewEmpty creates a new instance of Empty.
 func NewEmpty() *Empty {
 	parsed, err := EmptyMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/eventchecker.go.txt

@@ -35,6 +35,11 @@ type EventChecker struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *EventChecker) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewEventChecker creates a new instance of EventChecker.
 func NewEventChecker() *EventChecker {
 	parsed, err := EventCheckerMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/getter.go.txt

@@ -36,6 +36,11 @@ type Getter struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Getter) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewGetter creates a new instance of Getter.
 func NewGetter() *Getter {
 	parsed, err := GetterMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/identifiercollision.go.txt

@@ -36,6 +36,11 @@ type IdentifierCollision struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *IdentifierCollision) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewIdentifierCollision creates a new instance of IdentifierCollision.
 func NewIdentifierCollision() *IdentifierCollision {
 	parsed, err := IdentifierCollisionMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/inputchecker.go.txt

@@ -35,6 +35,11 @@ type InputChecker struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *InputChecker) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewInputChecker creates a new instance of InputChecker.
 func NewInputChecker() *InputChecker {
 	parsed, err := InputCheckerMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/interactor.go.txt

@@ -36,6 +36,11 @@ type Interactor struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Interactor) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewInteractor creates a new instance of Interactor.
 func NewInteractor() *Interactor {
 	parsed, err := InteractorMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/nameconflict.go.txt

@@ -42,6 +42,11 @@ type NameConflict struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *NameConflict) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewNameConflict creates a new instance of NameConflict.
 func NewNameConflict() *NameConflict {
 	parsed, err := NameConflictMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/numericmethodname.go.txt

@@ -36,6 +36,11 @@ type NumericMethodName struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *NumericMethodName) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewNumericMethodName creates a new instance of NumericMethodName.
 func NewNumericMethodName() *NumericMethodName {
 	parsed, err := NumericMethodNameMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/outputchecker.go.txt

@@ -35,6 +35,11 @@ type OutputChecker struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *OutputChecker) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewOutputChecker creates a new instance of OutputChecker.
 func NewOutputChecker() *OutputChecker {
 	parsed, err := OutputCheckerMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/overload.go.txt

@@ -36,6 +36,11 @@ type Overload struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Overload) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewOverload creates a new instance of Overload.
 func NewOverload() *Overload {
 	parsed, err := OverloadMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/rangekeyword.go.txt

@@ -36,6 +36,11 @@ type RangeKeyword struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *RangeKeyword) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewRangeKeyword creates a new instance of RangeKeyword.
 func NewRangeKeyword() *RangeKeyword {
 	parsed, err := RangeKeywordMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/slicer.go.txt

@@ -36,6 +36,11 @@ type Slicer struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Slicer) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewSlicer creates a new instance of Slicer.
 func NewSlicer() *Slicer {
 	parsed, err := SlicerMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/structs.go.txt

@@ -41,6 +41,11 @@ type Structs struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Structs) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewStructs creates a new instance of Structs.
 func NewStructs() *Structs {
 	parsed, err := StructsMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/token.go.txt

@@ -36,6 +36,11 @@ type Token struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Token) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewToken creates a new instance of Token.
 func NewToken() *Token {
 	parsed, err := TokenMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/tuple.go.txt

@@ -61,6 +61,11 @@ type Tuple struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Tuple) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewTuple creates a new instance of Tuple.
 func NewTuple() *Tuple {
 	parsed, err := TupleMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/tupler.go.txt

@@ -36,6 +36,11 @@ type Tupler struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Tupler) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewTupler creates a new instance of Tupler.
 func NewTupler() *Tupler {
 	parsed, err := TuplerMetaData.ParseABI()

accounts/abi/abigen/testdata/v2/underscorer.go.txt

@@ -36,6 +36,11 @@ type Underscorer struct {
 	abi abi.ABI
 }
 
+// GetABI returns the ABI associated with this contract binding.
+func (c *Underscorer) GetABI() abi.ABI {
+	return c.abi
+}
+
 // NewUnderscorer creates a new instance of Underscorer.
 func NewUnderscorer() *Underscorer {
 	parsed, err := UnderscorerMetaData.ParseABI()

accounts/abi/bind/old.go

@@ -273,6 +273,12 @@ func (m *MetaData) GetAbi() (*abi.ABI, error) {
 
 // util.go
 
+// WaitAccepted waits for a tx to be accepted into the pool.
+// It stops waiting when the context is canceled.
+func WaitAccepted(ctx context.Context, b ContractBackend, tx *types.Transaction) error {
+	return bind2.WaitAccepted(ctx, b, tx.Hash())
+}
+
 // WaitMined waits for tx to be mined on the blockchain.
 // It stops waiting when the context is canceled.
 func WaitMined(ctx context.Context, b DeployBackend, tx *types.Transaction) (*types.Receipt, error) {

accounts/abi/bind/v2/backend.go

@@ -103,6 +103,9 @@ type ContractTransactor interface {
 
 	// PendingNonceAt retrieves the current pending nonce associated with an account.
 	PendingNonceAt(ctx context.Context, account common.Address) (uint64, error)
+
+	// TransactionByHash retrieves the transaction associated with the hash, if it exists in the pool.
+	TransactionByHash(ctx context.Context, hash common.Hash) (tx *types.Transaction, isPending bool, err error)
 }
 
 // DeployBackend wraps the operations needed by WaitMined and WaitDeployed.

accounts/abi/bind/v2/base.go

@@ -328,7 +328,7 @@ func (c *BoundContract) createDynamicTx(opts *TransactOpts, contract *common.Add
 		}
 	}
 	// create the transaction
-	nonce, err := c.getNonce(opts)
+	nonce, err := c.GetNonce(opts)
 	if err != nil {
 		return nil, err
 	}
@@ -378,7 +378,7 @@ func (c *BoundContract) createLegacyTx(opts *TransactOpts, contract *common.Addr
 		}
 	}
 	// create the transaction
-	nonce, err := c.getNonce(opts)
+	nonce, err := c.GetNonce(opts)
 	if err != nil {
 		return nil, err
 	}
@@ -419,7 +419,7 @@ func (c *BoundContract) estimateGasLimit(opts *TransactOpts, contract *common.Ad
 	return c.transactor.EstimateGas(ensureContext(opts.Context), msg)
 }
 
-func (c *BoundContract) getNonce(opts *TransactOpts) (uint64, error) {
+func (c *BoundContract) GetNonce(opts *TransactOpts) (uint64, error) {
 	if opts.Nonce == nil {
 		return c.transactor.PendingNonceAt(ensureContext(opts.Context), opts.From)
 	} else {

accounts/abi/bind/v2/base_test.go

@@ -80,6 +80,10 @@ func (mt *mockTransactor) SendTransaction(ctx context.Context, tx *types.Transac
 	return nil
 }
 
+func (mt *mockTransactor) TransactionByHash(ctx context.Context, hash common.Hash) (*types.Transaction, bool, error) {
+	return nil, false, nil
+}
+
 type mockCaller struct {
 	codeAtBlockNumber       *big.Int
 	callContractBlockNumber *big.Int