forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-12 06:53:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

accounts/abi/bind/v2: support passing nil unpack function in Call

Browse source
This commit is contained in:
Felix Lange 2025-01-22 13:50:26 +01:00
parent 1602eb8aa6
commit 56502a9122
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
accounts/abi/bind/v2/lib.go
View file

@ -17,6 +17,8 @@
package bind package bind
import ( import (
"errors"
"github.com/ethereum/go-ethereum" "github.com/ethereum/go-ethereum"
"github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/accounts/abi"
bind1 "github.com/ethereum/go-ethereum/accounts/abi/bind" bind1 "github.com/ethereum/go-ethereum/accounts/abi/bind"
@ -34,7 +36,7 @@ type ContractInstance struct {
abi abi.ABI abi abi.ABI
} }
func NewContractInstance(addr common.Address, backend ContractBackend, abi abi.ABI) ContractInstance { func NewContractInstance(backend ContractBackend, addr common.Address, abi abi.ABI) ContractInstance {
return ContractInstance{addr, backend, abi} return ContractInstance{addr, backend, abi}
} }
@ -169,8 +171,11 @@ func Transact(instance ContractInstance, opts *TransactOpts, input []byte) (*typ
return c.RawTransact(opts, input) return c.RawTransact(opts, input)
} }
// Call performs an eth_call on the given bound contract instance, using the // Call performs an eth_call on the given bound contract instance, using the provided
// provided abi-encoded input (or nil). // ABI-encoded input.
//
// To call a function that doesn't return any output, pass nil as the unpack function.
// This can be useful if you just want to check that the function doesn't revert.
func Call[T any](instance ContractInstance, opts *CallOpts, packedInput []byte, unpack func([]byte) (T, error)) (T, error) { func Call[T any](instance ContractInstance, opts *CallOpts, packedInput []byte, unpack func([]byte) (T, error)) (T, error) {
var defaultResult T var defaultResult T
backend := instance.Backend backend := instance.Backend
@ -179,6 +184,12 @@ func Call[T any](instance ContractInstance, opts *CallOpts, packedInput []byte,
if err != nil { if err != nil {
return defaultResult, err return defaultResult, err
} }
if unpack == nil {
if len(packedOutput) > 0 {
return defaultResult, errors.New("contract returned data, but no unpack function was given")
}
return defaultResult, nil
}
res, err := unpack(packedOutput) res, err := unpack(packedOutput)
if err != nil { if err != nil {
return defaultResult, err return defaultResult, err