aboutsummaryrefslogtreecommitdiffstats
path: root/accounts/abi
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-04-01 21:42:05 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-04-01 21:42:05 +0800
commitfb578f4550a08617485d9146876489d1f3bb1b52 (patch)
treef502b5ee41d1d8b5c2eb3908468c05f1d8b0d939 /accounts/abi
parent8b2aca96c598dda14f0cbc94e1c41b930c4ab822 (diff)
parent4097478884fb27db3f90e0997c12d8266eed9531 (diff)
downloadgo-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.tar
go-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.tar.gz
go-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.tar.bz2
go-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.tar.lz
go-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.tar.xz
go-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.tar.zst
go-tangerine-fb578f4550a08617485d9146876489d1f3bb1b52.zip
Merge pull request #2405 from karalabe/abigen-default-methods
accounts/abi/bind: surface raw wrappers to access low level ops
Diffstat (limited to 'accounts/abi')
-rw-r--r--accounts/abi/bind/base.go9
-rw-r--r--accounts/abi/bind/bind_test.go45
-rw-r--r--accounts/abi/bind/template.go53
3 files changed, 102 insertions, 5 deletions
diff --git a/accounts/abi/bind/base.go b/accounts/abi/bind/base.go
index 053b4ccc0..06621c5ad 100644
--- a/accounts/abi/bind/base.go
+++ b/accounts/abi/bind/base.go
@@ -108,8 +108,7 @@ func (c *BoundContract) Call(opts *CallOpts, result interface{}, method string,
return c.abi.Unpack(result, method, output)
}
-// Transact invokes the (paid) contract method with params as input values and
-// value as the fund transfer to the contract.
+// Transact invokes the (paid) contract method with params as input values.
func (c *BoundContract) Transact(opts *TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
// Otherwise pack up the parameters and invoke the contract
input, err := c.abi.Pack(method, params...)
@@ -119,6 +118,12 @@ func (c *BoundContract) Transact(opts *TransactOpts, method string, params ...in
return c.transact(opts, &c.address, input)
}
+// Transfer initiates a plain transaction to move funds to the contract, calling
+// its default method if one is available.
+func (c *BoundContract) Transfer(opts *TransactOpts) (*types.Transaction, error) {
+ return c.transact(opts, &c.address, nil)
+}
+
// transact executes an actual transaction invocation, first deriving any missing
// authorization fields, and then scheduling the transaction for execution.
func (c *BoundContract) transact(opts *TransactOpts, contract *common.Address, input []byte) (*types.Transaction, error) {
diff --git a/accounts/abi/bind/bind_test.go b/accounts/abi/bind/bind_test.go
index 37b8ef5a7..12c849669 100644
--- a/accounts/abi/bind/bind_test.go
+++ b/accounts/abi/bind/bind_test.go
@@ -201,9 +201,9 @@ var bindTests = []struct {
`Tupler`,
`
contract Tupler {
- function tuple() returns (string a, int b, bytes32 c) {
- return ("Hi", 1, sha3(""));
- }
+ function tuple() returns (string a, int b, bytes32 c) {
+ return ("Hi", 1, sha3(""));
+ }
}
`,
`606060405260dc8060106000396000f3606060405260e060020a60003504633175aae28114601a575b005b600060605260c0604052600260809081527f486900000000000000000000000000000000000000000000000000000000000060a05260017fc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a47060e0829052610100819052606060c0908152600261012081905281906101409060a09080838184600060046012f1505081517fffff000000000000000000000000000000000000000000000000000000000000169091525050604051610160819003945092505050f3`,
@@ -228,6 +228,45 @@ var bindTests = []struct {
}
`,
},
+ // Tests that anonymous default methods can be correctly invoked
+ {
+ `Defaulter`,
+ `
+ contract Defaulter {
+ address public caller;
+
+ function() {
+ caller = msg.sender;
+ }
+ }
+ `,
+ `6060604052606a8060106000396000f360606040523615601d5760e060020a6000350463fc9c8d3981146040575b605e6000805473ffffffffffffffffffffffffffffffffffffffff191633179055565b606060005473ffffffffffffffffffffffffffffffffffffffff1681565b005b6060908152602090f3`,
+ `[{"constant":true,"inputs":[],"name":"caller","outputs":[{"name":"","type":"address"}],"type":"function"}]`,
+ `
+ // Generate a new random account and a funded simulator
+ key := crypto.NewKey(rand.Reader)
+ sim := backends.NewSimulatedBackend(core.GenesisAccount{Address: key.Address, Balance: big.NewInt(10000000000)})
+
+ // Convert the tester key to an authorized transactor for ease of use
+ auth := bind.NewKeyedTransactor(key)
+
+ // Deploy a default method invoker contract and execute its default method
+ _, _, defaulter, err := DeployDefaulter(auth, sim)
+ if err != nil {
+ t.Fatalf("Failed to deploy defaulter contract: %v", err)
+ }
+ if _, err := (&DefaulterRaw{defaulter}).Transfer(auth); err != nil {
+ t.Fatalf("Failed to invoke default method: %v", err)
+ }
+ sim.Commit()
+
+ if caller, err := defaulter.Caller(nil); err != nil {
+ t.Fatalf("Failed to call address retriever: %v", err)
+ } else if (caller != key.Address) {
+ t.Fatalf("Address mismatch: have %v, want %v", caller, key.Address)
+ }
+ `,
+ },
}
// Tests that packages generated by the binder can be successfully compiled and
diff --git a/accounts/abi/bind/template.go b/accounts/abi/bind/template.go
index f1a10137c..36ac1d78d 100644
--- a/accounts/abi/bind/template.go
+++ b/accounts/abi/bind/template.go
@@ -110,6 +110,21 @@ package {{.Package}}
TransactOpts bind.TransactOpts // Transaction auth options to use throughout this session
}
+ // {{.Type}}Raw is an auto generated low-level Go binding around an Ethereum contract.
+ type {{.Type}}Raw struct {
+ Contract *{{.Type}} // Generic contract binding to access the raw methods on
+ }
+
+ // {{.Type}}CallerRaw is an auto generated low-level read-only Go binding around an Ethereum contract.
+ type {{.Type}}CallerRaw struct {
+ Contract *{{.Type}}Caller // Generic read-only contract binding to access the raw methods on
+ }
+
+ // {{.Type}}TransactorRaw is an auto generated low-level write-only Go binding around an Ethereum contract.
+ type {{.Type}}TransactorRaw struct {
+ Contract *{{.Type}}Transactor // Generic write-only contract binding to access the raw methods on
+ }
+
// New{{.Type}} creates a new instance of {{.Type}}, bound to a specific deployed contract.
func New{{.Type}}(address common.Address, backend bind.ContractBackend) (*{{.Type}}, error) {
contract, err := bind{{.Type}}(address, backend.(bind.ContractCaller), backend.(bind.ContractTransactor))
@@ -146,6 +161,44 @@ package {{.Package}}
return bind.NewBoundContract(address, parsed, caller, transactor), nil
}
+ // Call invokes the (constant) contract method with params as input values and
+ // sets the output to result. The result type might be a single field for simple
+ // returns, a slice of interfaces for anonymous returns and a struct for named
+ // returns.
+ func (_{{$contract.Type}} *{{$contract.Type}}Raw) Call(opts *bind.CallOpts, result interface{}, method string, params ...interface{}) error {
+ return _{{$contract.Type}}.Contract.{{$contract.Type}}Caller.contract.Call(opts, result, method, params...)
+ }
+
+ // Transfer initiates a plain transaction to move funds to the contract, calling
+ // its default method if one is available.
+ func (_{{$contract.Type}} *{{$contract.Type}}Raw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+ return _{{$contract.Type}}.Contract.{{$contract.Type}}Transactor.contract.Transfer(opts)
+ }
+
+ // Transact invokes the (paid) contract method with params as input values.
+ func (_{{$contract.Type}} *{{$contract.Type}}Raw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+ return _{{$contract.Type}}.Contract.{{$contract.Type}}Transactor.contract.Transact(opts, method, params...)
+ }
+
+ // Call invokes the (constant) contract method with params as input values and
+ // sets the output to result. The result type might be a single field for simple
+ // returns, a slice of interfaces for anonymous returns and a struct for named
+ // returns.
+ func (_{{$contract.Type}} *{{$contract.Type}}CallerRaw) Call(opts *bind.CallOpts, result interface{}, method string, params ...interface{}) error {
+ return _{{$contract.Type}}.Contract.contract.Call(opts, result, method, params...)
+ }
+
+ // Transfer initiates a plain transaction to move funds to the contract, calling
+ // its default method if one is available.
+ func (_{{$contract.Type}} *{{$contract.Type}}TransactorRaw) Transfer(opts *bind.TransactOpts) (*types.Transaction, error) {
+ return _{{$contract.Type}}.Contract.contract.Transfer(opts)
+ }
+
+ // Transact invokes the (paid) contract method with params as input values.
+ func (_{{$contract.Type}} *{{$contract.Type}}TransactorRaw) Transact(opts *bind.TransactOpts, method string, params ...interface{}) (*types.Transaction, error) {
+ return _{{$contract.Type}}.Contract.contract.Transact(opts, method, params...)
+ }
+
{{range .Calls}}
// {{.Normalized.Name}} is a free data retrieval call binding the contract method 0x{{printf "%x" .Original.Id}}.
//