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

Merge branch 'web3' into develop

Browse Source 
Conflicts:
	dist/web3-light.js
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js
	dist/web3.js.map
	dist/web3.min.js
This commit is contained in:
Marek Kotewicz 2015-04-10 00:08:07 +02:00
commit 9c2c94668f
18 changed files with 63 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bower.json
View File

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

17
dist/ethereum-light.js → dist/web3-light.js vendored
View File

@ -1167,7 +1167,7 @@ module.exports = {
},{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){ },{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){
module.exports={ module.exports={
"version": "0.2.4" "version": "0.2.5"
} }
},{}],9:[function(require,module,exports){ },{}],9:[function(require,module,exports){
@ -3313,16 +3313,23 @@ module.exports = {
module.exports = BigNumber; // jshint ignore:line module.exports = BigNumber; // jshint ignore:line
},{}],"ethereum.js":[function(require,module,exports){ },{}],"web3":[function(require,module,exports){
var web3 = require('./lib/web3'); // dont override global variable
if (typeof web3 !== 'undefined') {
var web3;
}
web3 = require('./lib/web3');
web3.providers.HttpProvider = require('./lib/web3/httpprovider'); web3.providers.HttpProvider = require('./lib/web3/httpprovider');
web3.providers.QtSyncProvider = require('./lib/web3/qtsync'); web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
web3.eth.contract = require('./lib/web3/contract'); web3.eth.contract = require('./lib/web3/contract');
web3.abi = require('./lib/solidity/abi'); web3.abi = require('./lib/solidity/abi');
module.exports = web3; module.exports = web3;
},{"./lib/solidity/abi":1,"./lib/web3":9,"./lib/web3/contract":10,"./lib/web3/httpprovider":17,"./lib/web3/qtsync":22}]},{},["ethereum.js"]) },{"./lib/solidity/abi":1,"./lib/web3":9,"./lib/web3/contract":10,"./lib/web3/httpprovider":17,"./lib/web3/qtsync":22}]},{},["web3"])
//# sourceMappingURL=ethereum-light.js.map //# sourceMappingURL=web3-light.js.map

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

17
dist/ethereum.js → dist/web3.js vendored
View File

@ -1167,7 +1167,7 @@ module.exports = {
},{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){ },{"bignumber.js":"bignumber.js"}],8:[function(require,module,exports){
module.exports={ module.exports={
"version": "0.2.4" "version": "0.2.5"
} }
},{}],9:[function(require,module,exports){ },{}],9:[function(require,module,exports){
@ -5978,16 +5978,23 @@ module.exports = {
} }
})(this); })(this);
},{"crypto":27}],"ethereum.js":[function(require,module,exports){ },{"crypto":27}],"web3":[function(require,module,exports){
var web3 = require('./lib/web3'); // dont override global variable
if (typeof web3 !== 'undefined') {
var web3;
}
web3 = require('./lib/web3');
web3.providers.HttpProvider = require('./lib/web3/httpprovider'); web3.providers.HttpProvider = require('./lib/web3/httpprovider');
web3.providers.QtSyncProvider = require('./lib/web3/qtsync'); web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
web3.eth.contract = require('./lib/web3/contract'); web3.eth.contract = require('./lib/web3/contract');
web3.abi = require('./lib/solidity/abi'); web3.abi = require('./lib/solidity/abi');
module.exports = web3; module.exports = web3;
},{"./lib/solidity/abi":1,"./lib/web3":9,"./lib/web3/contract":10,"./lib/web3/httpprovider":17,"./lib/web3/qtsync":22}]},{},["ethereum.js"]) },{"./lib/solidity/abi":1,"./lib/web3":9,"./lib/web3/contract":10,"./lib/web3/httpprovider":17,"./lib/web3/qtsync":22}]},{},["web3"])
//# sourceMappingURL=ethereum.js.map //# sourceMappingURL=web3.js.map

6
dist/ethereum.js.map → dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/ethereum.min.js → dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
example/balance.html
View File

