web3.eth.defaultAccount property, updated event_inc example, fixed #96
This commit is contained in:
parent
4aeba40514
commit
1c8cd7d6b0
|
@ -685,7 +685,8 @@ module.exports = {
|
||||||
ETH_UNITS: ETH_UNITS,
|
ETH_UNITS: ETH_UNITS,
|
||||||
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
|
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
|
||||||
ETH_POLLING_TIMEOUT: 1000,
|
ETH_POLLING_TIMEOUT: 1000,
|
||||||
ETH_DEFAULTBLOCK: 'latest'
|
defaultBlock: 'latest',
|
||||||
|
defaultAccount: undefined
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -1290,6 +1291,8 @@ web3.setProvider = function (provider) {
|
||||||
};
|
};
|
||||||
web3.reset = function () {
|
web3.reset = function () {
|
||||||
RequestManager.getInstance().reset();
|
RequestManager.getInstance().reset();
|
||||||
|
c.defaultBlock = 'latest';
|
||||||
|
c.defaultAccount = undefined;
|
||||||
};
|
};
|
||||||
web3.toHex = utils.toHex;
|
web3.toHex = utils.toHex;
|
||||||
web3.toAscii = utils.toAscii;
|
web3.toAscii = utils.toAscii;
|
||||||
|
@ -1304,14 +1307,23 @@ web3.isAddress = utils.isAddress;
|
||||||
// ADD defaultblock
|
// ADD defaultblock
|
||||||
Object.defineProperty(web3.eth, 'defaultBlock', {
|
Object.defineProperty(web3.eth, 'defaultBlock', {
|
||||||
get: function () {
|
get: function () {
|
||||||
return c.ETH_DEFAULTBLOCK;
|
return c.defaultBlock;
|
||||||
},
|
},
|
||||||
set: function (val) {
|
set: function (val) {
|
||||||
c.ETH_DEFAULTBLOCK = val;
|
c.defaultBlock = val;
|
||||||
return c.ETH_DEFAULTBLOCK;
|
return val;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Object.defineProperty(web3.eth, 'defaultAccount', {
|
||||||
|
get: function () {
|
||||||
|
return c.defaultAccount;
|
||||||
|
},
|
||||||
|
set: function (val) {
|
||||||
|
c.defaultAccount = val;
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/// setups all api methods
|
/// setups all api methods
|
||||||
setupMethods(web3, web3Methods);
|
setupMethods(web3, web3Methods);
|
||||||
|
@ -2216,7 +2228,7 @@ var isPredefinedBlockNumber = function (blockNumber) {
|
||||||
|
|
||||||
var inputDefaultBlockNumberFormatter = function (blockNumber) {
|
var inputDefaultBlockNumberFormatter = function (blockNumber) {
|
||||||
if (blockNumber === undefined) {
|
if (blockNumber === undefined) {
|
||||||
return config.ETH_DEFAULTBLOCK;
|
return config.defaultBlock;
|
||||||
}
|
}
|
||||||
return inputBlockNumberFormatter(blockNumber);
|
return inputBlockNumberFormatter(blockNumber);
|
||||||
};
|
};
|
||||||
|
@ -2239,6 +2251,8 @@ var inputBlockNumberFormatter = function (blockNumber) {
|
||||||
*/
|
*/
|
||||||
var inputTransactionFormatter = function (options){
|
var inputTransactionFormatter = function (options){
|
||||||
|
|
||||||
|
options.from = options.from || config.defaultAccount;
|
||||||
|
|
||||||
// make code -> data
|
// make code -> data
|
||||||
if (options.code) {
|
if (options.code) {
|
||||||
options.data = options.code;
|
options.data = options.code;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -685,7 +685,8 @@ module.exports = {
|
||||||
ETH_UNITS: ETH_UNITS,
|
ETH_UNITS: ETH_UNITS,
|
||||||
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
|
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
|
||||||
ETH_POLLING_TIMEOUT: 1000,
|
ETH_POLLING_TIMEOUT: 1000,
|
||||||
ETH_DEFAULTBLOCK: 'latest'
|
defaultBlock: 'latest',
|
||||||
|
defaultAccount: undefined
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -1290,6 +1291,8 @@ web3.setProvider = function (provider) {
|
||||||
};
|
};
|
||||||
web3.reset = function () {
|
web3.reset = function () {
|
||||||
RequestManager.getInstance().reset();
|
RequestManager.getInstance().reset();
|
||||||
|
c.defaultBlock = 'latest';
|
||||||
|
c.defaultAccount = undefined;
|
||||||
};
|
};
|
||||||
web3.toHex = utils.toHex;
|
web3.toHex = utils.toHex;
|
||||||
web3.toAscii = utils.toAscii;
|
web3.toAscii = utils.toAscii;
|
||||||
|
@ -1304,14 +1307,23 @@ web3.isAddress = utils.isAddress;
|
||||||
// ADD defaultblock
|
// ADD defaultblock
|
||||||
Object.defineProperty(web3.eth, 'defaultBlock', {
|
Object.defineProperty(web3.eth, 'defaultBlock', {
|
||||||
get: function () {
|
get: function () {
|
||||||
return c.ETH_DEFAULTBLOCK;
|
return c.defaultBlock;
|
||||||
},
|
},
|
||||||
set: function (val) {
|
set: function (val) {
|
||||||
c.ETH_DEFAULTBLOCK = val;
|
c.defaultBlock = val;
|
||||||
return c.ETH_DEFAULTBLOCK;
|
return val;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Object.defineProperty(web3.eth, 'defaultAccount', {
|
||||||
|
get: function () {
|
||||||
|
return c.defaultAccount;
|
||||||
|
},
|
||||||
|
set: function (val) {
|
||||||
|
c.defaultAccount = val;
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/// setups all api methods
|
/// setups all api methods
|
||||||
setupMethods(web3, web3Methods);
|
setupMethods(web3, web3Methods);
|
||||||
|
@ -2216,7 +2228,7 @@ var isPredefinedBlockNumber = function (blockNumber) {
|
||||||
|
|
||||||
var inputDefaultBlockNumberFormatter = function (blockNumber) {
|
var inputDefaultBlockNumberFormatter = function (blockNumber) {
|
||||||
if (blockNumber === undefined) {
|
if (blockNumber === undefined) {
|
||||||
return config.ETH_DEFAULTBLOCK;
|
return config.defaultBlock;
|
||||||
}
|
}
|
||||||
return inputBlockNumberFormatter(blockNumber);
|
return inputBlockNumberFormatter(blockNumber);
|
||||||
};
|
};
|
||||||
|
@ -2239,6 +2251,8 @@ var inputBlockNumberFormatter = function (blockNumber) {
|
||||||
*/
|
*/
|
||||||
var inputTransactionFormatter = function (options){
|
var inputTransactionFormatter = function (options){
|
||||||
|
|
||||||
|
options.from = options.from || config.defaultAccount;
|
||||||
|
|
||||||
// make code -> data
|
// make code -> data
|
||||||
if (options.code) {
|
if (options.code) {
|
||||||
options.data = options.code;
|
options.data = options.code;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -50,15 +50,15 @@
|
||||||
|
|
||||||
var createContract = function () {
|
var createContract = function () {
|
||||||
// let's assume that we have a private key to coinbase ;)
|
// 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);
|
var Contract = web3.eth.contract(desc);
|
||||||
contract = new Contract(address);
|
contract = new Contract(source);
|
||||||
contract.Incremented({odd: true}).watch(update);
|
contract.Incremented({odd: true}).watch(update);
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var callContract = function () {
|
var callContract = function () {
|
||||||
contract.sendTransaction({from: web3.eth.coinbase}).inc();
|
contract.inc();
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,7 @@ module.exports = {
|
||||||
ETH_UNITS: ETH_UNITS,
|
ETH_UNITS: ETH_UNITS,
|
||||||
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
|
ETH_BIGNUMBER_ROUNDING_MODE: { ROUNDING_MODE: BigNumber.ROUND_DOWN },
|
||||||
ETH_POLLING_TIMEOUT: 1000,
|
ETH_POLLING_TIMEOUT: 1000,
|
||||||
ETH_DEFAULTBLOCK: 'latest'
|
defaultBlock: 'latest',
|
||||||
|
defaultAccount: undefined
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
17
lib/web3.js
17
lib/web3.js
|
@ -117,6 +117,8 @@ web3.setProvider = function (provider) {
|
||||||
};
|
};
|
||||||
web3.reset = function () {
|
web3.reset = function () {
|
||||||
RequestManager.getInstance().reset();
|
RequestManager.getInstance().reset();
|
||||||
|
c.defaultBlock = 'latest';
|
||||||
|
c.defaultAccount = undefined;
|
||||||
};
|
};
|
||||||
web3.toHex = utils.toHex;
|
web3.toHex = utils.toHex;
|
||||||
web3.toAscii = utils.toAscii;
|
web3.toAscii = utils.toAscii;
|
||||||
|
@ -131,14 +133,23 @@ web3.isAddress = utils.isAddress;
|
||||||
// ADD defaultblock
|
// ADD defaultblock
|
||||||
Object.defineProperty(web3.eth, 'defaultBlock', {
|
Object.defineProperty(web3.eth, 'defaultBlock', {
|
||||||
get: function () {
|
get: function () {
|
||||||
return c.ETH_DEFAULTBLOCK;
|
return c.defaultBlock;
|
||||||
},
|
},
|
||||||
set: function (val) {
|
set: function (val) {
|
||||||
c.ETH_DEFAULTBLOCK = val;
|
c.defaultBlock = val;
|
||||||
return c.ETH_DEFAULTBLOCK;
|
return val;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Object.defineProperty(web3.eth, 'defaultAccount', {
|
||||||
|
get: function () {
|
||||||
|
return c.defaultAccount;
|
||||||
|
},
|
||||||
|
set: function (val) {
|
||||||
|
c.defaultAccount = val;
|
||||||
|
return val;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/// setups all api methods
|
/// setups all api methods
|
||||||
setupMethods(web3, web3Methods);
|
setupMethods(web3, web3Methods);
|
||||||
|
|
|
@ -41,7 +41,7 @@ var isPredefinedBlockNumber = function (blockNumber) {
|
||||||
|
|
||||||
var inputDefaultBlockNumberFormatter = function (blockNumber) {
|
var inputDefaultBlockNumberFormatter = function (blockNumber) {
|
||||||
if (blockNumber === undefined) {
|
if (blockNumber === undefined) {
|
||||||
return config.ETH_DEFAULTBLOCK;
|
return config.defaultBlock;
|
||||||
}
|
}
|
||||||
return inputBlockNumberFormatter(blockNumber);
|
return inputBlockNumberFormatter(blockNumber);
|
||||||
};
|
};
|
||||||
|
@ -64,6 +64,8 @@ var inputBlockNumberFormatter = function (blockNumber) {
|
||||||
*/
|
*/
|
||||||
var inputTransactionFormatter = function (options){
|
var inputTransactionFormatter = function (options){
|
||||||
|
|
||||||
|
options.from = options.from || config.defaultAccount;
|
||||||
|
|
||||||
// make code -> data
|
// make code -> data
|
||||||
if (options.code) {
|
if (options.code) {
|
||||||
options.data = options.code;
|
options.data = options.code;
|
||||||
|
|
Loading…
Reference in New Issue