From f937417fd817021f3e10a9e6744e094c690d83c8 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Mon, 27 Jan 2025 23:56:30 +0100 Subject: [PATCH] accounts/abi/abigen: change for removal of ContractInstance --- accounts/abi/abigen/source2.go.tpl | 2 +- accounts/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 +- accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt | 2 +- accounts/abi/abigen/testdata/v2/empty.go.txt | 2 +- accounts/abi/abigen/testdata/v2/eventchecker.go.txt | 2 +- accounts/abi/abigen/testdata/v2/getter.go.txt | 2 +- accounts/abi/abigen/testdata/v2/identifiercollision.go.txt | 2 +- accounts/abi/abigen/testdata/v2/inputchecker.go.txt | 2 +- accounts/abi/abigen/testdata/v2/interactor.go.txt | 2 +- accounts/abi/abigen/testdata/v2/nameconflict.go.txt | 2 +- accounts/abi/abigen/testdata/v2/numericmethodname.go.txt | 2 +- accounts/abi/abigen/testdata/v2/outputchecker.go.txt | 2 +- accounts/abi/abigen/testdata/v2/overload.go.txt | 2 +- accounts/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 +- accounts/abi/abigen/testdata/v2/underscorer.go.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/accounts/abi/abigen/source2.go.tpl b/accounts/abi/abigen/source2.go.tpl index 83e09323fa..e61ed78a1d 100644 --- a/accounts/abi/abigen/source2.go.tpl +++ b/accounts/abi/abigen/source2.go.tpl @@ -65,7 +65,7 @@ var ( // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. - func (c *{{.Type}}) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { + func (c *{{.Type}}) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/callbackparam.go.txt b/accounts/abi/abigen/testdata/v2/callbackparam.go.txt index c43cec124e..88b3035542 100644 --- a/accounts/abi/abigen/testdata/v2/callbackparam.go.txt +++ b/accounts/abi/abigen/testdata/v2/callbackparam.go.txt @@ -45,7 +45,7 @@ func NewCallbackParam() *CallbackParam { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *CallbackParam) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *CallbackParam) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/crowdsale.go.txt b/accounts/abi/abigen/testdata/v2/crowdsale.go.txt index 8b854da129..d9a5245c43 100644 --- a/accounts/abi/abigen/testdata/v2/crowdsale.go.txt +++ b/accounts/abi/abigen/testdata/v2/crowdsale.go.txt @@ -45,7 +45,7 @@ func NewCrowdsale() *Crowdsale { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Crowdsale) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Crowdsale) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/dao.go.txt b/accounts/abi/abigen/testdata/v2/dao.go.txt index a2769e424b..3cb49b1445 100644 --- a/accounts/abi/abigen/testdata/v2/dao.go.txt +++ b/accounts/abi/abigen/testdata/v2/dao.go.txt @@ -45,7 +45,7 @@ func NewDAO() *DAO { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *DAO) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *DAO) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt b/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt index bbf3322653..9347ccb0c2 100644 --- a/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt +++ b/accounts/abi/abigen/testdata/v2/deeplynestedarray.go.txt @@ -45,7 +45,7 @@ func NewDeeplyNestedArray() *DeeplyNestedArray { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *DeeplyNestedArray) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *DeeplyNestedArray) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/empty.go.txt b/accounts/abi/abigen/testdata/v2/empty.go.txt index e9b26f968c..8767bc32ed 100644 --- a/accounts/abi/abigen/testdata/v2/empty.go.txt +++ b/accounts/abi/abigen/testdata/v2/empty.go.txt @@ -45,6 +45,6 @@ func NewEmpty() *Empty { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Empty) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Empty) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/eventchecker.go.txt b/accounts/abi/abigen/testdata/v2/eventchecker.go.txt index 8ce495bb34..29b8bf03ea 100644 --- a/accounts/abi/abigen/testdata/v2/eventchecker.go.txt +++ b/accounts/abi/abigen/testdata/v2/eventchecker.go.txt @@ -44,7 +44,7 @@ func NewEventChecker() *EventChecker { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *EventChecker) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *EventChecker) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/getter.go.txt b/accounts/abi/abigen/testdata/v2/getter.go.txt index 1c015ab5e5..124bac60fe 100644 --- a/accounts/abi/abigen/testdata/v2/getter.go.txt +++ b/accounts/abi/abigen/testdata/v2/getter.go.txt @@ -45,7 +45,7 @@ func NewGetter() *Getter { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Getter) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Getter) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt b/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt index 2a73ae1df4..d291a10e00 100644 --- a/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt +++ b/accounts/abi/abigen/testdata/v2/identifiercollision.go.txt @@ -45,7 +45,7 @@ func NewIdentifierCollision() *IdentifierCollision { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *IdentifierCollision) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *IdentifierCollision) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/inputchecker.go.txt b/accounts/abi/abigen/testdata/v2/inputchecker.go.txt index 3489ad74ff..5ae6781d7c 100644 --- a/accounts/abi/abigen/testdata/v2/inputchecker.go.txt +++ b/accounts/abi/abigen/testdata/v2/inputchecker.go.txt @@ -44,7 +44,7 @@ func NewInputChecker() *InputChecker { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *InputChecker) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *InputChecker) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/interactor.go.txt b/accounts/abi/abigen/testdata/v2/interactor.go.txt index 8ac7d1fcfb..0f59ae93f9 100644 --- a/accounts/abi/abigen/testdata/v2/interactor.go.txt +++ b/accounts/abi/abigen/testdata/v2/interactor.go.txt @@ -45,7 +45,7 @@ func NewInteractor() *Interactor { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Interactor) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Interactor) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/nameconflict.go.txt b/accounts/abi/abigen/testdata/v2/nameconflict.go.txt index d3fac35150..5207fdd45c 100644 --- a/accounts/abi/abigen/testdata/v2/nameconflict.go.txt +++ b/accounts/abi/abigen/testdata/v2/nameconflict.go.txt @@ -51,7 +51,7 @@ func NewNameConflict() *NameConflict { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *NameConflict) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *NameConflict) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt b/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt index de870ef3e2..19306af3b7 100644 --- a/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt +++ b/accounts/abi/abigen/testdata/v2/numericmethodname.go.txt @@ -45,7 +45,7 @@ func NewNumericMethodName() *NumericMethodName { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *NumericMethodName) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *NumericMethodName) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/outputchecker.go.txt b/accounts/abi/abigen/testdata/v2/outputchecker.go.txt index f0ee0196ae..49e64d8aaa 100644 --- a/accounts/abi/abigen/testdata/v2/outputchecker.go.txt +++ b/accounts/abi/abigen/testdata/v2/outputchecker.go.txt @@ -44,7 +44,7 @@ func NewOutputChecker() *OutputChecker { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *OutputChecker) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *OutputChecker) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/overload.go.txt b/accounts/abi/abigen/testdata/v2/overload.go.txt index 97c3a18820..449e9a74d0 100644 --- a/accounts/abi/abigen/testdata/v2/overload.go.txt +++ b/accounts/abi/abigen/testdata/v2/overload.go.txt @@ -45,7 +45,7 @@ func NewOverload() *Overload { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Overload) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Overload) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt b/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt index cc78246a89..effdecb1a8 100644 --- a/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt +++ b/accounts/abi/abigen/testdata/v2/rangekeyword.go.txt @@ -45,7 +45,7 @@ func NewRangeKeyword() *RangeKeyword { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *RangeKeyword) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *RangeKeyword) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/slicer.go.txt b/accounts/abi/abigen/testdata/v2/slicer.go.txt index a91849bfb7..f99c25586f 100644 --- a/accounts/abi/abigen/testdata/v2/slicer.go.txt +++ b/accounts/abi/abigen/testdata/v2/slicer.go.txt @@ -45,7 +45,7 @@ func NewSlicer() *Slicer { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Slicer) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Slicer) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/structs.go.txt b/accounts/abi/abigen/testdata/v2/structs.go.txt index dcece8a39f..61adaaaef3 100644 --- a/accounts/abi/abigen/testdata/v2/structs.go.txt +++ b/accounts/abi/abigen/testdata/v2/structs.go.txt @@ -50,7 +50,7 @@ func NewStructs() *Structs { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Structs) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/token.go.txt b/accounts/abi/abigen/testdata/v2/token.go.txt index dd396604eb..8c7f998334 100644 --- a/accounts/abi/abigen/testdata/v2/token.go.txt +++ b/accounts/abi/abigen/testdata/v2/token.go.txt @@ -45,7 +45,7 @@ func NewToken() *Token { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Token) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Token) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/tuple.go.txt b/accounts/abi/abigen/testdata/v2/tuple.go.txt index 2ceb606775..c5459e915b 100644 --- a/accounts/abi/abigen/testdata/v2/tuple.go.txt +++ b/accounts/abi/abigen/testdata/v2/tuple.go.txt @@ -70,7 +70,7 @@ func NewTuple() *Tuple { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Tuple) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Tuple) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/tupler.go.txt b/accounts/abi/abigen/testdata/v2/tupler.go.txt index daef15fd77..fa0a209ea1 100644 --- a/accounts/abi/abigen/testdata/v2/tupler.go.txt +++ b/accounts/abi/abigen/testdata/v2/tupler.go.txt @@ -45,7 +45,7 @@ func NewTupler() *Tupler { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Tupler) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Tupler) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) } diff --git a/accounts/abi/abigen/testdata/v2/underscorer.go.txt b/accounts/abi/abigen/testdata/v2/underscorer.go.txt index 66b4284a51..8e697a90a5 100644 --- a/accounts/abi/abigen/testdata/v2/underscorer.go.txt +++ b/accounts/abi/abigen/testdata/v2/underscorer.go.txt @@ -45,7 +45,7 @@ func NewUnderscorer() *Underscorer { // Instance creates a wrapper for a deployed contract instance at the given address. // Use this to create the instance object passed to abigen v2 library functions Call, Transact, etc. -func (c *Underscorer) Instance(backend bind.ContractBackend, addr common.Address) bind.ContractInstance { +func (c *Underscorer) Instance(backend bind.ContractBackend, addr common.Address) *bind.BoundContract { return bind.NewContractInstance(backend, addr, c.abi) }