Skip to content

Commit f041492

Browse files
authored
Merge branch 'master' into secp256r1-precompile
2 parents 4da5fdd + 1e8c23b commit f041492

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+23808
-4808
lines changed

.golangci.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ run:
1212
linters:
1313
disable-all: true
1414
enable:
15-
- goconst
1615
- goimports
1716
- gosimple
1817
- govet
@@ -39,9 +38,6 @@ linters:
3938
linters-settings:
4039
gofmt:
4140
simplify: true
42-
goconst:
43-
min-len: 3 # minimum length of string constant
44-
min-occurrences: 6 # minimum number of occurrences
4541

4642
issues:
4743
exclude-rules:

.travis.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,6 @@ jobs:
99
- azure-osx
1010

1111
include:
12-
# This builder only tests code linters on latest version of Go
13-
- stage: lint
14-
os: linux
15-
dist: bionic
16-
go: 1.21.x
17-
env:
18-
- lint
19-
git:
20-
submodules: false # avoid cloning ethereum/tests
21-
script:
22-
- go run build/ci.go lint
23-
2412
# These builders create the Docker sub-images for multi-arch push and each
2513
# will attempt to push the multi-arch image if they are the last builder
2614
- stage: build

accounts/abi/bind/backend.go

Lines changed: 11 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,11 @@ type BlockHashContractCaller interface {
8484
// used when the user does not provide some needed values, but rather leaves it up
8585
// to the transactor to decide.
8686
type ContractTransactor interface {
87+
ethereum.GasEstimator
88+
ethereum.GasPricer
89+
ethereum.GasPricer1559
90+
ethereum.TransactionSender
91+
8792
// HeaderByNumber returns a block header from the current canonical chain. If
8893
// number is nil, the latest known header is returned.
8994
HeaderByNumber(ctx context.Context, number *big.Int) (*types.Header, error)
@@ -93,38 +98,6 @@ type ContractTransactor interface {
9398

9499
// PendingNonceAt retrieves the current pending nonce associated with an account.
95100
PendingNonceAt(ctx context.Context, account common.Address) (uint64, error)
96-
97-
// SuggestGasPrice retrieves the currently suggested gas price to allow a timely
98-
// execution of a transaction.
99-
SuggestGasPrice(ctx context.Context) (*big.Int, error)
100-
101-
// SuggestGasTipCap retrieves the currently suggested 1559 priority fee to allow
102-
// a timely execution of a transaction.
103-
SuggestGasTipCap(ctx context.Context) (*big.Int, error)
104-
105-
// EstimateGas tries to estimate the gas needed to execute a specific
106-
// transaction based on the current pending state of the backend blockchain.
107-
// There is no guarantee that this is the true gas limit requirement as other
108-
// transactions may be added or removed by miners, but it should provide a basis
109-
// for setting a reasonable default.
110-
EstimateGas(ctx context.Context, call ethereum.CallMsg) (gas uint64, err error)
111-
112-
// SendTransaction injects the transaction into the pending pool for execution.
113-
SendTransaction(ctx context.Context, tx *types.Transaction) error
114-
}
115-
116-
// ContractFilterer defines the methods needed to access log events using one-off
117-
// queries or continuous event subscriptions.
118-
type ContractFilterer interface {
119-
// FilterLogs executes a log filter operation, blocking during execution and
120-
// returning all the results in one batch.
121-
//
122-
// TODO(karalabe): Deprecate when the subscription one can return past data too.
123-
FilterLogs(ctx context.Context, query ethereum.FilterQuery) ([]types.Log, error)
124-
125-
// SubscribeFilterLogs creates a background log filtering operation, returning
126-
// a subscription immediately, which can be used to stream the found events.
127-
SubscribeFilterLogs(ctx context.Context, query ethereum.FilterQuery, ch chan<- types.Log) (ethereum.Subscription, error)
128101
}
129102

130103
// DeployBackend wraps the operations needed by WaitMined and WaitDeployed.
@@ -133,6 +106,12 @@ type DeployBackend interface {
133106
CodeAt(ctx context.Context, account common.Address, blockNumber *big.Int) ([]byte, error)
134107
}
135108

109+
// ContractFilterer defines the methods needed to access log events using one-off
110+
// queries or continuous event subscriptions.
111+
type ContractFilterer interface {
112+
ethereum.LogFilterer
113+
}
114+
136115
// ContractBackend defines the methods needed to work with contracts on a read-write basis.
137116
type ContractBackend interface {
138117
ContractCaller

0 commit comments

Comments
 (0)