aboutsummaryrefslogtreecommitdiffstats
path: root/dist/ethereum.js
diff options
context:
space:
mode:
authorGav Wood <i@gavwood.com>2015-01-26 05:43:36 +0800
committerGav Wood <i@gavwood.com>2015-01-26 05:43:36 +0800
commitd223ac0379c4c1f8c209e777ec9ed63384590157 (patch)
treedbce42e40636c8bd82fe9cf8d744c65e4f19e5f8 /dist/ethereum.js
parent113a3809ab5e92cd0d60a02a5752b260a9ab3331 (diff)
downloaddexon-d223ac0379c4c1f8c209e777ec9ed63384590157.tar
dexon-d223ac0379c4c1f8c209e777ec9ed63384590157.tar.gz
dexon-d223ac0379c4c1f8c209e777ec9ed63384590157.tar.bz2
dexon-d223ac0379c4c1f8c209e777ec9ed63384590157.tar.lz
dexon-d223ac0379c4c1f8c209e777ec9ed63384590157.tar.xz
dexon-d223ac0379c4c1f8c209e777ec9ed63384590157.tar.zst
dexon-d223ac0379c4c1f8c209e777ec9ed63384590157.zip
Additional work on the JS stuff to make it more similar to Solidity.
Diffstat (limited to 'dist/ethereum.js')
-rw-r--r--dist/ethereum.js18
1 files changed, 18 insertions, 0 deletions
diff --git a/dist/ethereum.js b/dist/ethereum.js
index 66865ffb7..e249d7456 100644
--- a/dist/ethereum.js
+++ b/dist/ethereum.js
@@ -486,6 +486,15 @@ var contract = function (address, desc) {
return result;
};
+ result._options = {};
+ ['gas', 'gasPrice', 'value', 'from'].forEach(function(p) {
+ result[p] = function (v) {
+ result._options[p] = v;
+ return result;
+ };
+ });
+
+
desc.forEach(function (method) {
var displayName = abi.methodDisplayName(method.name);
@@ -1096,6 +1105,15 @@ var web3 = {
/// eth object prototype
eth: {
+ contractFromAbi: function (abi) {
+ return function(addr) {
+ // Default to address of Config. TODO: rremove prior to genesis.
+ addr = addr || '0xc6d9d2cd449a754c494264e1809c50e34d64562b';
+ var ret = web3.eth.contract(addr, abi);
+ ret.address = addr;
+ return ret;
+ };
+ },
watch: function (params) {
return new web3.filter(params, ethWatch);
}