status-im/web3.js
2
0
Fork 0
mirror of https://github.com/status-im/web3.js.git synced 2025-02-23 03:28:07 +00:00
Code Issues Projects Releases Wiki Activity

web3.eth.defaultAccount property, updated event_inc example, fixed #96

Browse Source
This commit is contained in:
Marek Kotewicz 2015-04-20 14:16:29 +02:00
parent 4aeba40514
commit 1c8cd7d6b0
10 changed files with 71 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dist/web3-light.js vendored
View File

@ -685,7 +685,8 @@ module.exports = {
ETH_UNITS: ETH_UNITS,
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
ETH_POLLING_TIMEOUT: 1000,
ETH_DEFAULTBLOCK: 'latest'
defaultBlock: 'latest',
defaultAccount: undefined
};
@ -1290,6 +1291,8 @@ web3.setProvider = function (provider) {
};
web3.reset = function () {
RequestManager.getInstance().reset();
c.defaultBlock = 'latest';
c.defaultAccount = undefined;
};
web3.toHex = utils.toHex;
web3.toAscii = utils.toAscii;
@ -1304,14 +1307,23 @@ web3.isAddress = utils.isAddress;
// ADD defaultblock
Object.defineProperty(web3.eth, 'defaultBlock', {
get: function () {
return c.ETH_DEFAULTBLOCK;
return c.defaultBlock;
},
set: function (val) {
c.ETH_DEFAULTBLOCK = val;
return c.ETH_DEFAULTBLOCK;
c.defaultBlock = val;
return val;
}
});
Object.defineProperty(web3.eth, 'defaultAccount', {
get: function () {
return c.defaultAccount;
},
set: function (val) {
c.defaultAccount = val;
return val;
}
});
/// setups all api methods
setupMethods(web3, web3Methods);
@ -2216,7 +2228,7 @@ var isPredefinedBlockNumber = function (blockNumber) {
var inputDefaultBlockNumberFormatter = function (blockNumber) {
if (blockNumber === undefined) {
return config.ETH_DEFAULTBLOCK;
return config.defaultBlock;
}
return inputBlockNumberFormatter(blockNumber);
};
@ -2239,6 +2251,8 @@ var inputBlockNumberFormatter = function (blockNumber) {
*/
var inputTransactionFormatter = function (options){
options.from = options.from || config.defaultAccount;
// make code -> data
if (options.code) {
options.data = options.code;

8
dist/web3-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

24
dist/web3.js vendored
View File

@ -685,7 +685,8 @@ module.exports = {
ETH_UNITS: ETH_UNITS,
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
ETH_POLLING_TIMEOUT: 1000,
ETH_DEFAULTBLOCK: 'latest'
defaultBlock: 'latest',
defaultAccount: undefined
};
@ -1290,6 +1291,8 @@ web3.setProvider = function (provider) {
};
web3.reset = function () {
RequestManager.getInstance().reset();
c.defaultBlock = 'latest';
c.defaultAccount = undefined;
};
web3.toHex = utils.toHex;
web3.toAscii = utils.toAscii;
@ -1304,14 +1307,23 @@ web3.isAddress = utils.isAddress;
// ADD defaultblock
Object.defineProperty(web3.eth, 'defaultBlock', {
get: function () {
return c.ETH_DEFAULTBLOCK;
return c.defaultBlock;
},
set: function (val) {
c.ETH_DEFAULTBLOCK = val;
return c.ETH_DEFAULTBLOCK;
c.defaultBlock = val;
return val;
}
});
Object.defineProperty(web3.eth, 'defaultAccount', {
get: function () {
return c.defaultAccount;
},
set: function (val) {
c.defaultAccount = val;
return val;
}
});
/// setups all api methods
setupMethods(web3, web3Methods);
@ -2216,7 +2228,7 @@ var isPredefinedBlockNumber = function (blockNumber) {
var inputDefaultBlockNumberFormatter = function (blockNumber) {
if (blockNumber === undefined) {
return config.ETH_DEFAULTBLOCK;
return config.defaultBlock;
}
return inputBlockNumberFormatter(blockNumber);
};
@ -2239,6 +2251,8 @@ var inputBlockNumberFormatter = function (blockNumber) {
*/
var inputTransactionFormatter = function (options){
options.from = options.from || config.defaultAccount;
// make code -> data
if (options.code) {
options.data = options.code;

8
dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

5
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
example/event_inc.html
View File

@ -50,15 +50,15 @@
var createContract = function () {
// let's assume that we have a private key to coinbase ;)
address = web3.eth.sendTransaction({from: web3.eth.coinbase, data: source});
web3.eth.defaultAccount = web3.eth.coinbase;
var Contract = web3.eth.contract(desc);
contract = new Contract(address);
contract = new Contract(source);
contract.Incremented({odd: true}).watch(update);
};
var callContract = function () {
contract.sendTransaction({from: web3.eth.coinbase}).inc();
contract.inc();
};

3
lib/utils/config.js
View File

@ -64,6 +64,7 @@ module.exports = {
ETH_UNITS: ETH_UNITS,
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
ETH_POLLING_TIMEOUT: 1000,
ETH_DEFAULTBLOCK: 'latest'
defaultBlock: 'latest',
defaultAccount: undefined
};

17
lib/web3.js
View File

@ -117,6 +117,8 @@ web3.setProvider = function (provider) {
};
web3.reset = function () {
RequestManager.getInstance().reset();
c.defaultBlock = 'latest';
c.defaultAccount = undefined;
};
web3.toHex = utils.toHex;
web3.toAscii = utils.toAscii;
@ -131,14 +133,23 @@ web3.isAddress = utils.isAddress;
// ADD defaultblock
Object.defineProperty(web3.eth, 'defaultBlock', {
get: function () {
return c.ETH_DEFAULTBLOCK;
return c.defaultBlock;
},
set: function (val) {
c.ETH_DEFAULTBLOCK = val;
return c.ETH_DEFAULTBLOCK;
c.defaultBlock = val;
return val;
}
});
Object.defineProperty(web3.eth, 'defaultAccount', {
get: function () {
return c.defaultAccount;
},
set: function (val) {
c.defaultAccount = val;
return val;
}
});
/// setups all api methods
setupMethods(web3, web3Methods);

4
lib/web3/formatters.js
View File

@ -41,7 +41,7 @@ var isPredefinedBlockNumber = function (blockNumber) {
var inputDefaultBlockNumberFormatter = function (blockNumber) {
if (blockNumber === undefined) {
return config.ETH_DEFAULTBLOCK;
return config.defaultBlock;
}
return inputBlockNumberFormatter(blockNumber);
};
@ -64,6 +64,8 @@ var inputBlockNumberFormatter = function (blockNumber) {
*/
var inputTransactionFormatter = function (options){
options.from = options.from || config.defaultAccount;
// make code -> data
if (options.code) {
options.data = options.code;