Fixes #1369

libevm/ExtVMFace.h

@@ -63,10 +63,10 @@ using LogEntries = std::vector<LogEntry>;
 struct LocalisedLogEntry: public LogEntry
 {
 	LocalisedLogEntry() {}
-	LocalisedLogEntry(LogEntry const& _le, unsigned _number, h256 _sha3 = {}): LogEntry(_le), number(_number), sha3(_sha3) {}
+	LocalisedLogEntry(LogEntry const& _le, unsigned _number, h256 _transactionHash = h256()): LogEntry(_le), number(_number), transactionHash(_transactionHash) {}
 
 	unsigned number = 0;
-	h256 sha3;
+	h256 transactionHash;
 };
 
 using LocalisedLogEntries = std::vector<LocalisedLogEntry>;

libjsqrc/ethereumjs/dist/ethereum.js

@@ -1527,7 +1527,7 @@ var addEventsToContract = function (contract, desc, address) {
                 var parser = eventImpl.outputParser(e);
                 return parser(data);
             };
-            return web3.eth.filter(o, undefined, undefined, outputFormatter);
+			return web3.eth.filter(o, undefined, undefined, outputFormatter);
         };
         
         // this property should be used by eth.filter to check if object is an event
@@ -2005,16 +2005,6 @@ var getOptions = function (options) {
         options.toBlock = options.latest;
     }
 
-    if (options.skip) {
-        console.warn('"skip" is deprecated, is "offset" instead');
-        options.offset = options.skip;
-    }
-
-    if (options.max) {
-        console.warn('"max" is deprecated, is "limit" instead');
-        options.limit = options.max;
-    }
-
     // make sure topics, get converted to hex
     if(options.topics instanceof Array) {
         options.topics = options.topics.map(function(topic){
@@ -2022,13 +2012,18 @@ var getOptions = function (options) {
         });
     }
 
+	var asBlockNumber = function(n) {
+		if (n == null)
+			return null;
+		if (n == 'latest' || n == 'pending')
+			return n;
+		return utils.toHex(n);
+	};
 
     // evaluate lazy properties
     return {
-        fromBlock: utils.toHex(options.fromBlock),
-        toBlock: utils.toHex(options.toBlock),
-        limit: utils.toHex(options.limit),
-        offset: utils.toHex(options.offset),
+		fromBlock: asBlockNumber(options.fromBlock),
+		toBlock: asBlockNumber(options.toBlock),
         to: options.to,
         address: options.address,
         topics: options.topics
@@ -2053,9 +2048,10 @@ var filter = function(options, implementation, formatter) {
     // call the callbacks
     var onMessages = function (messages) {
         messages.forEach(function (message) {
-            message = formatter ? formatter(message) : message;
+			console.log("Got message: " + JSON.stringify(message));
+			message = formatter ? formatter(message) : message;
             callbacks.forEach(function (callback) {
-                callback(message);
+				callback(message);
             });
         });
     };
@@ -2855,4 +2851,4 @@ module.exports = web3;
 },{"./lib/solidity/abi":1,"./lib/web3":6,"./lib/web3/contract":7,"./lib/web3/httpprovider":13,"./lib/web3/qtsync":16}]},{},["web3"])
 
 
-//# sourceMappingURL=ethereum.js.map
+//# sourceMappingURL=ethereum.js.map

libjsqrc/ethereumjs/lib/web3/contract.js

@@ -159,7 +159,7 @@ var addEventsToContract = function (contract, desc, address) {
                 var parser = eventImpl.outputParser(e);
                 return parser(data);
             };
-            return web3.eth.filter(o, undefined, undefined, outputFormatter);
+			return web3.eth.filter(o, undefined, undefined, outputFormatter);
         };
         
         // this property should be used by eth.filter to check if object is an event

libjsqrc/ethereumjs/lib/web3/filter.js

@@ -64,16 +64,6 @@ var getOptions = function (options) {
         options.toBlock = options.latest;
     }
 
-    if (options.skip) {
-        console.warn('"skip" is deprecated, is "offset" instead');
-        options.offset = options.skip;
-    }
-
-    if (options.max) {
-        console.warn('"max" is deprecated, is "limit" instead');
-        options.limit = options.max;
-    }
-
     // make sure topics, get converted to hex
     if(options.topics instanceof Array) {
         options.topics = options.topics.map(function(topic){
@@ -81,13 +71,18 @@ var getOptions = function (options) {
         });
     }
 
+	var asBlockNumber = function(n) {
+		if (n == null)
+			return null;
+		if (n == 'latest' || n == 'pending')
+			return n;
+		return utils.toHex(n);
+	};
 
     // evaluate lazy properties
     return {
-        fromBlock: utils.toHex(options.fromBlock),
-        toBlock: utils.toHex(options.toBlock),
-        limit: utils.toHex(options.limit),
-        offset: utils.toHex(options.offset),
+		fromBlock: asBlockNumber(options.fromBlock),
+		toBlock: asBlockNumber(options.toBlock),
         to: options.to,
         address: options.address,
         topics: options.topics
@@ -112,9 +107,9 @@ var filter = function(options, implementation, formatter) {
     // call the callbacks
     var onMessages = function (messages) {
         messages.forEach(function (message) {
-            message = formatter ? formatter(message) : message;
+			message = formatter ? formatter(message) : message;
             callbacks.forEach(function (callback) {
-                callback(message);
+				callback(message);
             });
         });
     };

libweb3jsonrpc/WebThreeStubServerBase.cpp

@@ -112,18 +112,20 @@ static Json::Value toJson(dev::eth::TransactionSkeleton const& _t)
 static Json::Value toJson(dev::eth::LocalisedLogEntry const& _e)
 {
 	Json::Value res;
-
-	res["data"] = toJS(_e.data);
-	res["address"] = toJS(_e.address);
-	res["topics"] = Json::Value(Json::arrayValue);
-	for (auto const& t: _e.topics)
-		res["topics"].append(toJS(t));
-	res["number"] = _e.number;
-	res["hash"] = toJS(_e.sha3);
+	if (_e.transactionHash)
+	{
+		res["data"] = toJS(_e.data);
+		res["address"] = toJS(_e.address);
+		res["topics"] = Json::Value(Json::arrayValue);
+		for (auto const& t: _e.topics)
+			res["topics"].append(toJS(t));
+		res["number"] = _e.number;
+		res["hash"] = toJS(_e.transactionHash);
+	}
 	return res;
 }
 
-static Json::Value toJson(dev::eth::LocalisedLogEntries const& _es)	// commented to avoid warning. Uncomment once in use @ poC-7.
+static Json::Value toJson(dev::eth::LocalisedLogEntries const& _es)
 {
 	Json::Value res(Json::arrayValue);
 	for (dev::eth::LocalisedLogEntry const& e: _es)