Skip to content

G
Geth-Modification
Commit da4c2d53 authored by Marek Kotewicz's avatar Marek Kotewicz
Browse files
Options

removed promise dependency, updated readme, fixed node.js version of lib

parent 5b701962
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 36 deletions
README.md
View file @ da4c2d53
# Ethereum JavaScript API # Ethereum JavaScript API
This is the Ethereum compatible JavaScript API using `Promise`s 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/Generic-JSON-RPC) spec. It's available on npm as a node module and also for bower and component as an embeddable js which implements the [Generic JSON RPC](https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC) spec. It's available on npm as a node module and also for bower and component as an embeddable js
[![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] [![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]
...@@ -23,7 +23,7 @@ Component ...@@ -23,7 +23,7 @@ Component
component install ethereum/ethereum.js component install ethereum/ethereum.js
* Include `ethereum.min.js` in your html file. * Include `ethereum.min.js` in your html file.
* Include [es6-promise](https://github.com/jakearchibald/es6-promise) or another ES6-Shim if your browser doesn't support ECMAScript 6. * Include [bignumber.js](https://github.com/MikeMcl/bignumber.js/)
## Usage ## Usage
Require the library: Require the library:
...@@ -37,14 +37,8 @@ Set a provider (QtProvider, WebSocketProvider, HttpRpcProvider) ...@@ -37,14 +37,8 @@ Set a provider (QtProvider, WebSocketProvider, HttpRpcProvider)
There you go, now you can use it: There you go, now you can use it:
``` ```
web3.eth.coinbase.then(function(result){ var coinbase = web3.eth.coinbase;
console.log(result); var balance = web3.eth.balanceAt(coinbase);
return web3.eth.balanceAt(result);
}).then(function(balance){
console.log(web3.toDecimal(balance));
}).catch(function(err){
console.log(err);
});
``` ```
...@@ -99,3 +93,4 @@ ethereum -ws -loglevel=4 ...@@ -99,3 +93,4 @@ ethereum -ws -loglevel=4
[dep-url]: https://david-dm.org/ethereum/ethereum.js [dep-url]: https://david-dm.org/ethereum/ethereum.js
[dep-dev-image]: https://david-dm.org/ethereum/ethereum.js/dev-status.svg [dep-dev-image]: https://david-dm.org/ethereum/ethereum.js/dev-status.svg
[dep-dev-url]: https://david-dm.org/ethereum/ethereum.js#info=devDependencies [dep-dev-url]: https://david-dm.org/ethereum/ethereum.js#info=devDependencies
bower.json
View file @ da4c2d53
{ {
"name": "ethereum.js", "name": "ethereum.js",
"namespace": "ethereum", "namespace": "ethereum",
"version": "0.0.9", "version": "0.0.10",
"description": "Ethereum Compatible JavaScript API", "description": "Ethereum Compatible JavaScript API",
"main": ["./dist/ethereum.js", "./dist/ethereum.min.js"], "main": ["./dist/ethereum.js", "./dist/ethereum.min.js"],
"dependencies": { "dependencies": {
"es6-promise": "#master",
"bignumber.js": ">=2.0.0" "bignumber.js": ">=2.0.0"
}, },
"repository": { "repository": {
......
dist/ethereum.js
View file @ da4c2d53
...@@ -622,6 +622,10 @@ module.exports = Filter; ...@@ -622,6 +622,10 @@ module.exports = Filter;
* @date 2014 * @date 2014
*/ */
if ("build" !== 'build') {/*
var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
*/}
var HttpSyncProvider = function (host) { var HttpSyncProvider = function (host) {
this.handlers = []; this.handlers = [];
this.host = host || 'http://localhost:8080'; this.host = host || 'http://localhost:8080';
......
dist/ethereum.js.map
View file @ da4c2d53
This diff is collapsed.
example/balance.html
View file @ da4c2d53
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="js/es6-promise/promise.min.js"></script>
<script type="text/javascript" src="js/bignumber.js/bignumber.min.js"></script> <script type="text/javascript" src="js/bignumber.js/bignumber.min.js"></script>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/ethereum.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
example/contract.html
View file @ da4c2d53
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
<html> <html>
<head> <head>
<script type="text/javascript" src="js/es6-promise/promise.min.js"></script>
<script type="text/javascript" src="js/bignumber.js/bignumber.min.js"></script> <script type="text/javascript" src="js/bignumber.js/bignumber.min.js"></script>
<script type="text/javascript" src="../dist/ethereum.js"></script> <script type="text/javascript" src="../dist/ethereum.js"></script>
<script type="text/javascript"> <script type="text/javascript">
......
example/node-app.js
View file @ da4c2d53
#!/usr/bin/env node #!/usr/bin/env node
require('es6-promise').polyfill();
var web3 = require("../index.js"); var web3 = require("../index.js");
web3.setProvider(new web3.providers.HttpRpcProvider('http://localhost:8080')); web3.setProvider(new web3.providers.HttpSyncProvider('http://localhost:8080'));
var coinbase = web3.eth.coinbase;
console.log(coinbase);
var balance = web3.eth.balanceAt(coinbase);
console.log(balance);
web3.eth.coinbase.then(function(result){
console.log(result);
return web3.eth.balanceAt(result);
}).then(function(balance){
console.log(web3.toDecimal(balance));
}).catch(function(err){
console.log(err);
});
\ No newline at end of file
lib/httpsync.js
View file @ da4c2d53
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
* @date 2014 * @date 2014
*/ */
if (process.env.NODE_ENV !== 'build') {
var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:line
}
var HttpSyncProvider = function (host) { var HttpSyncProvider = function (host) {
this.handlers = []; this.handlers = [];
this.host = host || 'http://localhost:8080'; this.host = host || 'http://localhost:8080';
......
package.json
View file @ da4c2d53
{ {
"name": "ethereum.js", "name": "ethereum.js",
"namespace": "ethereum", "namespace": "ethereum",
"version": "0.0.9", "version": "0.0.10",
"description": "Ethereum Compatible JavaScript API", "description": "Ethereum Compatible JavaScript API",
"main": "./index.js", "main": "./index.js",
"directories": { "directories": {
"lib": "./lib" "lib": "./lib"
}, },
"dependencies": { "dependencies": {
"es6-promise": "*",
"ws": "*", "ws": "*",
"xmlhttprequest": "*", "xmlhttprequest": "*",
"bignumber.js": ">=2.0.0" "bignumber.js": ">=2.0.0"
......
test/db.methods.js
View file @ da4c2d53
require('es6-promise').polyfill();
var assert = require('assert'); var assert = require('assert');
var web3 = require('../index.js'); var web3 = require('../index.js');
......
test/eth.methods.js
View file @ da4c2d53
require('es6-promise').polyfill();
var assert = require('assert'); var assert = require('assert');
var web3 = require('../index.js'); var web3 = require('../index.js');
var u = require('./utils.js'); var u = require('./utils.js');
......
test/shh.methods.js
View file @ da4c2d53
require('es6-promise').polyfill();
var assert = require('assert'); var assert = require('assert');
var web3 = require('../index.js'); var web3 = require('../index.js');
var u = require('./utils.js'); var u = require('./utils.js');
......
test/web3.methods.js
View file @ da4c2d53
require('es6-promise').polyfill();
var assert = require('assert'); var assert = require('assert');
var web3 = require('../index.js'); var web3 = require('../index.js');
var u = require('./utils.js'); var u = require('./utils.js');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment