poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

web3: updated

This commit is contained in:
Jeffrey Wilcke 2015-07-08 15:47:33 +02:00
parent 819ecd4508
commit d25634662b
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
jsre/ethereum_js.go
View File

@ -1417,7 +1417,7 @@ module.exports = {
},{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){ },{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){
module.exports={ module.exports={
"version": "0.8.0" "version": "0.8.1"
} }
},{}],9:[function(require,module,exports){ },{}],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 * @method checkForContractAddress
* @param {Object} contract * @param {Object} contract
* @param {Function} callback * @param {Function} callback
* @returns {Undefined} * @returns {Undefined}
*/ */
var checkForContractAddress = function(contract, callback){ var checkForContractAddress = function(contract, abi, callback){
var count = 0; var count = 0;
// wait for receipt // wait for receipt
@ -1855,6 +1855,8 @@ var checkForContractAddress = function(contract, callback){
if(!e) { if(!e) {
count++; count++;
// console.log('Checking for contract address', count);
// stop watching after 50 blocks (timeout) // stop watching after 50 blocks (timeout)
if(count > 50) { if(count > 50) {
if(callback) if(callback)
@ -1870,8 +1872,14 @@ var checkForContractAddress = function(contract, callback){
web3.eth.getCode(receipt.contractAddress, function(e, code){ web3.eth.getCode(receipt.contractAddress, function(e, code){
if(code.length > 2) { if(code.length > 2) {
// console.log('Contract code deployed!');
contract.address = receipt.contractAddress; contract.address = receipt.contractAddress;
// attach events and methods
addFunctionsToContract(contract, abi);
addEventsToContract(contract, abi);
if(callback) if(callback)
callback(null, contract); callback(null, contract);
@ -1909,6 +1917,7 @@ var ContractFactory = function (abi) {
* @returns {Contract} returns contract instance * @returns {Contract} returns contract instance
*/ */
ContractFactory.prototype.new = function () { ContractFactory.prototype.new = function () {
var _this = this;
var contract = new Contract(this.abi); var contract = new Contract(this.abi);
// parse arguments // parse arguments
@ -1940,14 +1949,14 @@ ContractFactory.prototype.new = function () {
} else { } else {
// add the transaction hash // add the transaction hash
contract.transactionHash = hash; contract.transactionHash = hash;
checkForContractAddress(contract, callback); checkForContractAddress(contract, _this.abi, callback);
} }
}); });
} else { } else {
var hash = web3.eth.sendTransaction(options); var hash = web3.eth.sendTransaction(options);
// add the transaction hash // add the transaction hash
contract.transactionHash = hash; contract.transactionHash = hash;
checkForContractAddress(contract); checkForContractAddress(contract, _this.abi);
} }
return contract; return contract;
@ -1963,12 +1972,17 @@ ContractFactory.prototype.new = function () {
* otherwise calls callback function (err, contract) * otherwise calls callback function (err, contract)
*/ */
ContractFactory.prototype.at = function (address, callback) { ContractFactory.prototype.at = function (address, callback) {
var contract = new Contract(this.abi, address);
// TODO: address is required // TODO: address is required
// attach functions
addFunctionsToContract(contract, this.abi);
addEventsToContract(contract, this.abi);
if (callback) { 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) { var Contract = function (abi, address) {
this.address = address; this.address = address;
addFunctionsToContract(this, abi);
addEventsToContract(this, abi);
}; };
module.exports = contract; module.exports = contract;
@ -2484,8 +2496,8 @@ SolidityEvent.prototype.encode = function (indexed, options) {
result.topics = []; result.topics = [];
if (!this._anonymous) {
result.address = this._address; result.address = this._address;
if (!this._anonymous) {
result.topics.push('0x' + this.signature()); result.topics.push('0x' + this.signature());
} }