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

merged develop, build script

Browse Source
This commit is contained in:
Fabian Vogelsteller 2016-07-19 15:11:20 +02:00
commit 35bcace717
14 changed files with 57 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.versions
View File

@ -1,3 +1,3 @@
ethereum:web3@0.15.3
meteor@1.1.10
underscore@1.0.4
ethereum:web3@0.17.0-alpha
meteor@1.1.14
underscore@1.0.8

2
README.md
View File

@ -17,7 +17,7 @@ To migrate to this version, please follow the guide:
This is the Ethereum compatible [JavaScript API](https://github.com/ethereum/wiki/wiki/JavaScript-API)
which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/JSON-RPC) spec. It's available on npm as a node module, for bower and component as an embeddable js and as a meteor.js package.
[![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url] [![dev dependency status][dep-dev-image]][dep-dev-url][![Coverage Status][coveralls-image]][coveralls-url][![Stories in Ready][waffle-image]][waffle-url]
[![NPM version][npm-image]][npm-url] [![Build Status][travis-image]][travis-url] [![dependency status][dep-image]][dep-url] [![dev dependency status][dep-dev-image]][dep-dev-url] [![Coverage Status][coveralls-image]][coveralls-url] [![Stories in Ready][waffle-image]][waffle-url]
<!-- [![browser support](https://ci.testling.com/ethereum/ethereum.js.png)](https://ci.testling.com/ethereum/ethereum.js) -->

2
bower.json
View File

@ -1,7 +1,7 @@
{
"name": "web3",
"namespace": "ethereum",
"version": "0.16.0",
"version": "0.17.0-alpha",
"description": "Ethereum Compatible JavaScript API",
"main": [
"./dist/web3.js",

13
dist/web3-light.js vendored
View File

@ -2471,7 +2471,7 @@ module.exports = {
},{"./sha3.js":19,"bignumber.js":"bignumber.js","utf8":84}],21:[function(require,module,exports){
module.exports={
"version": "0.16.0"
"version": "0.17.0-alpha"
}
},{}],22:[function(require,module,exports){
@ -5534,6 +5534,13 @@ var methods = function () {
inputFormatter: [formatters.inputAddressFormatter, null, null]
});
var unlockAccountAndSendTransaction = new Method({
name: 'unlockAccountAndSendTransaction',
call: 'personal_signAndSendTransaction',
params: 2,
inputFormatter: [formatters.inputTransactionFormatter, null]
});
var lockAccount = new Method({
name: 'lockAccount',
call: 'personal_lockAccount',
@ -5544,6 +5551,7 @@ var methods = function () {
return [
newAccount,
unlockAccount,
unlockAccountAndSendTransaction,
lockAccount
];
};
@ -8375,8 +8383,7 @@ module.exports = transfer;
if (i % 4) {
var bits1 = map.indexOf(base64Str.charAt(i - 1)) << ((i % 4) * 2);
var bits2 = map.indexOf(base64Str.charAt(i)) >>> (6 - (i % 4) * 2);
var bitsCombined = bits1 | bits2;
words[nBytes >>> 2] |= (bitsCombined) << (24 - (nBytes % 4) * 8);
words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8);
nBytes++;
}
}

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

File diff suppressed because one or more lines are too long

13
dist/web3.js vendored
View File

@ -2471,7 +2471,7 @@ module.exports = {
},{"./sha3.js":19,"bignumber.js":"bignumber.js","utf8":84}],21:[function(require,module,exports){
module.exports={
"version": "0.16.0"
"version": "0.17.0-alpha"
}
},{}],22:[function(require,module,exports){
@ -5534,6 +5534,13 @@ var methods = function () {
inputFormatter: [formatters.inputAddressFormatter, null, null]
});
var unlockAccountAndSendTransaction = new Method({
name: 'unlockAccountAndSendTransaction',
call: 'personal_signAndSendTransaction',
params: 2,
inputFormatter: [formatters.inputTransactionFormatter, null]
});
var lockAccount = new Method({
name: 'lockAccount',
call: 'personal_lockAccount',
@ -5544,6 +5551,7 @@ var methods = function () {
return [
newAccount,
unlockAccount,
unlockAccountAndSendTransaction,
lockAccount
];
};
@ -8375,8 +8383,7 @@ module.exports = transfer;
if (i % 4) {
var bits1 = map.indexOf(base64Str.charAt(i - 1)) << ((i % 4) * 2);
var bits2 = map.indexOf(base64Str.charAt(i)) >>> (6 - (i % 4) * 2);
var bitsCombined = bits1 | bits2;
words[nBytes >>> 2] |= (bitsCombined) << (24 - (nBytes % 4) * 8);
words[nBytes >>> 2] |= (bits1 | bits2) << (24 - (nBytes % 4) * 8);
nBytes++;
}
}

14
dist/web3-light.js.map → dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

10
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
lib/version.json
View File

@ -1,3 +1,3 @@
{
"version": "0.16.0"
"version": "0.17.0-alpha"
}

8
lib/web3/methods/personal.js
View File

@ -58,6 +58,13 @@ var methods = function () {
inputFormatter: [formatters.inputAddressFormatter, null, null]
});
var unlockAccountAndSendTransaction = new Method({
name: 'unlockAccountAndSendTransaction',
call: 'personal_signAndSendTransaction',
params: 2,
inputFormatter: [formatters.inputTransactionFormatter, null]
});
var lockAccount = new Method({
name: 'lockAccount',
call: 'personal_lockAccount',
@ -68,6 +75,7 @@ var methods = function () {
return [
newAccount,
unlockAccount,
unlockAccountAndSendTransaction,
lockAccount
];
};

2
package.js
View File

@ -1,7 +1,7 @@
/* jshint ignore:start */
Package.describe({
name: 'ethereum:web3',
version: '0.16.0',
version: '0.17.0-alpha',
summary: 'Ethereum JavaScript API, middleware to talk to a ethreum node over RPC',
git: 'https://github.com/ethereum/ethereum.js',
// By default, Meteor will default to using README.md for documentation.

4
package.json
View File

@ -1,7 +1,7 @@
{
"name": "web3",
"namespace": "ethereum",
"version": "0.16.0",
"version": "0.17.0-alpha",
"description": "Ethereum JavaScript API, middleware to talk to a ethereum node over RPC",
"main": "./index.js",
"directories": {
@ -29,7 +29,7 @@
"gulp-replace": "^0.5.3",
"gulp-streamify": "0.0.5",
"gulp-uglify": ">=1.2.0",
"istanbul": "^0.3.5",
"istanbul": "^0.4.4",
"jshint": ">=2.5.0",
"mocha": ">=2.3.3",
"sandboxed-module": "^2.0.2",

3
test/httpprovider.js
View File

@ -6,7 +6,8 @@ SandboxedModule.registerBuiltInSourceTransformer('istanbul');
var HttpProvider = SandboxedModule.require('../lib/web3/httpprovider', {
requires: {
'xmlhttprequest': require('./helpers/FakeXMLHttpRequest')
}
},
singleOnly: true
});
describe('lib/web3/httpprovider', function () {

3
test/ipcprovider.js
View File

@ -8,7 +8,8 @@ SandboxedModule.registerBuiltInSourceTransformer('istanbul');
var IpcProvider = SandboxedModule.require('../lib/web3/ipcprovider', {
requires: {
'bignumber.js': require('bignumber.js'),
}
},
singleOnly: true
});
describe('lib/web3/ipcprovider', function () {