7 x = + + + + diff --git a/cmd/mist/assets/examples/balance.html b/cmd/mist/assets/examples/balance.html new file mode 100644 index 000000000..bc483a879 --- /dev/null +++ b/cmd/mist/assets/examples/balance.html @@ -0,0 +1,40 @@ + + + + + + + + + +

coinbase balance

+ +

+ + + + diff --git a/cmd/mist/assets/examples/test.html b/cmd/mist/assets/examples/test.html deleted file mode 100644 index cfc010971..000000000 --- a/cmd/mist/assets/examples/test.html +++ /dev/null @@ -1,44 +0,0 @@ - - - -Hello world - - - - - - -

- - - -- cgit v1.2.3 From 0031f388ac1f6f4a23c5c75e5eeb4a007f0b2f31 Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 29 Jan 2015 20:39:26 +0100 Subject: More dapp samples * Info DApp, coin DApp * Additional rpc methods --- cmd/mist/assets/examples/coin.html | 89 ++++++++++++++++++++++++++++++++++++++ cmd/mist/assets/examples/info.html | 72 ++++++++++++++++++++++++++++++ 2 files changed, 161 insertions(+) create mode 100644 cmd/mist/assets/examples/coin.html create mode 100644 cmd/mist/assets/examples/info.html (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html new file mode 100644 index 000000000..297d7e042 --- /dev/null +++ b/cmd/mist/assets/examples/coin.html @@ -0,0 +1,89 @@ + + + + + + + + + +

JevCoin

+ Balance + +

+ +

+ Amount: + + + +

+ + +

+ + + + + + + diff --git a/cmd/mist/assets/examples/info.html b/cmd/mist/assets/examples/info.html new file mode 100644 index 000000000..c4df8ea64 --- /dev/null +++ b/cmd/mist/assets/examples/info.html @@ -0,0 +1,72 @@ + + + + + + + + + +

Info

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +

Block number
Peer count
Default block
Accounts
Gas price
Mining
Listening
Coinbase

+ + + + + + -- cgit v1.2.3 From 9022f5034f952405d02f89c905104c80f0c13b8f Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 29 Jan 2015 23:17:43 +0100 Subject: default values removed --- cmd/mist/assets/examples/coin.html | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index 297d7e042..93edfd6f6 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -53,12 +53,17 @@ "outputs": [] }]; - var code = "0x60056011565b60ae8060356000396000f35b64174876e800600033600160a060020a031660005260205260406000208190555056006001600060e060020a600035048063d0679d34146022578063e3d670d714603457005b602e6004356024356047565b60006000f35b603d600435608d565b8060005260206000f35b80600083600160a060020a0316600052602052604060002090815401908190555080600033600160a060020a031660005260205260406000209081540390819055505050565b6000600082600160a060020a0316600052602052604060002054905091905056"; - var address = web3.eth.transact({ - data: code, - gasprice: "1000000000000000", - gas: "10000", - }); + var address = web3.db.get("jevcoin", "address"); + if( address.length == 0 ) { + var code = "0x60056011565b60ae8060356000396000f35b64174876e800600033600160a060020a031660005260205260406000208190555056006001600060e060020a600035048063d0679d34146022578063e3d670d714603457005b602e6004356024356047565b60006000f35b603d600435608d565b8060005260206000f35b80600083600160a060020a0316600052602052604060002090815401908190555080600033600160a060020a031660005260205260406000209081540390819055505050565b6000600082600160a060020a0316600052602052604060002054905091905056"; + address = web3.eth.transact({ + data: code, + gasprice: "1000000000000000", + gas: "10000", + }); + web3.db.put("jevcoin", "address", address); + } + var contract = web3.eth.contract(address, desc); document.querySelector("#balance").innerHTML = contract.call().balance(eth.coinbase); @@ -73,13 +78,16 @@ } function transact() { - //var to = "0x"+document.querySelector("#address").value; - var to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3"; - console.log("to "+to); + var to = document.querySelector("#address").value; + if( to.length == 0 ) { + to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3"; + } else { + to = "0x"+to; + } + var value = parseInt( document.querySelector("#amount").value ); - console.log("value "+value); - contract.transact({gas: "10000", gasPrice: "1000000000000"}).send( to, value ); + contract.transact({gas: "10000", gasprice: eth.gasPrice}).send( to, value ); } reflesh(); -- cgit v1.2.3 From 54927dc0e0b99009f92fbb7b28d71ae20179ce1e Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 29 Jan 2015 23:58:43 +0100 Subject: Fixed issue with Storage() * Storage() returned encoded values. They are now decode prior to hexing * Removed old code from state object * Updated coin --- cmd/mist/assets/examples/coin.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index 93edfd6f6..572f6959d 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -65,9 +65,10 @@ } var contract = web3.eth.contract(address, desc); - document.querySelector("#balance").innerHTML = contract.call().balance(eth.coinbase); function reflesh() { + document.querySelector("#balance").innerHTML = contract.call().balance(eth.coinbase); + var table = document.querySelector("#table"); table.innerHTML = ""; // clear -- cgit v1.2.3 From c03d403437c20584bcbf3cf3fa9d79ac7a0a8ca7 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 30 Jan 2015 13:25:12 +0100 Subject: Added whisper interface for xeth, added examples, updated RPC * Added RPC methods for whisper * Added whisper example --- cmd/mist/assets/examples/coin.html | 2 +- cmd/mist/assets/examples/whisper.html | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 cmd/mist/assets/examples/whisper.html (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index 572f6959d..edeabe5e8 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -1,6 +1,6 @@ - +JevCoin diff --git a/cmd/mist/assets/examples/whisper.html b/cmd/mist/assets/examples/whisper.html new file mode 100644 index 000000000..51d7004de --- /dev/null +++ b/cmd/mist/assets/examples/whisper.html @@ -0,0 +1,42 @@ + + +Whisper test + + + + + + +

Whisper test

+ + + + + + + + +

+ + + + + + + -- cgit v1.2.3 From af927ffdaf0c2c31047d22ab4a3163a4ef9d2342 Mon Sep 17 00:00:00 2001 From: obscuren Date: Fri, 30 Jan 2015 13:47:18 +0100 Subject: Added whisper messages * have identity & get messages --- cmd/mist/assets/examples/whisper.html | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/whisper.html b/cmd/mist/assets/examples/whisper.html index 51d7004de..6a7143eef 100644 --- a/cmd/mist/assets/examples/whisper.html +++ b/cmd/mist/assets/examples/whisper.html @@ -12,10 +12,20 @@ + + + + + + + + + +

Count
ID
Has identity

@@ -27,13 +37,21 @@ var id = shh.newIdentity(); document.querySelector("#id").innerHTML = id; + document.querySelector("#known").innerHTML = shh.haveIdentity(id); - shh.watch({topics: ["test"]}).arrived(function(message) { + var watch = shh.watch({topics: ["test"]}) + watch.arrived(function(message) { document.querySelector("#table").innerHTML += ""+JSON.stringify(message)+""; }); function test() { - shh.post({topics: ["test"], payload: web3.fromAscii("test it")}) + shh.post({topics: ["test"], payload: web3.fromAscii("test it")}); + count(); + + } + + function count() { + document.querySelector("#count").innerHTML = watch.messages().length; } -- cgit v1.2.3 From 7bd2fbe2b1445c26190008d21ad52dc5c364765c Mon Sep 17 00:00:00 2001 From: obscuren Date: Tue, 3 Feb 2015 07:16:05 -0800 Subject: Fixed whisper "to" filtering. Closes #283 --- cmd/mist/assets/examples/whisper.html | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/whisper.html b/cmd/mist/assets/examples/whisper.html index 6a7143eef..ad568f783 100644 --- a/cmd/mist/assets/examples/whisper.html +++ b/cmd/mist/assets/examples/whisper.html @@ -10,6 +10,7 @@

Whisper test

+ @@ -44,10 +45,19 @@ document.querySelector("#table").innerHTML += ""; }); + var selfWatch = shh.watch({to: id, topics: ["test"]}) + selfWatch.arrived(function(message) { + document.querySelector("#table").innerHTML += ""; + }); + function test() { shh.post({topics: ["test"], payload: web3.fromAscii("test it")}); count(); + } + function test2() { + shh.post({to: id, topics: ["test"], payload: web3.fromAscii("Private")}); + count(); } function count() { -- cgit v1.2.3 From 65158d39b0632226c168b9a3415365ca8f072cbf Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 4 Feb 2015 15:05:47 -0800 Subject: Filtering --- cmd/mist/assets/examples/abi.html | 2 +- cmd/mist/assets/examples/coin.html | 22 +++++++++++++++++----- cmd/mist/assets/examples/info.html | 5 +++++ 3 files changed, 23 insertions(+), 6 deletions(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/abi.html b/cmd/mist/assets/examples/abi.html index 8d172482c..8170e88b0 100644 --- a/cmd/mist/assets/examples/abi.html +++ b/cmd/mist/assets/examples/abi.html @@ -21,7 +21,7 @@ }]; var address = web3.eth.transact({ data: "0x603880600c6000396000f3006001600060e060020a600035048063c6888fa114601857005b6021600435602b565b8060005260206000f35b600081600702905091905056", - gasprice: "1000000000000000", + gasPrice: "1000000000000000", gas: "10000", }); var contract = web3.eth.contract(address, desc); diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index edeabe5e8..070ac94a6 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -32,17 +32,19 @@ web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080')); var desc = [{ "name": "balance(address)", + "type": "function", "inputs": [{ "name": "who", "type": "address" }], - "const": true, + "constant": true, "outputs": [{ "name": "value", "type": "uint256" }] }, { "name": "send(address,uint256)", + "type": "function", "inputs": [{ "name": "to", "type": "address" @@ -51,21 +53,31 @@ "type": "uint256" }], "outputs": [] + }, { + "name":"Changed", + "type":"event", + "inputs": [ + {"name":"to","type":"address","indexed":false}, + {"name":"amount","type":"uint256","indexed":true}, + ], }]; - var address = web3.db.get("jevcoin", "address"); + var address = "";//web3.db.get("jevcoin", "address"); if( address.length == 0 ) { - var code = "0x60056011565b60ae8060356000396000f35b64174876e800600033600160a060020a031660005260205260406000208190555056006001600060e060020a600035048063d0679d34146022578063e3d670d714603457005b602e6004356024356047565b60006000f35b603d600435608d565b8060005260206000f35b80600083600160a060020a0316600052602052604060002090815401908190555080600033600160a060020a031660005260205260406000209081540390819055505050565b6000600082600160a060020a0316600052602052604060002054905091905056"; + var code = "0x60056011565b60b88060356000396000f35b64e8d4a51000600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a68146028578063d0679d34146034578063e3d670d714604657005b602e60b3565b60006000f35b60406004356024356059565b60006000f35b604f6004356091565b8060005260206000f35b8060005281600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660206000a25050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156"; address = web3.eth.transact({ data: code, - gasprice: "1000000000000000", + gasPrice: "1000000000000000", gas: "10000", }); web3.db.put("jevcoin", "address", address); } var contract = web3.eth.contract(address, desc); - + contract.Changed({to: "0xaabb"}).changed(function(e) { + console.log("e: " + JSON.stringify(e)); + }); + contract.transact({gas: "10000", gasprice: eth.gasPrice}).send( "0xaa", 10000 ); function reflesh() { document.querySelector("#balance").innerHTML = contract.call().balance(eth.coinbase); diff --git a/cmd/mist/assets/examples/info.html b/cmd/mist/assets/examples/info.html index c4df8ea64..daad8c706 100644 --- a/cmd/mist/assets/examples/info.html +++ b/cmd/mist/assets/examples/info.html @@ -30,6 +30,10 @@ + + + + @@ -63,6 +67,7 @@ document.querySelector("#peer_count").innerHTML = eth.peerCount; document.querySelector("#default_block").innerHTML = eth.defaultBlock; document.querySelector("#accounts").innerHTML = eth.accounts; + document.querySelector("#balance").innerHTML = web3.toEth(eth.balanceAt(eth.accounts[0])); document.querySelector("#gas_price").innerHTML = eth.gasPrice; document.querySelector("#mining").innerHTML = eth.mining; document.querySelector("#listening").innerHTML = eth.listening; -- cgit v1.2.3 From 1d519854e2bfe8d5f2e8674f4f04ccf9aeaabe84 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 4 Feb 2015 17:28:54 -0800 Subject: Propagate known transactions to new peers on connect --- cmd/mist/assets/examples/coin.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index 070ac94a6..a84a828af 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -57,8 +57,8 @@ "name":"Changed", "type":"event", "inputs": [ - {"name":"to","type":"address","indexed":false}, - {"name":"amount","type":"uint256","indexed":true}, + {"name":"to","type":"address","indexed":true}, + {"name":"amount","type":"uint256","indexed":false}, ], }]; @@ -74,12 +74,12 @@ } var contract = web3.eth.contract(address, desc); - contract.Changed({to: "0xaabb"}).changed(function(e) { + contract.Changed({to: "0xaa"}).changed(function(e) { console.log("e: " + JSON.stringify(e)); }); contract.transact({gas: "10000", gasprice: eth.gasPrice}).send( "0xaa", 10000 ); function reflesh() { - document.querySelector("#balance").innerHTML = contract.call().balance(eth.coinbase); + document.querySelector("#balance").innerHTML = contract.balance(eth.coinbase); var table = document.querySelector("#table"); table.innerHTML = ""; // clear -- cgit v1.2.3 From db7c34a9df19d5a8a3a02a5e3d4cafcffa18dcb8 Mon Sep 17 00:00:00 2001 From: obscuren Date: Wed, 4 Feb 2015 18:34:29 -0800 Subject: Default gas price and default gas for rpc --- cmd/mist/assets/examples/coin.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index a84a828af..ed5063a05 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -62,7 +62,7 @@ ], }]; - var address = "";//web3.db.get("jevcoin", "address"); + var address = web3.db.get("jevcoin", "address"); if( address.length == 0 ) { var code = "0x60056011565b60b88060356000396000f35b64e8d4a51000600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a68146028578063d0679d34146034578063e3d670d714604657005b602e60b3565b60006000f35b60406004356024356059565b60006000f35b604f6004356091565b8060005260206000f35b8060005281600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660206000a25050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156"; address = web3.eth.transact({ @@ -77,7 +77,7 @@ contract.Changed({to: "0xaa"}).changed(function(e) { console.log("e: " + JSON.stringify(e)); }); - contract.transact({gas: "10000", gasprice: eth.gasPrice}).send( "0xaa", 10000 ); + contract.send( "0xaa", 10000 ); function reflesh() { document.querySelector("#balance").innerHTML = contract.balance(eth.coinbase); -- cgit v1.2.3 From e40c1c62ce0c2d9567066d84ea74fd24b424a81a Mon Sep 17 00:00:00 2001 From: obscuren Date: Thu, 5 Feb 2015 15:00:59 -0800 Subject: API changed to use Pubkey only. Reflected that change in the rest of the api --- cmd/mist/assets/examples/coin.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index ed5063a05..1e8a1cad9 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -29,7 +29,8 @@ var web3 = require('web3'); var eth = web3.eth; - web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080')); + web3.setProvider(new + web3.providers.HttpSyncProvider('http://localhost:8545')); var desc = [{ "name": "balance(address)", "type": "function", -- cgit v1.2.3 From 16a04e64f23b7a81018c7fcf7626ca6965d9a809 Mon Sep 17 00:00:00 2001 From: obscuren Date: Sat, 7 Feb 2015 17:04:19 +0100 Subject: Updated coin --- cmd/mist/assets/examples/coin.html | 96 ++++++++++++++++++++++++++------------ 1 file changed, 66 insertions(+), 30 deletions(-) (limited to 'cmd/mist/assets/examples') diff --git a/cmd/mist/assets/examples/coin.html b/cmd/mist/assets/examples/coin.html index 1e8a1cad9..71b359834 100644 --- a/cmd/mist/assets/examples/coin.html +++ b/cmd/mist/assets/examples/coin.html @@ -7,7 +7,7 @@ -

JevCoin

Balance @@ -20,7 +20,11 @@

"+JSON.stringify(message)+"
To me	"+JSON.stringify(message)+"

Balance
Gas price

+ +

Address

Balance

@@ -29,9 +33,8 @@ var web3 = require('web3'); var eth = web3.eth; - web3.setProvider(new - web3.providers.HttpSyncProvider('http://localhost:8545')); - var desc = [{ + web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8545')); + var desc = [{ "name": "balance(address)", "type": "function", "inputs": [{ @@ -55,57 +58,90 @@ }], "outputs": [] }, { - "name":"Changed", + "name":"changed", "type":"event", "inputs": [ {"name":"to","type":"address","indexed":true}, - {"name":"amount","type":"uint256","indexed":false}, + {"name":"from","type":"address","indexed":true}, ], }]; - var address = web3.db.get("jevcoin", "address"); - if( address.length == 0 ) { - var code = "0x60056011565b60b88060356000396000f35b64e8d4a51000600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a68146028578063d0679d34146034578063e3d670d714604657005b602e60b3565b60006000f35b60406004356024356059565b60006000f35b604f6004356091565b8060005260206000f35b8060005281600160a060020a03167fb52dda022b6c1a1f40905a85f257f689aa5d69d850e49cf939d688fbe5af594660206000a25050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156"; - address = web3.eth.transact({ - data: code, - gasPrice: "1000000000000000", - gas: "10000", - }); - web3.db.put("jevcoin", "address", address); - } + var address = localStorage.getItem("address"); + // deploy if not exist + if (address == null) { + var code = "0x60056013565b610132806100356000396000f35b620f4240600033600160a060020a0316600052602052604060002081905550560060e060020a6000350480637bb98a681461002b578063d0679d3414610039578063e3d670d71461004d57005b61003361012d565b60006000f35b610047600435602435610062565b60006000f35b61005860043561010b565b8060005260206000f35b80600033600160a060020a0316600052602052604060002054106100855761008a565b610107565b80600033600160a060020a0316600052602052604060002090815403908190555080600083600160a060020a0316600052602052604060002090815401908190555081600160a060020a031633600160a060020a03167f1863989b4bb7c5c3941722099764574df7a459f9f9c6b6cdca35ddc9731792b860006000a35b5050565b6000600082600160a060020a03166000526020526040600020549050919050565b5b60008156"; + address = web3.eth.transact({ + data: code, + gasPrice: "1000000000000000", + gas: "10000", + }); + localStorage.setItem("address", address); + } + document.querySelector("#address").innerHTML = address.toUpperCase(); var contract = web3.eth.contract(address, desc); - contract.Changed({to: "0xaa"}).changed(function(e) { - console.log("e: " + JSON.stringify(e)); + contract.changed({from: eth.accounts[0]}).changed(function() { + refresh(); }); - contract.send( "0xaa", 10000 ); - function reflesh() { - document.querySelector("#balance").innerHTML = contract.balance(eth.coinbase); + eth.watch('chain').changed(function() { + refresh(); + }); + + function refresh() { + document.querySelector("#balance").innerHTML = contract.balance(eth.coinbase); - var table = document.querySelector("#table"); + var table = document.querySelector("#table_body"); table.innerHTML = ""; // clear var storage = eth.storageAt(address); + table.innerHTML = ""; for( var item in storage ) { - table.innerHTML += ""+item+""+web3.toDecimal(storage[item])+""; + table.innerHTML += ""+item.toUpperCase()+""+web3.toDecimal(storage[item])+""; } } function transact() { var to = document.querySelector("#address").value; - if( to.length == 0 ) { - to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3"; - } else { - to = "0x"+to; - } + + if( to.length == 0 ) { + to = "0x4205b06c2cfa0e30359edcab94543266cb6fa1d3"; + } else { + to = "0x"+to; + } var value = parseInt( document.querySelector("#amount").value ); - contract.transact({gas: "10000", gasprice: eth.gasPrice}).send( to, value ); + contract.send( to, value ); } - reflesh(); + refresh(); +

Contract content

coinbase balance

JevCoin

Info

Whisper test

Whisper test

JevCoin

JevCoin