tornado-packages/ethers.js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Renamed "execute" to "functions". Use signer estimateGas if possible.

Browse Source
This commit is contained in:
ricmoo 2017-04-04 17:33:47 -04:00
parent d686374e05
commit f772ce111e
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
contracts/contract.js
View File

@ -96,11 +96,10 @@ function Contract(address, contractInterface, signerOrProvider) {
var fromPromise = null;
if (transaction.from == null && signer && signer.getAddress) {
fromPromise = new Promise(function(resolve, reject) {
var address = signer.getAddress();
if (address instanceof Promise) { return address; }
resolve(address);
});
fromPromise = signer.getAddress();
if (!(address instanceof Promise)) {
fromPromise = Promise.resolve(fromPromise);
}
} else {
fromPromise = Promise.resolve(null);
}
@ -110,6 +109,7 @@ function Contract(address, contractInterface, signerOrProvider) {
transaction.from = utils.getAddress(address);
}
return provider.call(transaction);
}).then(function(value) {
return call.parse(value);
});
@ -124,6 +124,10 @@ function Contract(address, contractInterface, signerOrProvider) {
// Only computing the transaction estimate
if (estimateOnly) {
if (signer && signer.estimateGas) {
return signer.estimateGas(transaction);
}
return provider.estimateGas(transaction)
}
@ -132,6 +136,10 @@ function Contract(address, contractInterface, signerOrProvider) {
return signer.sendTransaction(transaction);
}
if (!signer.sign) {
return Promise.reject(new Error('custom signer does not support signing'));
}
if (transaction.gasLimit == null) {
transaction.gasLimit = signer.defaultGasLimit || 2000000;
}
@ -169,8 +177,8 @@ function Contract(address, contractInterface, signerOrProvider) {
var estimate = {};
utils.defineProperty(this, 'estimate', estimate);
var execute = {};
utils.defineProperty(this, 'execute', execute);
var functions = {};
utils.defineProperty(this, 'functions', functions);
var events = {};
utils.defineProperty(this, 'events', events);
@ -186,8 +194,8 @@ function Contract(address, contractInterface, signerOrProvider) {
console.log('WARNING: Multiple definitions for ' + method);
}
if (execute[method] == null) {
utils.defineProperty(execute, methodName, run);
if (functions[method] == null) {
utils.defineProperty(functions, methodName, run);
utils.defineProperty(estimate, methodName, runMethod(method, true));
}
}, this);