@ -3,10 +3,10 @@
<head> <head>
<script type="text/javascript" src="../node_modules/bignumber.js/bignumber.min.js"></script> <script type="text/javascript" src="../node_modules/bignumber.js/bignumber.min.js"></script>
<script type="text/javascript" src="../dist/ethereum-light.js"></script> <script type="text/javascript" src="../dist/web3-light.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var web3 = require('ethereum.js'); var web3 = require('web3');
web3.setProvider(new web3.providers.HttpProvider()); web3.setProvider(new web3.providers.HttpProvider());
function watchBalance() { function watchBalance() {

4
example/contract.html
View File

@ -2,10 +2,10 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/web3"></script>
<script type="text/javascript"> <script type="text/javascript">
var web3 = require('ethereum.js'); var web3 = require('web3');
web3.setProvider(new web3.providers.HttpProvider()); web3.setProvider(new web3.providers.HttpProvider());
// solidity source code // solidity source code

4
example/contract_with_array.html
View File

@ -2,10 +2,10 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/web3.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var web3 = require('ethereum.js'); var web3 = require('web3');
web3.setProvider(new web3.providers.HttpProvider()); web3.setProvider(new web3.providers.HttpProvider());
// solidity source code // solidity source code

4
example/event.html
View File

@ -1,9 +1,9 @@
<!doctype> <!doctype>
<html> <html>
<head> <head>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/web3.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var web3 = require('ethereum.js'); var web3 = require('web3');
web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080')); web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
var desc = [{ var desc = [{

4
example/event_inc.html
View File

@ -1,9 +1,9 @@
<!doctype> <!doctype>
<html> <html>
<head> <head>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/web3.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var web3 = require('ethereum.js'); var web3 = require('web3');
web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080')); web3.setProvider(new web3.providers.HttpProvider('http://localhost:8080'));
var source = "" + var source = "" +

4
example/natspec_contract.html
View File

@ -2,10 +2,10 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/web3.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var web3 = require('ethereum.js'); var web3 = require('web3');
web3.setProvider(new web3.providers.HttpProvider()); web3.setProvider(new web3.providers.HttpProvider());
// solidity source code // solidity source code

8
gulpfile.js
View File

@ -19,8 +19,8 @@ var replace = require('gulp-replace');
var DEST = './dist/'; var DEST = './dist/';
var src = 'index'; var src = 'index';
var dst = 'ethereum'; var dst = 'web3';
var lightDst = 'ethereum-light'; var lightDst = 'web3-light';
var browserifyOptions = { var browserifyOptions = {
debug: true, debug: true,
@ -60,7 +60,7 @@ gulp.task('lint', function(){
gulp.task('buildLight', ['clean'], function () { gulp.task('buildLight', ['clean'], function () {
return browserify(browserifyOptions) return browserify(browserifyOptions)
.require('./' + src + '.js', {expose: 'ethereum.js'}) .require('./' + src + '.js', {expose: 'web3'})
.ignore('bignumber.js') .ignore('bignumber.js')
.require('./lib/utils/browser-bn.js', {expose: 'bignumber.js'}) // fake bignumber.js .require('./lib/utils/browser-bn.js', {expose: 'bignumber.js'}) // fake bignumber.js
.add('./' + src + '.js') .add('./' + src + '.js')
@ -75,7 +75,7 @@ gulp.task('buildLight', ['clean'], function () {
gulp.task('buildStandalone', ['clean'], function () { gulp.task('buildStandalone', ['clean'], function () {
return browserify(browserifyOptions) return browserify(browserifyOptions)
.require('./' + src + '.js', {expose: 'ethereum.js'}) .require('./' + src + '.js', {expose: 'web3'})
.require('bignumber.js') // expose it to dapp users .require('bignumber.js') // expose it to dapp users
.add('./' + src + '.js') .add('./' + src + '.js')
.ignore('crypto') .ignore('crypto')

9
index.js
View File

@ -1,7 +1,14 @@
var web3 = require('./lib/web3'); // dont override global variable
if (typeof web3 !== 'undefined') {
var web3;
}
web3 = require('./lib/web3');
web3.providers.HttpProvider = require('./lib/web3/httpprovider'); web3.providers.HttpProvider = require('./lib/web3/httpprovider');
web3.providers.QtSyncProvider = require('./lib/web3/qtsync'); web3.providers.QtSyncProvider = require('./lib/web3/qtsync');
web3.eth.contract = require('./lib/web3/contract'); web3.eth.contract = require('./lib/web3/contract');
web3.abi = require('./lib/solidity/abi'); web3.abi = require('./lib/solidity/abi');
module.exports = web3; module.exports = web3;

2
lib/version.json
View File

@ -1,3 +1,3 @@
{ {
"version": "0.2.4" "version": "0.2.5"
} }

2
package.js
View File

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

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "ethereum.js", "name": "web3",
"namespace": "ethereum", "namespace": "ethereum",
"version": "0.2.4", "version": "0.2.5",
"description": "Ethereum JavaScript API, middleware to talk to a ethereum node over RPC", "description": "Ethereum JavaScript API, middleware to talk to a ethereum node over RPC",
"main": "./index.js", "main": "./index.js",
"directories": { "directories": {