status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '93fa6855afad7a7eb86e49efe384372a6060da35' into natspec

This commit is contained in:
Marek Kotewicz 2015-01-22 15:33:47 +01:00
parent 6c4432d417 3073511e30
commit 13f39afbdd
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dist/ethereum.js vendored
View File

@ -488,22 +488,24 @@ var contract = function (address, desc) {
options.to = address;
options.data = signature + parsed;
var output = "";
if (result._isTransact) {
// it's used byt natspec.js
// TODO: figure out better way to solve this
web3._currentContractAbi = desc;
web3._currentContractAddress = address;
output = web3.eth.transact(options);
} else {
output = web3.eth.call(options);
}
var isTransact = result._isTransact;
// reset
result._options = {};
result._isTransact = false;
if (isTransact) {
// it's used byt natspec.js
// TODO: figure out better way to solve this
web3._currentContractAbi = desc;
web3._currentContractAddress = address;
// transactions do not have any output, cause we do not know, when they will be processed
web3.eth.transact(options);
return;
}
var output = web3.eth.call(options);
return outputParser[displayName][typeName](output);
};

4
dist/ethereum.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/ethereum.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
lib/contract.js
View File

@ -77,22 +77,24 @@ var contract = function (address, desc) {
options.to = address;
options.data = signature + parsed;
var output = "";
if (result._isTransact) {
// it's used byt natspec.js
// TODO: figure out better way to solve this
web3._currentContractAbi = desc;
web3._currentContractAddress = address;
output = web3.eth.transact(options);
} else {
output = web3.eth.call(options);
}
var isTransact = result._isTransact;
// reset
result._options = {};
result._isTransact = false;
if (isTransact) {
// it's used byt natspec.js
// TODO: figure out better way to solve this
web3._currentContractAbi = desc;
web3._currentContractAddress = address;
// transactions do not have any output, cause we do not know, when they will be processed
web3.eth.transact(options);
return;
}
var output = web3.eth.call(options);
return outputParser[displayName][typeName](output);
};