fixed log fields

web3 · Apr 21, 2015 · c8e5768 · c8e5768
1 parent d38f5a2
commit c8e5768
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/dist/web3-light.js b/dist/web3-light.js
diff --git a/dist/web3-light.js.map b/dist/web3-light.js.map
diff --git a/dist/web3-light.min.js b/dist/web3-light.min.js
diff --git a/dist/web3.js b/dist/web3.js
diff --git a/dist/web3.js.map b/dist/web3.js.map
diff --git a/dist/web3.min.js b/dist/web3.min.js
diff --git a/example/event_inc.html b/example/event_inc.html
@@ -45,7 +45,7 @@
         var contract;
 
         var update = function (err, x) {
-            document.getElementById('result').innerText = JSON.stringify(x);
+            document.getElementById('result').innerText = JSON.stringify(x, null, 2);
         };
 
         var createContract = function () {

diff --git a/lib/web3/event.js b/lib/web3/event.js
@@ -119,9 +119,13 @@ SolidityEvent.prototype.encode = function (indexed, options) {
 SolidityEvent.prototype.decode = function (data) {
     var result = {
         event: this.displayName(),
-        number: data.number,
-        hash: data.hash,
-        args: {}
+        args: {},
+        logIndex: utils.toDecimal(data.logIndex),
+        transactionIndex: utils.toDecimal(data.transactionIndex),
+        transactionHash: data.transactionHash,
+        address: data.address,
+        blockHash: data.blockHash,
+        blockNumber: utils.toDecimal(data.blockNumber)
     };
 
     data.data = data.data || '';