From 5387d494005ce1f7644dd759e5b6d8fe735e92e7 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Mon, 27 Jan 2025 23:18:06 +0100 Subject: [PATCH] accounts/abi/bind/v2: rename GetAbi -> ParseABI --- accounts/abi/abigen/source2.go.tpl | 2 +- .../abi/abigen/testdata/v2/callbackparam.go.txt | 2 +- accounts/abi/abigen/testdata/v2/crowdsale.go.txt | 2 +- accounts/abi/abigen/testdata/v2/dao.go.txt | 2 +- .../abigen/testdata/v2/deeplynestedarray.go.txt | 2 +- accounts/abi/abigen/testdata/v2/empty.go.txt | 2 +- .../abi/abigen/testdata/v2/eventchecker.go.txt | 2 +- accounts/abi/abigen/testdata/v2/getter.go.txt | 2 +- .../testdata/v2/identifiercollision.go.txt | 2 +- .../abi/abigen/testdata/v2/inputchecker.go.txt | 2 +- .../abi/abigen/testdata/v2/interactor.go.txt | 2 +- .../abi/abigen/testdata/v2/nameconflict.go.txt | 2 +- .../abigen/testdata/v2/numericmethodname.go.txt | 2 +- .../abi/abigen/testdata/v2/outputchecker.go.txt | 2 +- accounts/abi/abigen/testdata/v2/overload.go.txt | 2 +- .../abi/abigen/testdata/v2/rangekeyword.go.txt | 2 +- accounts/abi/abigen/testdata/v2/slicer.go.txt | 2 +- accounts/abi/abigen/testdata/v2/structs.go.txt | 2 +- accounts/abi/abigen/testdata/v2/token.go.txt | 2 +- accounts/abi/abigen/testdata/v2/tuple.go.txt | 2 +- accounts/abi/abigen/testdata/v2/tupler.go.txt | 2 +- .../abi/abigen/testdata/v2/underscorer.go.txt | 2 +- accounts/abi/bind/old.go | 8 ++++++-- accounts/abi/bind/v2/base.go | 3 ++- .../bind/v2/internal/contracts/db/bindings.go | 2 +- .../v2/internal/contracts/events/bindings.go | 2 +- .../contracts/nested_libraries/bindings.go | 16 ++++++++-------- .../internal/contracts/solc_errors/bindings.go | 4 ++-- .../contracts/uint256arrayreturn/bindings.go | 2 +- 29 files changed, 43 insertions(+), 38 deletions(-) diff --git a/accounts/abi/abigen/source2.go.tpl b/accounts/abi/abigen/source2.go.tpl index c3431fbbad..83e09323fa 100644 --- a/accounts/abi/abigen/source2.go.tpl +++ b/accounts/abi/abigen/source2.go.tpl @@ -56,7 +56,7 @@ var ( // New{{.Type}} creates a new instance of {{.Type}}. func New{{.Type}}() *{{.Type}} { - parsed, err := {{.Type}}MetaData.GetAbi() + parsed, err := {{.Type}}MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/callbackparam.go.txt b/accounts/abi/abigen/testdata/v2/callbackparam.go.txt index 30dc5599ef..c43cec124e 100644 --- a/accounts/abi/abigen/testdata/v2/callbackparam.go.txt +++ b/accounts/abi/abigen/testdata/v2/callbackparam.go.txt @@ -36,7 +36,7 @@ type CallbackParam struct { // NewCallbackParam creates a new instance of CallbackParam. func NewCallbackParam() *CallbackParam { - parsed, err := CallbackParamMetaData.GetAbi() + parsed, err := CallbackParamMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/crowdsale.go.txt b/accounts/abi/abigen/testdata/v2/crowdsale.go.txt index c2409c1559..8b854da129 100644 --- a/accounts/abi/abigen/testdata/v2/crowdsale.go.txt +++ b/accounts/abi/abigen/testdata/v2/crowdsale.go.txt @@ -36,7 +36,7 @@ type Crowdsale struct { // NewCrowdsale creates a new instance of Crowdsale. func NewCrowdsale() *Crowdsale { - parsed, err := CrowdsaleMetaData.GetAbi() + parsed, err := CrowdsaleMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/dao.go.txt b/accounts/abi/abigen/testdata/v2/dao.go.txt index 50458c4e97..a2769e424b 100644 --- a/accounts/abi/abigen/testdata/v2/dao.go.txt +++ b/accounts/abi/abigen/testdata/v2/dao.go.txt @@ -36,7 +36,7 @@ type DAO struct { // NewDAO creates a new instance of DAO. func NewDAO() *DAO { - parsed, err := DAOMetaData.GetAbi() + parsed, err := DAOMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt b/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt index d0bb81f525..bbf3322653 100644 --- a/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt +++ b/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt @@ -36,7 +36,7 @@ type DeeplyNestedArray struct { // NewDeeplyNestedArray creates a new instance of DeeplyNestedArray. func NewDeeplyNestedArray() *DeeplyNestedArray { - parsed, err := DeeplyNestedArrayMetaData.GetAbi() + parsed, err := DeeplyNestedArrayMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/empty.go.txt b/accounts/abi/abigen/testdata/v2/empty.go.txt index 382936f9d5..e9b26f968c 100644 --- a/accounts/abi/abigen/testdata/v2/empty.go.txt +++ b/accounts/abi/abigen/testdata/v2/empty.go.txt @@ -36,7 +36,7 @@ type Empty struct { // NewEmpty creates a new instance of Empty. func NewEmpty() *Empty { - parsed, err := EmptyMetaData.GetAbi() + parsed, err := EmptyMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/eventchecker.go.txt b/accounts/abi/abigen/testdata/v2/eventchecker.go.txt index e78e86ced8..8ce495bb34 100644 --- a/accounts/abi/abigen/testdata/v2/eventchecker.go.txt +++ b/accounts/abi/abigen/testdata/v2/eventchecker.go.txt @@ -35,7 +35,7 @@ type EventChecker struct { // NewEventChecker creates a new instance of EventChecker. func NewEventChecker() *EventChecker { - parsed, err := EventCheckerMetaData.GetAbi() + parsed, err := EventCheckerMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/getter.go.txt b/accounts/abi/abigen/testdata/v2/getter.go.txt index 2e52057e69..1c015ab5e5 100644 --- a/accounts/abi/abigen/testdata/v2/getter.go.txt +++ b/accounts/abi/abigen/testdata/v2/getter.go.txt @@ -36,7 +36,7 @@ type Getter struct { // NewGetter creates a new instance of Getter. func NewGetter() *Getter { - parsed, err := GetterMetaData.GetAbi() + parsed, err := GetterMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt b/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt index 2db6b91a4f..2a73ae1df4 100644 --- a/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt +++ b/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt @@ -36,7 +36,7 @@ type IdentifierCollision struct { // NewIdentifierCollision creates a new instance of IdentifierCollision. func NewIdentifierCollision() *IdentifierCollision { - parsed, err := IdentifierCollisionMetaData.GetAbi() + parsed, err := IdentifierCollisionMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/inputchecker.go.txt b/accounts/abi/abigen/testdata/v2/inputchecker.go.txt index 2b5acc1dea..3489ad74ff 100644 --- a/accounts/abi/abigen/testdata/v2/inputchecker.go.txt +++ b/accounts/abi/abigen/testdata/v2/inputchecker.go.txt @@ -35,7 +35,7 @@ type InputChecker struct { // NewInputChecker creates a new instance of InputChecker. func NewInputChecker() *InputChecker { - parsed, err := InputCheckerMetaData.GetAbi() + parsed, err := InputCheckerMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/interactor.go.txt b/accounts/abi/abigen/testdata/v2/interactor.go.txt index f1948a8f19..8ac7d1fcfb 100644 --- a/accounts/abi/abigen/testdata/v2/interactor.go.txt +++ b/accounts/abi/abigen/testdata/v2/interactor.go.txt @@ -36,7 +36,7 @@ type Interactor struct { // NewInteractor creates a new instance of Interactor. func NewInteractor() *Interactor { - parsed, err := InteractorMetaData.GetAbi() + parsed, err := InteractorMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/nameconflict.go.txt b/accounts/abi/abigen/testdata/v2/nameconflict.go.txt index b7f9494d54..d3fac35150 100644 --- a/accounts/abi/abigen/testdata/v2/nameconflict.go.txt +++ b/accounts/abi/abigen/testdata/v2/nameconflict.go.txt @@ -42,7 +42,7 @@ type NameConflict struct { // NewNameConflict creates a new instance of NameConflict. func NewNameConflict() *NameConflict { - parsed, err := NameConflictMetaData.GetAbi() + parsed, err := NameConflictMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt b/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt index e9db3bb7ff..de870ef3e2 100644 --- a/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt +++ b/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt @@ -36,7 +36,7 @@ type NumericMethodName struct { // NewNumericMethodName creates a new instance of NumericMethodName. func NewNumericMethodName() *NumericMethodName { - parsed, err := NumericMethodNameMetaData.GetAbi() + parsed, err := NumericMethodNameMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/outputchecker.go.txt b/accounts/abi/abigen/testdata/v2/outputchecker.go.txt index ee5100bbbf..f0ee0196ae 100644 --- a/accounts/abi/abigen/testdata/v2/outputchecker.go.txt +++ b/accounts/abi/abigen/testdata/v2/outputchecker.go.txt @@ -35,7 +35,7 @@ type OutputChecker struct { // NewOutputChecker creates a new instance of OutputChecker. func NewOutputChecker() *OutputChecker { - parsed, err := OutputCheckerMetaData.GetAbi() + parsed, err := OutputCheckerMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/overload.go.txt b/accounts/abi/abigen/testdata/v2/overload.go.txt index 6e41dd0ce0..97c3a18820 100644 --- a/accounts/abi/abigen/testdata/v2/overload.go.txt +++ b/accounts/abi/abigen/testdata/v2/overload.go.txt @@ -36,7 +36,7 @@ type Overload struct { // NewOverload creates a new instance of Overload. func NewOverload() *Overload { - parsed, err := OverloadMetaData.GetAbi() + parsed, err := OverloadMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt b/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt index 100f7f5397..cc78246a89 100644 --- a/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt +++ b/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt @@ -36,7 +36,7 @@ type RangeKeyword struct { // NewRangeKeyword creates a new instance of RangeKeyword. func NewRangeKeyword() *RangeKeyword { - parsed, err := RangeKeywordMetaData.GetAbi() + parsed, err := RangeKeywordMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/slicer.go.txt b/accounts/abi/abigen/testdata/v2/slicer.go.txt index 0f53fc9e2d..a91849bfb7 100644 --- a/accounts/abi/abigen/testdata/v2/slicer.go.txt +++ b/accounts/abi/abigen/testdata/v2/slicer.go.txt @@ -36,7 +36,7 @@ type Slicer struct { // NewSlicer creates a new instance of Slicer. func NewSlicer() *Slicer { - parsed, err := SlicerMetaData.GetAbi() + parsed, err := SlicerMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/structs.go.txt b/accounts/abi/abigen/testdata/v2/structs.go.txt index 7264568c21..dcece8a39f 100644 --- a/accounts/abi/abigen/testdata/v2/structs.go.txt +++ b/accounts/abi/abigen/testdata/v2/structs.go.txt @@ -41,7 +41,7 @@ type Structs struct { // NewStructs creates a new instance of Structs. func NewStructs() *Structs { - parsed, err := StructsMetaData.GetAbi() + parsed, err := StructsMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/token.go.txt b/accounts/abi/abigen/testdata/v2/token.go.txt index 13138df35d..dd396604eb 100644 --- a/accounts/abi/abigen/testdata/v2/token.go.txt +++ b/accounts/abi/abigen/testdata/v2/token.go.txt @@ -36,7 +36,7 @@ type Token struct { // NewToken creates a new instance of Token. func NewToken() *Token { - parsed, err := TokenMetaData.GetAbi() + parsed, err := TokenMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/tuple.go.txt b/accounts/abi/abigen/testdata/v2/tuple.go.txt index e026a17593..2ceb606775 100644 --- a/accounts/abi/abigen/testdata/v2/tuple.go.txt +++ b/accounts/abi/abigen/testdata/v2/tuple.go.txt @@ -61,7 +61,7 @@ type Tuple struct { // NewTuple creates a new instance of Tuple. func NewTuple() *Tuple { - parsed, err := TupleMetaData.GetAbi() + parsed, err := TupleMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/tupler.go.txt b/accounts/abi/abigen/testdata/v2/tupler.go.txt index 1a8cdc5816..daef15fd77 100644 --- a/accounts/abi/abigen/testdata/v2/tupler.go.txt +++ b/accounts/abi/abigen/testdata/v2/tupler.go.txt @@ -36,7 +36,7 @@ type Tupler struct { // NewTupler creates a new instance of Tupler. func NewTupler() *Tupler { - parsed, err := TuplerMetaData.GetAbi() + parsed, err := TuplerMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/abigen/testdata/v2/underscorer.go.txt b/accounts/abi/abigen/testdata/v2/underscorer.go.txt index cdaef62923..66b4284a51 100644 --- a/accounts/abi/abigen/testdata/v2/underscorer.go.txt +++ b/accounts/abi/abigen/testdata/v2/underscorer.go.txt @@ -36,7 +36,7 @@ type Underscorer struct { // NewUnderscorer creates a new instance of Underscorer. func NewUnderscorer() *Underscorer { - parsed, err := UnderscorerMetaData.GetAbi() + parsed, err := UnderscorerMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/bind/old.go b/accounts/abi/bind/old.go index f67a260ca9..5f41aee70f 100644 --- a/accounts/abi/bind/old.go +++ b/accounts/abi/bind/old.go @@ -218,8 +218,6 @@ type FilterOpts = bind2.FilterOpts type WatchOpts = bind2.WatchOpts -type MetaData = bind2.MetaData - type BoundContract = bind2.BoundContract func NewBoundContract(address common.Address, abi abi.ABI, caller ContractCaller, transactor ContractTransactor, filterer ContractFilterer) *BoundContract { @@ -230,6 +228,12 @@ func DeployContract(opts *TransactOpts, abi abi.ABI, bytecode []byte, backend Co return bind2.DeployContract(opts, abi, bytecode, backend, params...) } +type MetaData bind2.MetaData + +func (m *MetaData) GetAbi() (*abi.ABI, error) { + return (*bind2.MetaData)(m).ParseABI() +} + // util.go // WaitMined waits for tx to be mined on the blockchain. diff --git a/accounts/abi/bind/v2/base.go b/accounts/abi/bind/v2/base.go index 7f67e0815b..518e67e539 100644 --- a/accounts/abi/bind/v2/base.go +++ b/accounts/abi/bind/v2/base.go @@ -99,7 +99,8 @@ type MetaData struct { parsedABI *abi.ABI } -func (m *MetaData) GetAbi() (*abi.ABI, error) { +// ParseABI returns the parsed ABI specification. +func (m *MetaData) ParseABI() (*abi.ABI, error) { m.mu.Lock() defer m.mu.Unlock() if m.parsedABI != nil { diff --git a/accounts/abi/bind/v2/internal/contracts/db/bindings.go b/accounts/abi/bind/v2/internal/contracts/db/bindings.go index 11c4790aad..2980dbf2da 100644 --- a/accounts/abi/bind/v2/internal/contracts/db/bindings.go +++ b/accounts/abi/bind/v2/internal/contracts/db/bindings.go @@ -43,7 +43,7 @@ type DB struct { // NewDB creates a new instance of DB. func NewDB() *DB { - parsed, err := DBMetaData.GetAbi() + parsed, err := DBMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/bind/v2/internal/contracts/events/bindings.go b/accounts/abi/bind/v2/internal/contracts/events/bindings.go index 01191b45a0..73e28168a2 100644 --- a/accounts/abi/bind/v2/internal/contracts/events/bindings.go +++ b/accounts/abi/bind/v2/internal/contracts/events/bindings.go @@ -42,7 +42,7 @@ type C struct { // NewC creates a new instance of C. func NewC() *C { - parsed, err := CMetaData.GetAbi() + parsed, err := CMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/bind/v2/internal/contracts/nested_libraries/bindings.go b/accounts/abi/bind/v2/internal/contracts/nested_libraries/bindings.go index 4394857f87..62c30e69e0 100644 --- a/accounts/abi/bind/v2/internal/contracts/nested_libraries/bindings.go +++ b/accounts/abi/bind/v2/internal/contracts/nested_libraries/bindings.go @@ -40,7 +40,7 @@ type C1 struct { // NewC1 creates a new instance of C1. func NewC1() *C1 { - parsed, err := C1MetaData.GetAbi() + parsed, err := C1MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -103,7 +103,7 @@ type C2 struct { // NewC2 creates a new instance of C2. func NewC2() *C2 { - parsed, err := C2MetaData.GetAbi() + parsed, err := C2MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -162,7 +162,7 @@ type L1 struct { // NewL1 creates a new instance of L1. func NewL1() *L1 { - parsed, err := L1MetaData.GetAbi() + parsed, err := L1MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -216,7 +216,7 @@ type L2 struct { // NewL2 creates a new instance of L2. func NewL2() *L2 { - parsed, err := L2MetaData.GetAbi() + parsed, err := L2MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -270,7 +270,7 @@ type L2b struct { // NewL2b creates a new instance of L2b. func NewL2b() *L2b { - parsed, err := L2bMetaData.GetAbi() + parsed, err := L2bMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -321,7 +321,7 @@ type L3 struct { // NewL3 creates a new instance of L3. func NewL3() *L3 { - parsed, err := L3MetaData.GetAbi() + parsed, err := L3MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -376,7 +376,7 @@ type L4 struct { // NewL4 creates a new instance of L4. func NewL4() *L4 { - parsed, err := L4MetaData.GetAbi() + parsed, err := L4MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -430,7 +430,7 @@ type L4b struct { // NewL4b creates a new instance of L4b. func NewL4b() *L4b { - parsed, err := L4bMetaData.GetAbi() + parsed, err := L4bMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/bind/v2/internal/contracts/solc_errors/bindings.go b/accounts/abi/bind/v2/internal/contracts/solc_errors/bindings.go index 4dfd195099..4fc138ae60 100644 --- a/accounts/abi/bind/v2/internal/contracts/solc_errors/bindings.go +++ b/accounts/abi/bind/v2/internal/contracts/solc_errors/bindings.go @@ -36,7 +36,7 @@ type C struct { // NewC creates a new instance of C. func NewC() *C { - parsed, err := CMetaData.GetAbi() + parsed, err := CMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } @@ -142,7 +142,7 @@ type C2 struct { // NewC2 creates a new instance of C2. func NewC2() *C2 { - parsed, err := C2MetaData.GetAbi() + parsed, err := C2MetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) } diff --git a/accounts/abi/bind/v2/internal/contracts/uint256arrayreturn/bindings.go b/accounts/abi/bind/v2/internal/contracts/uint256arrayreturn/bindings.go index 2586a406f5..badd8133af 100644 --- a/accounts/abi/bind/v2/internal/contracts/uint256arrayreturn/bindings.go +++ b/accounts/abi/bind/v2/internal/contracts/uint256arrayreturn/bindings.go @@ -36,7 +36,7 @@ type MyContract struct { // NewMyContract creates a new instance of MyContract. func NewMyContract() *MyContract { - parsed, err := MyContractMetaData.GetAbi() + parsed, err := MyContractMetaData.ParseABI() if err != nil { panic(errors.New("invalid ABI: " + err.Error())) }