aboutsummaryrefslogtreecommitdiffstats
path: root/jsre
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2015-07-09 22:24:35 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2015-07-09 22:24:35 +0800
commit97d22be318add5c5f9e8cb8906c6786ae7a33623 (patch)
tree820bc0e4084a8a0687431600d223291372707fa7 /jsre
parent4c62ce831b7f4aba873fd0f78d90081d774c14a4 (diff)
parentd25634662bf631fe073e25817b375a48fd436cad (diff)
downloaddexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.tar
dexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.tar.gz
dexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.tar.bz2
dexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.tar.lz
dexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.tar.xz
dexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.tar.zst
dexon-97d22be318add5c5f9e8cb8906c6786ae7a33623.zip
Merge pull request #1441 from obscuren/logs-return-fix
miner, xeth: fire log event during mining. Fix return raw tx
Diffstat (limited to 'jsre')
-rw-r--r--jsre/ethereum_js.go32
1 files changed, 22 insertions, 10 deletions
diff --git a/jsre/ethereum_js.go b/jsre/ethereum_js.go
index 0a240dd28..f8cc88569 100644
--- a/jsre/ethereum_js.go
+++ b/jsre/ethereum_js.go
@@ -1417,7 +1417,7 @@ module.exports = {
},{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){
module.exports={
- "version": "0.8.0"
+ "version": "0.8.1"
}
},{}],9:[function(require,module,exports){
@@ -1840,14 +1840,14 @@ var contract = function (abi) {
};
/**
- * Should be called to create new ContractFactory
+ * Should be called to check if the contract gets properly deployed on the blockchain.
*
* @method checkForContractAddress
* @param {Object} contract
* @param {Function} callback
* @returns {Undefined}
*/
-var checkForContractAddress = function(contract, callback){
+var checkForContractAddress = function(contract, abi, callback){
var count = 0;
// wait for receipt
@@ -1855,6 +1855,8 @@ var checkForContractAddress = function(contract, callback){
if(!e) {
count++;
+ // console.log('Checking for contract address', count);
+
// stop watching after 50 blocks (timeout)
if(count > 50) {
if(callback)
@@ -1870,8 +1872,14 @@ var checkForContractAddress = function(contract, callback){
web3.eth.getCode(receipt.contractAddress, function(e, code){
if(code.length > 2) {
+ // console.log('Contract code deployed!');
+
contract.address = receipt.contractAddress;
+ // attach events and methods
+ addFunctionsToContract(contract, abi);
+ addEventsToContract(contract, abi);
+
if(callback)
callback(null, contract);
@@ -1909,6 +1917,7 @@ var ContractFactory = function (abi) {
* @returns {Contract} returns contract instance
*/
ContractFactory.prototype.new = function () {
+ var _this = this;
var contract = new Contract(this.abi);
// parse arguments
@@ -1940,14 +1949,14 @@ ContractFactory.prototype.new = function () {
} else {
// add the transaction hash
contract.transactionHash = hash;
- checkForContractAddress(contract, callback);
+ checkForContractAddress(contract, _this.abi, callback);
}
});
} else {
var hash = web3.eth.sendTransaction(options);
// add the transaction hash
contract.transactionHash = hash;
- checkForContractAddress(contract);
+ checkForContractAddress(contract, _this.abi);
}
return contract;
@@ -1963,12 +1972,17 @@ ContractFactory.prototype.new = function () {
* otherwise calls callback function (err, contract)
*/
ContractFactory.prototype.at = function (address, callback) {
+ var contract = new Contract(this.abi, address);
// TODO: address is required
+
+ // attach functions
+ addFunctionsToContract(contract, this.abi);
+ addEventsToContract(contract, this.abi);
if (callback) {
- callback(null, new Contract(this.abi, address));
+ callback(null, contract);
}
- return new Contract(this.abi, address);
+ return contract;
};
/**
@@ -1980,8 +1994,6 @@ ContractFactory.prototype.at = function (address, callback) {
*/
var Contract = function (abi, address) {
this.address = address;
- addFunctionsToContract(this, abi);
- addEventsToContract(this, abi);
};
module.exports = contract;
@@ -2484,8 +2496,8 @@ SolidityEvent.prototype.encode = function (indexed, options) {
result.topics = [];
+ result.address = this._address;
if (!this._anonymous) {
- result.address = this._address;
result.topics.push('0x' + this.signature());
}