diff --git a/example/contract.html b/example/contract.html
index 82a161a..3b83d37 100644
--- a/example/contract.html
+++ b/example/contract.html
@@ -49,7 +49,7 @@
// create contract
myContract = web3.eth.contract(desc).new({data: code});
console.log('address: ' + myContract.address);
- document.getElementById('status').innerText = "transaction send, waiting for confirmation";
+ document.getElementById('status').innerText = "transaction sent, waiting for confirmation";
watch.watch(function (err, hash) {
var block = web3.eth.getBlock(hash, true);
var contractMined = block.transactions.reduce(function (mined, th) {
diff --git a/example/event_inc.html b/example/event_inc.html
index d33a3f1..16eaa04 100644
--- a/example/event_inc.html
+++ b/example/event_inc.html
@@ -10,7 +10,7 @@
"contract Contract { " +
" event Incremented(bool indexed odd, uint x); " +
" function Contract() { " +
- " x = 69; " +
+ " x = 70; " +
" } " +
" function inc() { " +
" ++x; " +
@@ -52,12 +52,40 @@
var createContract = function () {
// let's assume that we have a private key to coinbase ;)
web3.eth.defaultAccount = web3.eth.coinbase;
+
+ var watch = web3.eth.filter('latest');
+
contract = web3.eth.contract(desc).new({data: code});
+
+ console.log('address: ' + contract.address);
+
+ document.getElementById('create').style.visibility = 'hidden';
+ document.getElementById('status').innerText = "transaction sent, waiting for confirmation";
+ watch.watch(function (err, hash) {
+ var block = web3.eth.getBlock(hash, true);
+ var contractMined = block.transactions.reduce(function (mined, th) {
+ // TODO: compiled code do not have 0x prefix
+ return mined || (th.from === web3.eth.defaultAccount && th.input.indexOf(code) !== -1);
+ }, false);
+
+ if (contractMined) {
+ document.getElementById('status').innerText = 'Mined!';
+ document.getElementById('call').style.visibility = 'visible';
+ }
+ });
+
contract.Incremented({odd: true}).watch(update);
};
+ var counter = 0;
var callContract = function () {
+ counter++;
+ var all = 70 + counter;
+ document.getElementById('count').innerText = 'Transaction sent ' + counter + ' times. ' +
+ 'Expected x value is: ' + (all - (all % 2 ? 0 : 1)) + ' ' +
+ 'Waiting for the blocks to be mined...';
+
contract.inc();
};
@@ -66,12 +94,14 @@
+
-
+
-
+
+