diff options
| author | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-29 22:22:55 +0800 |
|---|---|---|
| committer | Marek Kotewicz <marek.kotewicz@gmail.com> | 2015-01-29 22:22:55 +0800 |
| commit | 94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123 (patch) | |
| tree | df0b2e41f5dc9e50b99fa45d597199fd71201678 /example | |
| parent | e1c0862658ca80d2a4a85bd15eab38b0482fee1b (diff) | |
| parent | 8613382869503c6123c3f47772bfdb192f6d3c76 (diff) | |
| download | go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.gz go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.bz2 go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.lz go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.xz go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.tar.zst go-tangerine-94e0e5ab7d8ec9adcd03fedc3abe5cf6444a5123.zip | |
Merge branch 'cpp' into cpp2
Conflicts:
example/balance.html
Diffstat (limited to 'example')
| -rw-r--r-- | example/contract.html | 1 | ||||
| -rw-r--r-- | example/event.html | 67 | ||||
| -rw-r--r-- | example/natspec_contract.html | 1 |
3 files changed, 69 insertions, 0 deletions
diff --git a/example/contract.html b/example/contract.html index dccd1a64f..a534f68d8 100644 --- a/example/contract.html +++ b/example/contract.html @@ -20,6 +20,7 @@ // contract description, this will be autogenerated somehow var desc = [{ "name": "multiply(uint256)", + "type": "function", "inputs": [ { "name": "a", diff --git a/example/event.html b/example/event.html new file mode 100644 index 000000000..8191dfd8f --- /dev/null +++ b/example/event.html @@ -0,0 +1,67 @@ +<!doctype> +<html> + <head> + <script type="text/javascript" src="js/bignumber.js/bignumber.min.js"></script> + <script type="text/javascript" src="../dist/ethereum.js"></script> + <script type="text/javascript"> + var web3 = require('web3'); + web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080')); + + var desc = [{ + "type":"event", + "inputs": [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}], + "name":"Event" + }, { + "type":"event", + "inputs": [{"name":"a","type":"uint256","indexed":true},{"name":"b","type":"hash256","indexed":false}], + "name":"Event2" + }, { + "type":"function", + "inputs": [{"name":"a","type":"uint256"}], + "name":"foo", + "outputs": [] + }]; + + var address = '0x01'; + + var contract = web3.eth.contract(address, desc); + + function test1() { + web3.eth.watch(contract).changed(function (res) { + + }); + }; + + function test2() { + web3.eth.watch(contract.Event).changed(function (res) { + + }); + }; + + function test3() { + contract.Event().changed(function (res) { + + }); + }; + + // not valid + // function test4() { + // web3.eth.watch([contract.Event, contract.Event2]).changed(function (res) { + // }); + // }; + + </script> + </head> + + <body> + <div> + <button type="button" onClick="test1();">test1</button> + </div> + <div> + <button type="button" onClick="test2();">test2</button> + </div> + <div> + <button type="button" onClick="test3();">test3</button> + </div> + </body> +</html> diff --git a/example/natspec_contract.html b/example/natspec_contract.html index 40561a27c..212e582dc 100644 --- a/example/natspec_contract.html +++ b/example/natspec_contract.html @@ -21,6 +21,7 @@ // contract description, this will be autogenerated somehow var desc = [{ "name": "multiply(uint256)", + "type": "function", "inputs": [ { "name": "a", |